Changeset 798

Timestamp:

21/07/06 16:03:57 (6 years ago)

Author:

faa59

Message:

Sort out HDF4 directory location on Ubuntu/Debian

File:

• trunk/configure.ac (modified) (3 diffs)

trunk/configure.ac

@@ -290 +290 @@
 dnl
 H4ROOT=""
-H4SUBROOT=""
+H4INCSUBROOT=""
+H4LIBSUBROOT=""
 H5ROOT=""
 MXMLROOT=""
@@ -322 +323 @@
         if test -r /usr/$i/hdf/libdf.$HDF_EXT; then
             H4ROOT=/usr
-            H4SUBROOT=hdf
+            H4LIBSUBROOT=hdf
         fi
     done
+    if test -r $H4ROOT/include/hdf; then
+        H4INCSUBROOT=hdf
+    fi
     if test -z "$H4ROOT"; then 
         AC_MSG_RESULT(unknown)
@@ -332 +336 @@
 fi
 if test "$H4ROOT"; then
-    H4VERSION=`grep LIBVER_STRING ${H4ROOT}/include/${H4SUBROOT}/hfile.h | cut -d '"' -f 2 | cut -d ' ' -f4,6 | tr ' ,' '. '`
+    H4VERSION=`grep LIBVER_STRING ${H4ROOT}/include/${H4INCSUBROOT}/hfile.h | cut -d '"' -f 2 | cut -d ' ' -f4,6 | tr ' ,' '. '`
     case $H4VERSION in
         4.[[12]]*) 
                 HDF4_LDFLAGS="-lmfhdf -ldf";
                 for j in lib lib64; do
-                    if test -d $H4ROOT/$j/$H4SUBROOT; then LDFLAGS="-L$H4ROOT/$j/$H4SUBROOT $LDFLAGS"; fi
+                    if test -d $H4ROOT/$j/$H4LIBSUBROOT; then LDFLAGS="-L$H4ROOT/$j/$H4LIBSUBROOT $LDFLAGS"; fi
                 done
-                if test -z "$H4SUBROOT"; then
+                if test -z "$H4INCSUBROOT"; then
                     HDF4_CPPFLAGS="-I$H4ROOT/include -DHDF4"
                 else
-                    HDF4_CPPFLAGS="-I$H4ROOT/include/$H4SUBROOT -DHDF4"
+                    HDF4_CPPFLAGS="-I$H4ROOT/include/$H4INCSUBROOT -DHDF4"
                 fi
                 ;;