[postgis-commits] svn - r3797 - spike/wktraster

postgis-commits at postgis.refractions.net postgis-commits at postgis.refractions.net
Wed Mar 4 13:37:34 PST 2009


Author: pracine
Date: 2009-03-04 13:37:34 -0800 (Wed, 04 Mar 2009)
New Revision: 3797

Modified:
   spike/wktraster/configure.ac
Log:
Added a makefile to copy gdap2wktraster.py to pgsql/bin.
Removed unnecessary link with geos and proj.

Modified: spike/wktraster/configure.ac
===================================================================
--- spike/wktraster/configure.ac	2009-03-04 21:36:16 UTC (rev 3796)
+++ spike/wktraster/configure.ac	2009-03-04 21:37:34 UTC (rev 3797)
@@ -86,7 +86,7 @@
 
 AC_PATH_PROG([XSLTPROC], [xsltproc], [])
 if test "x$XSLTPROC" = "x"; then
-	AC_MSG_WARN([xsltproc is not installed so documentation cannot be built])
+    AC_MSG_WARN([xsltproc is not installed so documentation cannot be built])
 fi
 
 dnl
@@ -95,7 +95,7 @@
 
 AC_PATH_PROG([DB2PDF], [db2pdf], [])
 if test "x$DB2PDF" = "x"; then
-	AC_MSG_WARN([db2pdf is not installed so PDF documentation cannot be built])
+    AC_MSG_WARN([db2pdf is not installed so PDF documentation cannot be built])
 fi
 
 dnl
@@ -104,7 +104,7 @@
 
 AC_PATH_PROG([DBLATEX], [dblatex], [])
 if test "x$DBLATEX" = "x"; then
-	AC_MSG_WARN([dblatex is not installed so PDF documentation cannot be built])
+    AC_MSG_WARN([dblatex is not installed so PDF documentation cannot be built])
 fi
 
 dnl
@@ -112,41 +112,41 @@
 dnl
 
 AC_ARG_WITH([xsldir], 
-	[AS_HELP_STRING([--with-xsldir=PATH], [specify the directory containing the docbook.xsl stylesheet])], 
-	[XSLBASE="$withval"], [XSLBASE=""])
+    [AS_HELP_STRING([--with-xsldir=PATH], [specify the directory containing the docbook.xsl stylesheet])], 
+    [XSLBASE="$withval"], [XSLBASE=""])
 
 XSLBASE_AUTO=""
 if test "x$XSLBASE" = "x"; then
-	dnl If the user did not specify a directory for the docbook 
-	dnl stylesheet, choose the first directory
-	dnl that matches from the following list
-	SEARCHPATH="
-		/usr/share/sgml/docbook/xsl-stylesheets 
-		/usr/share/xml/docbook/stylesheet/nwalsh
-		/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
-		"
-	for p in ${SEARCHPATH}; do
-		if test -r "${p}"/html/docbook.xsl; then
-			XSLBASE_AUTO="${p}"
-			break
-		fi
-	done
+    dnl If the user did not specify a directory for the docbook 
+    dnl stylesheet, choose the first directory
+    dnl that matches from the following list
+    SEARCHPATH="
+        /usr/share/sgml/docbook/xsl-stylesheets 
+        /usr/share/xml/docbook/stylesheet/nwalsh
+        /usr/share/sgml/docbook/stylesheet/xsl/nwalsh
+        "
+    for p in ${SEARCHPATH}; do
+        if test -r "${p}"/html/docbook.xsl; then
+            XSLBASE_AUTO="${p}"
+            break
+        fi
+    done
 
-	dnl Check to see if the automatically searched paths above located a 
-	dnl valid Docbook stylesheet
-	if test "x$XSLBASE_AUTO" = "x"; then
-		AC_MSG_WARN([could not locate Docbook stylesheets required to build the documentation])
-	fi
+    dnl Check to see if the automatically searched paths above located a 
+    dnl valid Docbook stylesheet
+    if test "x$XSLBASE_AUTO" = "x"; then
+        AC_MSG_WARN([could not locate Docbook stylesheets required to build the documentation])
+    fi
 else
-	dnl The user specified an alternate directory so make sure everything 
-	dnl looks sensible
-	if test ! -d "$XSLBASE"; then
-		AC_MSG_ERROR([the docbook stylesheet directory specified using --with-xsldir does not exist])
-	fi 
+    dnl The user specified an alternate directory so make sure everything 
+    dnl looks sensible
+    if test ! -d "$XSLBASE"; then
+        AC_MSG_ERROR([the docbook stylesheet directory specified using --with-xsldir does not exist])
+    fi 
 
-	if test ! -f "$XSLBASE/html/docbook.xsl"; then
-		AC_MSG_ERROR([the docbook stylesheet directory specified using --with-xsldir does not contain the html/docbook.xsl file])
-	fi
+    if test ! -f "$XSLBASE/html/docbook.xsl"; then
+        AC_MSG_ERROR([the docbook stylesheet directory specified using --with-xsldir does not contain the html/docbook.xsl file])
+    fi
 fi
 
 dnl
@@ -158,9 +158,9 @@
 dnl
 
 if test "x$XSLBASE" = "x"; then
-	if test ! "x$XSLBASE_AUTO" = "x"; then
-		XSLBASE="$XSLBASE_AUTO"
-	fi
+    if test ! "x$XSLBASE_AUTO" = "x"; then
+        XSLBASE="$XSLBASE_AUTO"
+    fi
 fi
 
 AC_SUBST([XSLBASE])
@@ -244,13 +244,13 @@
 
 CUNIT_LDFLAGS=""
 AC_CHECK_HEADER([CUnit/CUnit.h], [
-	CUNIT_CPPFLAGS="$CPPFLAGS"
-	AC_CHECK_LIB([cunit], [CU_initialize_registry], [CUNIT_LDFLAGS="$LDFLAGS -lcunit"], [AC_MSG_WARN([could not locate CUnit required for liblwgeom unit tests])])
-	],
-	[
-	AC_MSG_WARN([could not locate CUnit required for liblwgeom unit tests])
-	])
-	
+    CUNIT_CPPFLAGS="$CPPFLAGS"
+    AC_CHECK_LIB([cunit], [CU_initialize_registry], [CUNIT_LDFLAGS="$LDFLAGS -lcunit"], [AC_MSG_WARN([could not locate CUnit required for liblwgeom unit tests])])
+    ],
+    [
+    AC_MSG_WARN([could not locate CUnit required for liblwgeom unit tests])
+    ])
+    
 AC_SUBST([CUNIT_CPPFLAGS])
 AC_SUBST([CUNIT_LDFLAGS])
 
@@ -265,29 +265,29 @@
 
 dnl If we find the header file, try and link against the library
 if test "x$HAVE_ICONV_H" != "x0"; then
