Back-patch repairs for --disable-shared support.

diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile
index 52f396b4511255fe078b1ffb22fe840f50a90745..6b406cae5428bf857c7ce506c766f4bc5ef028d3 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/Makefile
+++ b/src/backend/utils/mb/conversion_procs/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/mb/conversion_procs
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.9 2003/08/23 04:22:34 petere Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.9.2.1 2004/01/21 19:25:11 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -147,6 +147,7 @@ all: $(SQLSCRIPT)
        @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
 
 $(SQLSCRIPT): Makefile
+ifeq ($(enable_shared), yes)
        @set $(CONVERSIONS) ; \
        while [ "$$#" -gt 0 ] ; \
        do \
@@ -160,6 +161,9 @@ $(SQLSCRIPT): Makefile
                echo "DROP CONVERSION pg_catalog.$$name;"; \
                echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \
        done > $@
+else
+       echo "-- No conversion support, for lack of shared library support" > $@
+endif
 
 $(REGRESSION_SCRIPT): Makefile
        @cp regress_prolog $@; \

diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk
index 0e66f3751858154812b644d71551b0730e63e27b..91b2304cac721620d7a8392c704ba2ca7d4ed31b 100644 (file)
--- 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 fa77a7f1874365beca6779e0c72fbc0bb80ffd66..3a8ef91f6f7b12512e232548dee047437019047b 100644 (file)
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
 # Makefile for PL/Perl
-# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.10 2002/05/28 16:57:53 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.10.6.1 2004/01/21 19:25: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 f2830866d34b4300f7dd9325aa9e72b89855ab83..2bc69f0a87c8dfcce2fc40dc3fe29b7fca07c627 100644 (file)
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/pl/plpython/Makefile,v 1.11 2002/09/05 18:28:46 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/plpython/Makefile,v 1.11.6.1 2004/01/21 19:25: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 371242f98fdd768aef407cb4495b3db4d10a5e61..4c1730354f1b720e65af18c453d2013312097d29 100644 (file)
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the pltcl shared object
 #
-# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.40 2003/09/27 19:35:32 tgl Exp $
+# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.40.2.1 2004/01/21 19:25: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