Fix bit-rot in support for building with --disable-shared. This patch

gets us past 'make install', but initdb still fails for lack of conversion
libraries ...

4 files changed, 24 insertions, 4 deletions

diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk
index 0e66f375185..91b2304cac7 100644
--- a/src/backend/utils/mb/conversion_procs/proc.mk
+++ b/src/backend/utils/mb/conversion_procs/proc.mk
@@ -12,7 +12,9 @@ all: all-shared-lib
 include $(top_srcdir)/src/Makefile.shlib
 
 install: all
+ifeq ($(enable_shared), yes)
 	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
+endif
 
 uninstall:
 	rm -f $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index bd2b99b3fc8..459ad3f1d53 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
 # Makefile for PL/Perl
-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.11 2003/11/29 19:52:12 pgsql Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.12 2004/01/21 19:04:11 tgl Exp $
 
 subdir = src/pl/plperl
 top_builddir = ../../..
@@ -37,7 +37,13 @@ SPI.c: SPI.xs
 	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
 
 install: all installdirs
+ifeq ($(enable_shared), yes)
 	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)
+else
+	@echo "*****"; \
+	 echo "* PL/Perl was not installed due to lack of shared library support."; \
+	 echo "*****"
+endif
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 25d7ffd505b..6acf3a6f4d4 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.12 2003/11/29 19:52:12 pgsql Exp $
+# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.13 2004/01/21 19:04:11 tgl Exp $
 
 subdir = src/pl/plpython
 top_builddir = ../../..
@@ -32,7 +32,13 @@ include $(top_srcdir)/src/Makefile.shlib
 all: all-lib
 
 install: all installdirs
+ifeq ($(enable_shared), yes)
 	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)
+else
+	@echo "*****"; \
+	 echo "* PL/Python was not installed due to lack of shared library support."; \
+	 echo "*****"
+endif
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index 33339155eb4..a10de622a82 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the pltcl shared object
 #
-# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.41 2003/11/29 19:52:13 pgsql Exp $
+# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.42 2004/01/21 19:04:11 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -44,7 +44,13 @@ all: all-lib
 	$(MAKE) -C modules $@
 
 install: all installdirs
+ifeq ($(enable_shared), yes)
 	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
+else
+	@echo "*****"; \
+	 echo "* PL/Tcl was not installed due to lack of shared library support."; \
+	 echo "*****"
+endif
 	$(MAKE) -C modules $@
 
 installdirs:
@@ -60,7 +66,7 @@ else # TCL_SHARED_BUILD = 0
 # Provide dummy targets for the case where we can't build the shared library.
 all:
 	@echo "*****"; \
-	 echo "* Cannot build pltcl because Tcl is not a shared library; skipping it."; \
+	 echo "* Cannot build PL/Tcl because Tcl is not a shared library; skipping it."; \
 	 echo "*****"
 
 endif # TCL_SHARED_BUILD = 0