X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Ffgis.git;a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=35c245ad68e95dc4dcb495a9efcb13b0147ff883;hp=d980cb1995b2baf365195a730d1b33149bb7e47b;hb=ad6458c0bb78a96fdf5c926355b39e08944f7e5c;hpb=3c1106b6f5e0380baf6fbd7aa97367ffe1176274

diff --git a/configure.ac b/configure.ac
index d980cb1..35c245a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(fGIS, 0.0.1, dron@remotesensing.org)
+AC_INIT(fGIS, 0.0.2, dron@remotesensing.org)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)
 
@@ -79,12 +79,15 @@ dnl Check for Tcl/Tk installation
 dnl ---------------------------------------------------------------------------
 
 CY_AC_PATH_TCLH
+
+tcl_missing_msg="
+        ERROR: Can't find Tcl headers or library. See README for information
+        on how to obtain Tcl. If Tcl is installed, see INSTALL on how to tell
+        configure where Tcl is installed.
+"
+
 if test x"$no_tcl" = x"true" ; then
-    echo "	ERROR: Can't find Tcl headers or library."
-    echo "	See README for information on how to obtain Tcl."
-    echo "	If Tcl is installed, see INSTALL on how to tell"
-    echo "	configure where Tcl is installed."
-    exit 1
+	AC_MSG_ERROR([$tcl_missing_msg])
 fi
 CY_AC_PATH_TCLCONFIG
 CY_AC_LOAD_TCLCONFIG
@@ -99,6 +102,70 @@ if [[[ $TK_VERSION < "8.4" ]]]; then
     AC_DEFINE([TK_84PREV], , [Define this variable if your Tk version less then 8.4])
 fi
 
+dnl ---------------------------------------------------------------------------
+dnl Find the required GDAL libraries, and include files.
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(gdal,[  --with-gdal[[=DIR]]       path to GDAL build tree],,)
+
+if test "$with_gdal" != "" ; then
+  GDAL_HOME=$with_gdal
+  echo Using requested GDAL_HOME of $GDAL_HOME
+elif test "$GDAL_HOME" != "" ; then
+  echo Using predefined GDAL_HOME=$GDAL_HOME
+elif test -d ../gdal ; then
+  GDAL_HOME=`pwd`/../gdal
+  echo Found local GDAL_HOME=$GDAL_HOME
+else 
+  AC_CHECK_LIB(gdal.1.1,GDALOpen,gdal_found=1,gdal_found=0)
+ 
+gdal_missing_msg="
+fGIS requires GDAL 1.1, but libgdal.1.1.so was not found. Please download 
+and install it. See http://www.remotesensing.org/gdal/
+"
+
+  if test "$gdal_found" != "1" ; then
+    AC_MSG_ERROR([$gdal_missing_msg])
+  fi
+
+gdal_h_missing_msg="
+fGIS requires GDAL 1.1, but gdal.h was not found. Please ensure GDAL,
+and the development include files are installed, or that you run configure
+with --with-gdal=path_to_gdal_build_tree.  
+See http://www.remotesensing.org/gdal/
+"
+
+  AC_CHECK_HEADERS(gdal.h)
+  if test "$ac_cv_header_gdal_h" != "yes" ; then
+    AC_MSG_ERROR([$gdal_h_missing_msg])
+  fi
+  GDAL_LIB="-lgdal.1.1"
+  LIBS="$GDAL_LIB $LIBS"
+  GDAL_INC=""
+  AC_SUBST(GDAL_INC,$GDAL_INC)
+fi
+
+if test "$GDAL_HOME" != "" ; then
+  GDAL_LIB="-L$GDAL_HOME -lgdal.1.1" 
+  LIBS="$GDAL_LIB $LIBS"
+
+  GDAL_INC="-I$GDAL_HOME/port -I$GDAL_HOME/core -I$GDAL_HOME/ogr"
+
+  if test ! -d $GDAL_HOME/core ; then
+    
+    AC_MSG_ERROR([Unable to find $GDAL_HOME/core directory, are you sure a 
+regular GDAL build tree can be found at $GDAL_HOME?])
+  fi
+
+  if test ! -f $GDAL_HOME/libgdal.1.1.so ; then
+    
+    AC_MSG_ERROR([Unable to find $GDAL_HOME/libgdal.1.1.so, are you sure a 
+regular GDAL build tree can be found at $GDAL_HOME?])
+  fi
+
+  AC_SUBST(GDAL_INC,$GDAL_INC)
+fi
+
 AC_CONFIG_FILES([Makefile
                  etc/Makefile
                  etc/fgis.rc