Skip to content

Commit

Permalink
Detect PERL locally
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/postgis/trunk@8840 b70326c6-7e19-0410-871a-916f4a2858ee
  • Loading branch information
Sandro Santilli committed Jan 16, 2012
1 parent 983a72a commit f5bd1c8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions postgis/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions raster/rt_pg/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions topology/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f5bd1c8

Please sign in to comment.