Commit8fe15fc

committed

Disable declarative syntax for in-tree builds

1 parentdd072e5 commit8fe15fcCopy full SHA for 8fe15fc

File tree

-16

lines changed

-16

lines changed

Lines changed: 4 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,34 +71,22 @@ ifdef USE_PGXS`
`71`	`71`	`PG_CONFIG=pg_config`
`72`	`72`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`73`	`73`	`VNUM :=$(shell$(PG_CONFIG) --version \| awk '{print $$2}')`
`74`		`-else`
`75`		`-subdir = contrib/pg_pathman`
`76`		`-top_builddir = ../..`
`77`		`-include$(top_builddir)/src/Makefile.global`
`78`		`-endif`
`79`		`-`
`80`		`-# our standard version could also use declarative syntax`
`81`		`-ifdefPGPRO_EDITION`
`82`		`-ifeq ($(PGPRO_EDITION),standard)`
`83`		`-VNUM :=$(VERSION)`
`84`		`-endif`
`85`		`-endif`
`86`	`74`
`87`		`-ifdefVNUM`
	`75`	`+# check for declarative syntax`
`88`	`76`	`ifeq ($(VNUM),$(filter 10% 11%,$(VNUM)))`
`89`	`77`	`REGRESS += pathman_declarative`
`90`	`78`	`OBJS += src/declarative.o`
`91`	`79`	`overridePG_CPPFLAGS += -DENABLE_DECLARATIVE`
`92`	`80`	`endif`
`93`		`-endif`
`94`	`81`
`95`		`-ifdefUSE_PGXS`
`96`	`82`	`include$(PGXS)`
`97`	`83`	`else`
	`84`	`+subdir = contrib/pg_pathman`
	`85`	`+top_builddir = ../..`
	`86`	`+include$(top_builddir)/src/Makefile.global`
`98`	`87`	`include$(top_srcdir)/contrib/contrib-global.mk`
`99`	`88`	`endif`
`100`	`89`
`101`		`-`
`102`	`90`	`$(EXTENSION)--$(EXTVERSION).sql: init.sql hash.sql range.sql`
`103`	`91`	`cat$^>$@`
`104`	`92`

Comments

(0)