Commit ecb156d4 authored by Tom Lane's avatar Tom Lane

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.
parent a4f8f124
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/mb/conversion_procs # Makefile for utils/mb/conversion_procs
# #
# IDENTIFICATION # 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) ...@@ -147,6 +147,7 @@ all: $(SQLSCRIPT)
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
$(SQLSCRIPT): Makefile $(SQLSCRIPT): Makefile
ifeq ($(enable_shared), yes)
@set $(CONVERSIONS) ; \ @set $(CONVERSIONS) ; \
while [ "$$#" -gt 0 ] ; \ while [ "$$#" -gt 0 ] ; \
do \ do \
...@@ -160,6 +161,9 @@ $(SQLSCRIPT): Makefile ...@@ -160,6 +161,9 @@ $(SQLSCRIPT): Makefile
echo "DROP CONVERSION pg_catalog.$$name;"; \ echo "DROP CONVERSION pg_catalog.$$name;"; \
echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \ echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \
done > $@ done > $@
else
echo "-- No conversion support, for lack of shared library support" > $@
endif
$(REGRESSION_SCRIPT): Makefile $(REGRESSION_SCRIPT): Makefile
@cp regress_prolog $@; \ @cp regress_prolog $@; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment