Changeset 633:7464a387fcea

Timestamp:

05/09/08 21:23:28 (2 years ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@700

Message:

more AM_CONDITIONAL tweaking

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -73 +73 @@
 AC_MSG_CHECKING([for GDAL])
 
+GDAL_CONFIG="no"
 if test "$with_gdal" = "no" -o "$with_gdal" = "" ; then
-  GDAL_CONFIG="no"
   AC_MSG_RESULT([no])
-dnl AC_PATH_PROG(GDAL_CONFIG, gdal-config, no)
 else
   if test "`basename xx/$with_gdal`" = "gdal-config" ; then
@@ -97 +96 @@
 fi
 AC_SUBST(GDAL_INC GDAL_PREFIX)
-AM_CONDITIONAL([GDAL_IS_CONFIG], [test $GDAL_CONFIG != no])
+AM_CONDITIONAL([GDAL_IS_CONFIG], [test ! x$GDAL_CONFIG = xno])
 
 dnl ---------------------------------------------------------------------------
@@ -113 +112 @@
 else
 
-  GEOTIFF_SETTING=external
+  GEOTIFF_CONFIG=external
   dnl We now require libgeotiff 1.2.1 (for XTIFFClientOpen). 
   dnl first check if $with_geotiff/lib has the library:
@@ -132 +131 @@
 
 AC_SUBST(GEOTIFF_INC GEOTIFF_PREFIX)
-AM_CONDITIONAL([GEOTIFF_IS_CONFIG], [test $GEOTIFF_CONFIG != no])
+AM_CONDITIONAL([GEOTIFF_IS_CONFIG], [test ! x$GEOTIFF_CONFIG = xno])