Detect PERL locally

git-svn-id: http://svn.osgeo.org/postgis/trunk@8840 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/configure.ac b/configure.ac
index a998acec9f0296bf7a04a04cff28710fa00f77ea..79e0845150ee6955305fb7fbf2a88fe0862d8344 100644 (file)
--- 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 8e60013dc09c4d583f82c1320cc016fac83e6a39..a07d869631f6677bb6886aa216403c795a9cf7ac 100644 (file)
--- 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 254543370274b96df5a8c7ba8b876ec7e67e48c0..c2e51096f9e4afc32a4b16913555e8e0625cef89 100644 (file)
--- 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 cabe44bd974c68659d5f5fd7b8dd5b2a3b5aa9e8..d862d3c78f53b57235440a865c41412e8119b979 100644 (file)
--- 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