[Liblas-commits] hg: look for libgeotiff in lib64 and look for libgeotiff headers...

[liblas-commits at liblas.org]

changeset dd574e976a1c in /home/www/liblas.org/hg
details: http://hg.liblas.org/main/hg?cmd=changeset;node=dd574e976a1c
summary: look for libgeotiff in lib64 and look for libgeotiff headers in ./include/libgeotiff

diffstat:

 configure.ac |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 76503b6450f9 -r dd574e976a1c configure.ac
--- a/configure.ac	Wed Nov 25 10:17:50 2009 -0600
+++ b/configure.ac	Wed Dec 02 14:54:33 2009 -0600
@@ -179,6 +179,13 @@
     AC_CHECK_LIB([geotiff], [ST_Create],
                  [GEOTIFF_CONFIG=external], [GEOTIFF_CONFIG=no],
                  [-L$with_geotiff/lib])
+
+dnl see if we're in lib64 instead of lib
+    if test "${GEOTIFF_CONFIG}" = "no" ; then
+        AC_CHECK_LIB([geotiff], [ST_Create],
+                     [GEOTIFF_CONFIG=external], [GEOTIFF_CONFIG=no],
+                     [-L$with_geotiff/lib64])    
+    fi
 fi
 
 if test "${GEOTIFF_CONFIG}" != "no" ; then
@@ -192,7 +199,10 @@
     AC_MSG_RESULT([yes])
     elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geo_simpletags.h ; then
         GEOTIFF_INC="-I$with_gdal/frmts/gtiff/libgeotiff/ -I$with_gdal/frmts/gtiff/libtiff"
-    AC_MSG_RESULT([yes, from GDAL]) 
+    AC_MSG_RESULT([yes, from GDAL])
+    elif test -f ${with_geotiff}/include/libgeotiff/geo_simpletags.h ; then
+        GEOTIFF_INC="-I$with_geotiff/include/libgeotiff"
+    AC_MSG_RESULT([yes])
     else
         GEOTIFF_CONFIG="no"
     AC_MSG_RESULT([no])