Commitecb156d

committed

If we don't have shared libraries, we don't have conversions. Make

conversion_create.sql be empty (except for a helpful comment) in thiscase. Allows initdb to succeed with --disable-shared.

1 parenta4f8f12 commitecb156dCopy full SHA for ecb156d

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for utils/mb/conversion_procs`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.10 2003/11/29 19:52:02 pgsql Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.11 2004/01/21 19:22:19 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -147,6 +147,7 @@ all: $(SQLSCRIPT)`
`147`	`147`	`@for dirin$(DIRS);do$(MAKE) -C$$dir$@\|\|exit;done`
`148`	`148`
`149`	`149`	`$(SQLSCRIPT): Makefile`
	`150`	`+ifeq ($(enable_shared), yes)`
`150`	`151`	`@set $(CONVERSIONS) ; \`
`151`	`152`	`while [ "$$#" -gt 0 ] ;\`
`152`	`153`	`do\`
`@@ -160,6 +161,9 @@ $(SQLSCRIPT): Makefile`
`160`	`161`	`echo "DROP CONVERSION pg_catalog.$$name;";\`
`161`	`162`	`echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;";\`
`162`	`163`	`done > $@`
	`164`	`+else`
	`165`	`+echo "-- No conversion support, for lack of shared library support" > $@`
	`166`	`+endif`
`163`	`167`
`164`	`168`	`$(REGRESSION_SCRIPT): Makefile`
`165`	`169`	`@cp regress_prolog$@;\`

Comments

(0)