From ecb156d484d12159bd2dcb7728957c1b0180f3da Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 21 Jan 2004 19:22:19 +0000 Subject: [PATCH] If we don't have shared libraries, we don't have conversions. Make conversion_create.sql be empty (except for a helpful comment) in this case. Allows initdb to succeed with --disable-shared. --- src/backend/utils/mb/conversion_procs/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index aeba5d35635..1b879dc132d 100644 --- 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 -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.10 2003/11/29 19:52:02 pgsql Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.11 2004/01/21 19:22:19 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 $@; \