-	dnl Check for iconv includes as part of libc
-	AC_CHECK_LIB([c], [iconv_open], [ICONV_LDFLAGS=-lc HAVE_ICONV=1], [])
-	if test "x$HAVE_ICONV" = "x"; then
-		dnl If not found, check for iconv included as part of libiconv
-		AC_CHECK_LIB([iconv], [iconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
-		if test "x$HAVE_ICONV" = "x"; then
-			dnl If not found, check for Win32 iconv (some of them use a lib prefix for functions within the iconv DLLs)
-			AC_CHECK_LIB([iconv], [libiconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
-			if test "x$HAVE_ICONV" = "x"; then
-				dnl No iconv library was found; issue a warning to the console
-				AC_MSG_WARN([could not find iconv library: no support for encoding conversion will be included])
-			fi
-		fi	
-	fi
+    dnl Check for iconv includes as part of libc
+    AC_CHECK_LIB([c], [iconv_open], [ICONV_LDFLAGS=-lc HAVE_ICONV=1], [])
+    if test "x$HAVE_ICONV" = "x"; then
+        dnl If not found, check for iconv included as part of libiconv
+        AC_CHECK_LIB([iconv], [iconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
+        if test "x$HAVE_ICONV" = "x"; then
+            dnl If not found, check for Win32 iconv (some of them use a lib prefix for functions within the iconv DLLs)
+            AC_CHECK_LIB([iconv], [libiconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
+            if test "x$HAVE_ICONV" = "x"; then
+                dnl No iconv library was found; issue a warning to the console
+                AC_MSG_WARN([could not find iconv library: no support for encoding conversion will be included])
+            fi
+        fi  
+    fi
 else
-	dnl No iconv header was found; issue a warning to the console
-	AC_MSG_WARN([could not find iconv.h header: no support for encoding conversion will be included])
+    dnl No iconv header was found; issue a warning to the console
+    AC_MSG_WARN([could not find iconv.h header: no support for encoding conversion will be included])
 fi
 
 
 dnl Only define HAVE_ICONV in postgis_config.h if we detect iconv sucessfully
 if test "x$HAVE_ICONV" != "x"; then
-	AC_DEFINE_UNQUOTED([HAVE_ICONV], [$HAVE_ICONV], [Defined if libiconv headers and library are present])
+    AC_DEFINE_UNQUOTED([HAVE_ICONV], [$HAVE_ICONV], [Defined if libiconv headers and library are present])
 fi
 
 AC_SUBST([ICONV_LDFLAGS])
@@ -298,28 +298,28 @@
 dnl ===========================================================================
 
 AC_ARG_WITH([pgconfig], 
-	[AS_HELP_STRING([--with-pgconfig=FILE], [specify an alternative pg_config file])], 
-	[PGCONFIG="$withval"], [PGCONFIG=""])
+    [AS_HELP_STRING([--with-pgconfig=FILE], [specify an alternative pg_config file])], 
+    [PGCONFIG="$withval"], [PGCONFIG=""])
 
 if test "x$PGCONFIG" = "x"; then
-	dnl PGCONFIG was not specified, so search within the current path
-	AC_PATH_PROG([PGCONFIG], [pg_config])
+    dnl PGCONFIG was not specified, so search within the current path
+    AC_PATH_PROG([PGCONFIG], [pg_config])
 
-	dnl If we couldn't find pg_config, display an error
-	if test "x$PGCONFIG" = "x"; then
-		AC_MSG_ERROR([could not find pg_config within the current path. You may need to try re-running configure with a --with-pgconfig parameter.])
-	fi
+    dnl If we couldn't find pg_config, display an error
+    if test "x$PGCONFIG" = "x"; then
+        AC_MSG_ERROR([could not find pg_config within the current path. You may need to try re-running configure with a --with-pgconfig parameter.])
+    fi
 else
-	dnl PGCONFIG was specified; display a message to the user
-	if test "x$PGCONFIG" = "xyes"; then
-		AC_MSG_ERROR([you must specify a parameter to --with-pgconfig, e.g. --with-pgconfig=/path/to/pg_config])
-	else
-		if test -f $PGCONFIG; then
-			AC_MSG_RESULT([Using user-specified pg_config file: $PGCONFIG])
-		else
-			AC_MSG_ERROR([the user-specified pg_config file $PGCONFIG does not exist])
-		fi
-	fi
+    dnl PGCONFIG was specified; display a message to the user
+    if test "x$PGCONFIG" = "xyes"; then
+        AC_MSG_ERROR([you must specify a parameter to --with-pgconfig, e.g. --with-pgconfig=/path/to/pg_config])
+    else
+        if test -f $PGCONFIG; then
+            AC_MSG_RESULT([Using user-specified pg_config file: $PGCONFIG])
+        else
+            AC_MSG_ERROR([the user-specified pg_config file $PGCONFIG does not exist])
+        fi
+    fi
 fi
 
 
@@ -332,7 +332,7 @@
 
 PGXS=`$PGCONFIG --pgxs`
 if test ! -f $PGXS; then
-	AC_MSG_ERROR([the PGXS Makefile $PGXS cannot be found. Please install the PostgreSQL server development packages and re-run configure.])
+    AC_MSG_ERROR([the PGXS Makefile $PGXS cannot be found. Please install the PostgreSQL server development packages and re-run configure.])
 fi
 
 AC_SUBST([PGXS])
@@ -341,20 +341,20 @@
 dnl Extract the version information from pg_config
 dnl Note: we extract the major & minor separately, ensure they are numeric, and then combine to give
 dnl the final version. This is to guard against user error... 
-PGSQL_MAJOR_VERSION=`$PGCONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f1 | sed 's/[[^0-9]]//g'`	
-PGSQL_MINOR_VERSION=`$PGCONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f2 | sed 's/[[^0-9]]//g'`	
+PGSQL_MAJOR_VERSION=`$PGCONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f1 | sed 's/[[^0-9]]//g'`  
+PGSQL_MINOR_VERSION=`$PGCONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f2 | sed 's/[[^0-9]]//g'`  
 RT_PGSQL_VERSION="$PGSQL_MAJOR_VERSION$PGSQL_MINOR_VERSION"
 
 dnl Ensure that we are using PostgreSQL >= 8.3
 if test ! "$PGSQL_MAJOR_VERSION" -ge 8; then
-	AC_MSG_ERROR([WKTRaster requires PostgreSQL >= 8.3])
+    AC_MSG_ERROR([WKTRaster requires PostgreSQL >= 8.3])
 else
-	if test "$PGSQL_MAJOR_VERSION" -eq 8; then
-		if test ! "$PGSQL_MINOR_VERSION" -ge 3; then
-			AC_MSG_ERROR([WKTRaster requires PostgreSQL >= 8.3])
-		fi	
-	fi
-fi	
+    if test "$PGSQL_MAJOR_VERSION" -eq 8; then
+        if test ! "$PGSQL_MINOR_VERSION" -ge 3; then
+            AC_MSG_ERROR([WKTRaster requires PostgreSQL >= 8.3])
+        fi  
+    fi
+fi  
 
 dnl Note: We don't need the server-side LDFLAGS or CPPFLAGS because we get these from PGXS 
 
@@ -388,12 +388,12 @@
 LIBS_SAVE="$LIBS"
 LIBS="$PGSQL_FE_LDFLAGS"
 AC_CHECK_LIB([pq], [PQserverVersion],
-	[],
-	[AC_MSG_ERROR([could not find libpq])],
-	[])
+    [],
+    [AC_MSG_ERROR([could not find libpq])],
+    [])
 LIBS="$LIBS_SAVE"
 
-AC_DEFINE_UNQUOTED([RT_PGSQL_VERSION], [$RT_PGSQL_VERSION], [PostgreSQL server version])	
+AC_DEFINE_UNQUOTED([RT_PGSQL_VERSION], [$RT_PGSQL_VERSION], [PostgreSQL server version])    
 AC_SUBST([RT_PGSQL_VERSION])
 
 dnl ===========================================================================
@@ -425,28 +425,28 @@
 dnl ===========================================================================
 
 AC_ARG_WITH([geosconfig], 
-	[AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], 
-	[GEOSCONFIG="$withval"], [GEOSCONFIG=""])
+    [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], 
+    [GEOSCONFIG="$withval"], [GEOSCONFIG=""])
 
 if test "x$GEOSCONFIG" = "x"; then
-	dnl GEOSCONFIG was not specified, so search within the current path
-	AC_PATH_PROG([GEOSCONFIG], [geos-config])
+    dnl GEOSCONFIG was not specified, so search within the current path
+    AC_PATH_PROG([GEOSCONFIG], [geos-config])
 
-	dnl If we couldn't find geos-config, display an error
-	if test "x$GEOSCONFIG" = "x"; then
-		AC_MSG_ERROR([could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.])
-	fi
+    dnl If we couldn't find geos-config, display an error
+    if test "x$GEOSCONFIG" = "x"; then
+        AC_MSG_ERROR([could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.])
+    fi
 else
-	dnl GEOSCONFIG was specified; display a message to the user
-	if test "x$GEOSCONFIG" = "xyes"; then
-		AC_MSG_ERROR([you must specify a parameter to --with-geosconfig, e.g. --with-geosconfig=/path/to/geos-config])
-	else
-		if test -f $GEOSCONFIG; then
-			AC_MSG_RESULT([Using user-specified geos-config file: $GEOSCONFIG])
-		else
-			AC_MSG_ERROR([the user-specified geos-config file $GEOSCONFIG does not exist])
-		fi	
-	fi
+    dnl GEOSCONFIG was specified; display a message to the user
+    if test "x$GEOSCONFIG" = "xyes"; then
+        AC_MSG_ERROR([you must specify a parameter to --with-geosconfig, e.g. --with-geosconfig=/path/to/geos-config])
+    else
+        if test -f $GEOSCONFIG; then
+            AC_MSG_RESULT([Using user-specified geos-config file: $GEOSCONFIG])
+        else
+            AC_MSG_ERROR([the user-specified geos-config file $GEOSCONFIG does not exist])
+        fi  
+    fi
 fi
 
 dnl-GEOS-dnl dnl ===========================================================================
@@ -461,14 +461,14 @@
 dnl-GEOS-dnl 
 dnl-GEOS-dnl dnl Ensure that we are using GEOS >= 2.2.0 (requires CAPI) 
 dnl-GEOS-dnl if test ! "$GEOS_MAJOR_VERSION" -ge 2; then
-dnl-GEOS-dnl 	AC_MSG_ERROR([PostGIS requires GEOS >= 2.2])
+dnl-GEOS-dnl    AC_MSG_ERROR([PostGIS requires GEOS >= 2.2])
 dnl-GEOS-dnl else
-dnl-GEOS-dnl 	if test "$GEOS_MAJOR_VERSION" -eq 2; then
-dnl-GEOS-dnl 		if test ! "$GEOS_MINOR_VERSION" -ge 2; then
-dnl-GEOS-dnl 			AC_MSG_ERROR([PostGIS requires GEOS >= 2.2])
-dnl-GEOS-dnl 		fi
-dnl-GEOS-dnl 	fi
-dnl-GEOS-dnl fi	
+dnl-GEOS-dnl    if test "$GEOS_MAJOR_VERSION" -eq 2; then
+dnl-GEOS-dnl        if test ! "$GEOS_MINOR_VERSION" -ge 2; then
+dnl-GEOS-dnl            AC_MSG_ERROR([PostGIS requires GEOS >= 2.2])
+dnl-GEOS-dnl        fi
+dnl-GEOS-dnl    fi
+dnl-GEOS-dnl fi 
 dnl-GEOS-dnl 
 dnl-GEOS-dnl dnl Extract the linker and include flags 
 dnl-GEOS-dnl GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
@@ -484,12 +484,12 @@
 dnl-GEOS-dnl LIBS_SAVE="$LIBS"
 dnl-GEOS-dnl LIBS="$GEOS_LDFLAGS"
 dnl-GEOS-dnl AC_CHECK_LIB([geos_c], [initGEOS],
-dnl-GEOS-dnl 	[],
-dnl-GEOS-dnl 	[AC_MSG_ERROR([could not find libgeos_c - you may need to specify the directory of a geos-config file using --with-geosconfig])],
-dnl-GEOS-dnl 	[])
+dnl-GEOS-dnl    [],
+dnl-GEOS-dnl    [AC_MSG_ERROR([could not find libgeos_c - you may need to specify the directory of a geos-config file using --with-geosconfig])],
+dnl-GEOS-dnl    [])
 dnl-GEOS-dnl LIBS="$LIBS_SAVE"
 dnl-GEOS-dnl 
-dnl-GEOS-dnl AC_DEFINE_UNQUOTED([RT_GEOS_VERSION], [$RT_GEOS_VERSION], [GEOS library version])	
+dnl-GEOS-dnl AC_DEFINE_UNQUOTED([RT_GEOS_VERSION], [$RT_GEOS_VERSION], [GEOS library version])  
 dnl-GEOS-dnl AC_SUBST([RT_GEOS_VERSION])
 
 
@@ -498,31 +498,31 @@
 dnl-PROJ4-dnl dnl ===========================================================================
 dnl-PROJ4-dnl 
 dnl-PROJ4-dnl AC_ARG_WITH([projdir], 
-dnl-PROJ4-dnl 	[AS_HELP_STRING([--with-projdir=PATH], [specify the PROJ.4 installation directory])], 
-dnl-PROJ4-dnl 	[PROJDIR="$withval"], [PROJDIR=""])
+dnl-PROJ4-dnl   [AS_HELP_STRING([--with-projdir=PATH], [specify the PROJ.4 installation directory])], 
+dnl-PROJ4-dnl   [PROJDIR="$withval"], [PROJDIR=""])
 dnl-PROJ4-dnl 
 dnl-PROJ4-dnl if test ! "x$PROJDIR" = "x"; then
-dnl-PROJ4-dnl 	dnl Make sure that the directory exists 
-dnl-PROJ4-dnl 	if test "x$PROJDIR" = "xyes"; then
-dnl-PROJ4-dnl 		AC_MSG_ERROR([you must specifiy a parameter to --with-projdir, e.g. --with-projdir=/path/to])
-dnl-PROJ4-dnl 	else
-dnl-PROJ4-dnl 		if test -d "$PROJDIR"; then
-dnl-PROJ4-dnl 			AC_MSG_RESULT([Using user-specified proj directory: $PROJDIR])
+dnl-PROJ4-dnl   dnl Make sure that the directory exists 
+dnl-PROJ4-dnl   if test "x$PROJDIR" = "xyes"; then
+dnl-PROJ4-dnl       AC_MSG_ERROR([you must specifiy a parameter to --with-projdir, e.g. --with-projdir=/path/to])
+dnl-PROJ4-dnl   else
+dnl-PROJ4-dnl       if test -d "$PROJDIR"; then
+dnl-PROJ4-dnl           AC_MSG_RESULT([Using user-specified proj directory: $PROJDIR])
 dnl-PROJ4-dnl 
-dnl-PROJ4-dnl 			dnl Add the include directory to PROJ_CPPFLAGS	
-dnl-PROJ4-dnl 			PROJ_CPPFLAGS="-I$PROJDIR/include"	
-dnl-PROJ4-dnl 			PROJ_LDFLAGS="-L$PROJDIR/lib"
-dnl-PROJ4-dnl 		else
-dnl-PROJ4-dnl 			AC_MSG_ERROR([the --with-projdir directory "$PROJDIR" cannot be found]) 
-dnl-PROJ4-dnl 		fi
-dnl-PROJ4-dnl 	fi
+dnl-PROJ4-dnl           dnl Add the include directory to PROJ_CPPFLAGS  
+dnl-PROJ4-dnl           PROJ_CPPFLAGS="-I$PROJDIR/include"  
+dnl-PROJ4-dnl           PROJ_LDFLAGS="-L$PROJDIR/lib"
+dnl-PROJ4-dnl       else
+dnl-PROJ4-dnl           AC_MSG_ERROR([the --with-projdir directory "$PROJDIR" cannot be found]) 
+dnl-PROJ4-dnl       fi
+dnl-PROJ4-dnl   fi
 dnl-PROJ4-dnl fi
 dnl-PROJ4-dnl 
 dnl-PROJ4-dnl 
 dnl-PROJ4-dnl dnl Check that we can find the proj_api.h header file
 dnl-PROJ4-dnl CPPFLAGS_SAVE="$CPPFLAGS"
 dnl-PROJ4-dnl CPPFLAGS="$PROJ_CPPFLAGS"
-dnl-PROJ4-dnl AC_CHECK_HEADER([proj_api.h], [], [AC_MSG_ERROR([could not find proj_api.h - you may need to specify the directory of a PROJ.4 installation using --with-projdir])])	
+dnl-PROJ4-dnl AC_CHECK_HEADER([proj_api.h], [], [AC_MSG_ERROR([could not find proj_api.h - you may need to specify the directory of a PROJ.4 installation using --with-projdir])])  
 dnl-PROJ4-dnl 
 dnl-PROJ4-dnl dnl Return the PROJ.4 version number
 dnl-PROJ4-dnl AC_PROJ_VERSION([RT_PROJ_VERSION])
@@ -532,16 +532,16 @@
 dnl-PROJ4-dnl 
 dnl-PROJ4-dnl dnl Ensure that we are using PROJ >= 4.5.0 (requires pj_set_searchpath) 
 dnl-PROJ4-dnl if test ! "$RT_PROJ_VERSION" -ge 45; then
-dnl-PROJ4-dnl 	AC_MSG_ERROR([PostGIS requires PROJ >= 4.5.0])
+dnl-PROJ4-dnl   AC_MSG_ERROR([PostGIS requires PROJ >= 4.5.0])
 dnl-PROJ4-dnl fi
 dnl-PROJ4-dnl 
 dnl-PROJ4-dnl dnl Ensure we can link against libproj
 dnl-PROJ4-dnl LIBS_SAVE="$LIBS"
 dnl-PROJ4-dnl LIBS="$PROJ_LDFLAGS"
 dnl-PROJ4-dnl AC_CHECK_LIB([proj], [pj_get_release],
-dnl-PROJ4-dnl 	[],
-dnl-PROJ4-dnl 	[AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ.4 installation using --with-projdir])],
-dnl-PROJ4-dnl 	[])
+dnl-PROJ4-dnl   [],
+dnl-PROJ4-dnl   [AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ.4 installation using --with-projdir])],
+dnl-PROJ4-dnl   [])
 dnl-PROJ4-dnl LIBS="$LIBS_SAVE"
 
 
@@ -572,10 +572,10 @@
 CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS"
 dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
 
-SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj"
+SHLIB_LINK="$PGSQL_LDFLAGS"
 AC_SUBST([SHLIB_LINK])
 dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
 
 dnl Output the relevant files
-AC_OUTPUT([rt_core/Makefile rt_pg/Makefile rt_pg/test/Makefile])
+AC_OUTPUT([rt_core/Makefile rt_pg/Makefile rt_pg/test/Makefile scripts/Makefile])
 



More information about the postgis-commits mailing list