Changeset 699 for trunk

Timestamp:

06/10/08 17:13:50 (7 months ago)

Author:

andreas

Message:

improved gdal and postgresql detection

Location:

trunk

Files:

• config/ax_boost_iostreams.m4 (added)
• configure.ac (modified) (1 diff)
• plugins/input/gdal/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -74 +74 @@
 fi
 
+AX_BOOST_IOSTREAMS
+if test "x$ax_cv_boost_iostreams" = "xno"; then
+  echo
+  echo "Error: You need to install the boost iostreams library!"
+  echo
+  exit
+fi
+
+
 AX_LIB_POSTGRESQL
-if test "$found_postgresql" = "yes"; then
-  AM_CONDITIONAL(HAVE_POSTGRESQL, test "x$found_postgresql" = "xyes")
-fi
+if test "x$found_postgresql" = "xyes"; then
+  echo "checking whether to enable postgresql... yes"
+else
+  echo "checking whether to enable postgresql... no"
+fi
+AM_CONDITIONAL(HAVE_POSTGRESQL, test "x$found_postgresql" = "xyes")
+
+AC_ARG_WITH(gdal-config,
+[  --with-gdal-config=GDAL_CONFIG    use gdal-config specified ],
+[
+  GDAL_CONFIG=$withval;
+  echo "using "$GDAL_CONFIG" for gdal-config";
+],[
+  PROG="gdal-config";
+  AC_PATH_PROG(GDAL_CONFIG, $PROG, "", $PATH)
+])
+GDAL_CFLAGS=`$GDAL_CONFIG --cflags`
+GDAL_LIBS=`$GDAL_CONFIG --libs`
+AC_SUBST(GDAL_CFLAGS)
+AC_SUBST(GDAL_LIBS)
+
 
 AX_CHECK_TIFF

trunk/plugins/input/gdal/Makefile.am

@@ -7 +7 @@
         gdal_featureset.cpp
 
+gdal_la_LIBADD = \
+        ${GDAL_LDFLAGS}
+
 gdal_la_CXXFLAGS = \
-        -I../../../include
+        ${GDAL_CFLAGS} \
+        -I../../../include
 
 gdal_la_LDFLAGS = \