From: Sandro Santilli Date: Mon, 22 Jun 2015 14:47:43 +0000 (+0000) Subject: Drop PGXSOVERRIDE temporary hack. PostgreSQL 9.0 is minimum req now. X-Git-Tag: 2.2.0rc1~342 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f5548ca9a09eaa9decb1c82b29eb71b9b2620e3;p=postgis Drop PGXSOVERRIDE temporary hack. PostgreSQL 9.0 is minimum req now. git-svn-id: http://svn.osgeo.org/postgis/trunk@13687 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/configure.ac b/configure.ac index 79cd09e04..242d3463a 100644 --- a/configure.ac +++ b/configure.ac @@ -426,15 +426,6 @@ if test ! "$PGSQL_MAJOR_VERSION" -ge 9; then AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.0]) fi -dnl Temporary hack until minimum PostgreSQL version is 9.0: -dnl If PostgreSQL < 9.0 is detected, trigger the inclusion of the new versioned PGXS targets -PGXSOVERRIDE=0 -if test ! "$PGSQL_MAJOR_VERSION" -ge 9; then - PGXSOVERRIDE=1 -fi - -AC_SUBST([PGXSOVERRIDE]) - dnl Note: We don't need the server-side LDFLAGS or CPPFLAGS because we get these from PGXS dnl Extract the linker and include flags for the frontend (for programs that use libpq) diff --git a/doc/Makefile.comments.in b/doc/Makefile.comments.in index 64bfd3342..ba507b9fb 100644 --- a/doc/Makefile.comments.in +++ b/doc/Makefile.comments.in @@ -24,18 +24,6 @@ PG_CONFIG = @PG_CONFIG@ PGXS := @PGXS@ include $(PGXS) -# PGXS override feature. The ability to allow PostGIS to install itself -# in a versioned directory is only available in PostgreSQL >= 8.5. To -# do this by default on older PostgreSQL versions, we need to override -# the existing PGXS targets. -# -# Once PostgreSQL 8.5 becomes the minimum supported version, this entire -# section and its associated Makefile.pgxs should be removed. -PGXSOVERRIDE = @PGXSOVERRIDE@ -ifeq ($(PGXSOVERRIDE),1) - include ../postgis/Makefile.pgxs -endif - # If REGRESS=1 passed as a parameter, change the default install paths # so that no prefix is included. This allows us to relocate to a temporary # directory for regression testing. diff --git a/postgis/Makefile.in b/postgis/Makefile.in index ac8550a36..d79185c73 100644 --- a/postgis/Makefile.in +++ b/postgis/Makefile.in @@ -121,18 +121,6 @@ PERL=@PERL@ # see http://trac.osgeo.org/postgis/ticket/1158#comment:57 SHLIB_LINK := $(SHLIB_LINK_F) $(SHLIB_LINK) -# PGXS override feature. The ability to allow PostGIS to install itself -# in a versioned directory is only available in PostgreSQL >= 8.5. To -# do this by default on older PostgreSQL versions, we need to override -# the existing PGXS targets. -# -# Once PostgreSQL 8.5 becomes the minimum supported version, this entire -# section and its associated Makefile.pgxs should be removed. -PGXSOVERRIDE = @PGXSOVERRIDE@ -ifeq ($(PGXSOVERRIDE),1) - include Makefile.pgxs -endif - # If REGRESS=1 passed as a parameter, change the default install paths # so that no prefix is included. This allows us to relocate to a temporary # directory for regression testing. diff --git a/postgis/Makefile.pgxs b/postgis/Makefile.pgxs deleted file mode 100644 index f7ffc8ef2..000000000 --- a/postgis/Makefile.pgxs +++ /dev/null @@ -1,102 +0,0 @@ -# -# PostGIS PGXS override file for PostgreSQL <= 8.5 -# (updates relevant targets for MODULEDIR as per the -# PostgreSQL 8.5 PGXS Makefile) -# - -ifdef MODULEDIR -datamoduledir = $(MODULEDIR) -docmoduledir = $(MODULEDIR) -else -datamoduledir = contrib -docmoduledir = contrib -endif - -install: all installdirs -ifneq (,$(DATA)$(DATA_built)) - @for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \ - echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)'; \ - done -endif # DATA -ifneq (,$(DATA_TSEARCH)) - @for file in $(addprefix $(srcdir)/, $(DATA_TSEARCH)); do \ - echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data'; \ - done -endif # DATA_TSEARCH -ifdef MODULES - @for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \ - echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \ - $(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'; \ - done -endif # MODULES -ifdef DOCS -ifdef docdir - @for file in $(addprefix $(srcdir)/, $(DOCS)); do \ - echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/$(docmoduledir)'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/$(docmoduledir)'; \ - done -endif # docdir -endif # DOCS -ifdef PROGRAM - $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)' -endif # PROGRAM -ifdef SCRIPTS - @for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \ - echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \ - $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \ - done -endif # SCRIPTS -ifdef SCRIPTS_built - @for file in $(SCRIPTS_built); do \ - echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \ - $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \ - done -endif # SCRIPTS_built -ifdef MODULE_big - $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)' -endif # MODULE_big - -installdirs: -ifneq (,$(DATA)$(DATA_built)) - $(mkinstalldirs) '$(DESTDIR)$(datadir)/$(datamoduledir)' -endif -ifneq (,$(DATA_TSEARCH)) - $(mkinstalldirs) '$(DESTDIR)$(datadir)/tsearch_data' -endif -ifneq (,$(MODULES)) - $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' -endif -ifdef DOCS -ifdef docdir - $(mkinstalldirs) '$(DESTDIR)$(docdir)/$(docmoduledir)' -endif # docdir -endif # DOCS -ifneq (,$(PROGRAM)$(SCRIPTS)$(SCRIPTS_built)) - $(mkinstalldirs) '$(DESTDIR)$(bindir)' -endif - -uninstall: -ifneq (,$(DATA)$(DATA_built)) - rm -f $(addprefix '$(DESTDIR)$(datadir)/$(datamoduledir)'/, $(notdir $(DATA) $(DATA_built))) -endif -ifneq (,$(DATA_TSEARCH)) - rm -f $(addprefix '$(DESTDIR)$(datadir)/tsearch_data'/, $(notdir $(DATA_TSEARCH))) -endif -ifdef MODULES - rm -f $(addprefix '$(DESTDIR)$(pkglibdir)'/, $(addsuffix $(DLSUFFIX), $(MODULES))) -endif -ifdef DOCS - rm -f $(addprefix '$(DESTDIR)$(docdir)/$(docmoduledir)'/, $(DOCS)) -endif -ifdef PROGRAM - rm -f '$(DESTDIR)$(bindir)/$(PROGRAM)$(X)' -endif -ifdef SCRIPTS - rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS)) -endif -ifdef SCRIPTS_built - rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS_built)) -endif - diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in index dfec5fdff..eb498a649 100644 --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in @@ -83,18 +83,6 @@ PERL=@PERL@ # see http://trac.osgeo.org/postgis/ticket/1158#comment:57 SHLIB_LINK := $(SHLIB_LINK_F) $(SHLIB_LINK) -# PGXS override feature. The ability to allow PostGIS to install itself -# in a versioned directory is only available in PostgreSQL >= 8.5. To -# do this by default on older PostgreSQL versions, we need to override -# the existing PGXS targets. -# -# Once PostgreSQL 8.5 becomes the minimum supported version, this entire -# section and its associated Makefile.pgxs should be removed. -PGXSOVERRIDE = @PGXSOVERRIDE@ -ifeq ($(PGXSOVERRIDE),1) - include Makefile.pgxs -endif - # If REGRESS=1 passed as a parameter, change the default install paths # so that no prefix is included. This allows us to relocate to a temporary # directory for regression testing. diff --git a/raster/rt_pg/Makefile.pgxs b/raster/rt_pg/Makefile.pgxs deleted file mode 100644 index f7ffc8ef2..000000000 --- a/raster/rt_pg/Makefile.pgxs +++ /dev/null @@ -1,102 +0,0 @@ -# -# PostGIS PGXS override file for PostgreSQL <= 8.5 -# (updates relevant targets for MODULEDIR as per the -# PostgreSQL 8.5 PGXS Makefile) -# - -ifdef MODULEDIR -datamoduledir = $(MODULEDIR) -docmoduledir = $(MODULEDIR) -else -datamoduledir = contrib -docmoduledir = contrib -endif - -install: all installdirs -ifneq (,$(DATA)$(DATA_built)) - @for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \ - echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)'; \ - done -endif # DATA -ifneq (,$(DATA_TSEARCH)) - @for file in $(addprefix $(srcdir)/, $(DATA_TSEARCH)); do \ - echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data'; \ - done -endif # DATA_TSEARCH -ifdef MODULES - @for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \ - echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \ - $(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'; \ - done -endif # MODULES -ifdef DOCS -ifdef docdir - @for file in $(addprefix $(srcdir)/, $(DOCS)); do \ - echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/$(docmoduledir)'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/$(docmoduledir)'; \ - done -endif # docdir -endif # DOCS -ifdef PROGRAM - $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)' -endif # PROGRAM -ifdef SCRIPTS - @for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \ - echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \ - $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \ - done -endif # SCRIPTS -ifdef SCRIPTS_built - @for file in $(SCRIPTS_built); do \ - echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \ - $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \ - done -endif # SCRIPTS_built -ifdef MODULE_big - $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)' -endif # MODULE_big - -installdirs: -ifneq (,$(DATA)$(DATA_built)) - $(mkinstalldirs) '$(DESTDIR)$(datadir)/$(datamoduledir)' -endif -ifneq (,$(DATA_TSEARCH)) - $(mkinstalldirs) '$(DESTDIR)$(datadir)/tsearch_data' -endif -ifneq (,$(MODULES)) - $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' -endif -ifdef DOCS -ifdef docdir - $(mkinstalldirs) '$(DESTDIR)$(docdir)/$(docmoduledir)' -endif # docdir -endif # DOCS -ifneq (,$(PROGRAM)$(SCRIPTS)$(SCRIPTS_built)) - $(mkinstalldirs) '$(DESTDIR)$(bindir)' -endif - -uninstall: -ifneq (,$(DATA)$(DATA_built)) - rm -f $(addprefix '$(DESTDIR)$(datadir)/$(datamoduledir)'/, $(notdir $(DATA) $(DATA_built))) -endif -ifneq (,$(DATA_TSEARCH)) - rm -f $(addprefix '$(DESTDIR)$(datadir)/tsearch_data'/, $(notdir $(DATA_TSEARCH))) -endif -ifdef MODULES - rm -f $(addprefix '$(DESTDIR)$(pkglibdir)'/, $(addsuffix $(DLSUFFIX), $(MODULES))) -endif -ifdef DOCS - rm -f $(addprefix '$(DESTDIR)$(docdir)/$(docmoduledir)'/, $(DOCS)) -endif -ifdef PROGRAM - rm -f '$(DESTDIR)$(bindir)/$(PROGRAM)$(X)' -endif -ifdef SCRIPTS - rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS)) -endif -ifdef SCRIPTS_built - rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS_built)) -endif - diff --git a/topology/Makefile.in b/topology/Makefile.in index 9fe6e138f..af0eb3a3f 100644 --- a/topology/Makefile.in +++ b/topology/Makefile.in @@ -46,18 +46,6 @@ include $(PGXS) # Set PERL _after_ the include of PGXS PERL=@PERL@ -# PGXS override feature. The ability to allow PostGIS to install itself -# in a versioned directory is only available in PostgreSQL >= 8.5. To -# do this by default on older PostgreSQL versions, we need to override -# the existing PGXS targets. -# -# Once PostgreSQL 8.5 becomes the minimum supported version, this entire -# section and its associated Makefile.pgxs should be removed. -PGXSOVERRIDE = @PGXSOVERRIDE@ -ifeq ($(PGXSOVERRIDE),1) - include ../postgis/Makefile.pgxs -endif - # If REGRESS=1 passed as a parameter, change the default install paths # so that no prefix is included. This allows us to relocate to a temporary # directory for regression testing.