From f5bd1c82a673bdb42ad31cd2db5711502be38579 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 16 Jan 2012 13:56:11 +0000 Subject: [PATCH] Detect PERL locally git-svn-id: http://svn.osgeo.org/postgis/trunk@8840 b70326c6-7e19-0410-871a-916f4a2858ee --- configure.ac | 3 +++ postgis/Makefile.in | 3 +++ raster/rt_pg/Makefile.in | 3 +++ topology/Makefile.in | 3 +++ 4 files changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index a998acec9..79e084515 100644 --- a/configure.ac +++ b/configure.ac @@ -106,6 +106,8 @@ esac AC_DEFINE_UNQUOTED([PWDREGRESS], [PWDREGRESS], [Define command to determine the current directory during regression]) AC_SUBST([PWDREGRESS]) +AC_PATH_PROG([PERL], [perl], []) +AC_SUBST([PERL]) dnl =========================================================================== dnl Find components needed to build documentation @@ -1004,6 +1006,7 @@ AC_MSG_RESULT([ Libxml2 config: ${XML2CONFIG}]) AC_MSG_RESULT([ Libxml2 version: ${POSTGIS_LIBXML2_VERSION}]) AC_MSG_RESULT([ JSON-C support: ${HAVE_JSON}]) AC_MSG_RESULT([ PostGIS debug level: ${POSTGIS_DEBUG_LEVEL}]) +AC_MSG_RESULT([ perl: ${PERL}]) if test "x$RASTER" = "xraster" -o "x$TOPOLOGY" = "xtopology"; then AC_MSG_RESULT([ -------------- Extensions -------------- ]) if test "x$RASTER" = "xraster"; then diff --git a/postgis/Makefile.in b/postgis/Makefile.in index 8e60013dc..a07d86963 100644 --- a/postgis/Makefile.in +++ b/postgis/Makefile.in @@ -78,6 +78,9 @@ PG_CONFIG = @PGCONFIG@ PGXS := @PGXS@ include $(PGXS) +# Set PERL _after_ the include of PGXS +PERL=@PERL@ + # This is to workaround a bug in PGXS 8.4 win32 link line, # see http://trac.osgeo.org/postgis/ticket/1158#comment:57 SHLIB_LINK := $(SHLIB_LINK_F) $(SHLIB_LINK) diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in index 254543370..c2e51096f 100644 --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in @@ -51,6 +51,9 @@ PG_CONFIG = @PGCONFIG@ PGXS := @PGXS@ include $(PGXS) +# Set PERL _after_ the include of PGXS +PERL=@PERL@ + # This is to workaround a bug in PGXS 8.4 win32 link line, # see http://trac.osgeo.org/postgis/ticket/1158#comment:57 SHLIB_LINK := $(SHLIB_LINK_F) $(SHLIB_LINK) diff --git a/topology/Makefile.in b/topology/Makefile.in index cabe44bd9..d862d3c78 100644 --- a/topology/Makefile.in +++ b/topology/Makefile.in @@ -37,6 +37,9 @@ PG_CONFIG = @PGCONFIG@ PGXS := @PGXS@ 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 -- 2.40.0