[svn-r6886] Purpose:

    Update

Description:
    GPFS should only be checked for if the --enable-gpfs flag is used.
    Otherwise, it shouldn't.

Platforms tested:
    Linux (Configure only fix so only needed to test it to make sure the
           configure does the right thing and that the build won't
           break. I need to test it on a machine that has GPFS to make
           sure it works there...)

1 files changed, 29 insertions, 9 deletions

diff --git a/configure b/configure
index 9e514d0..787df24 100755
--- a/configure
+++ b/configure
@@ -1012,6 +1012,8 @@ Optional Features:
   --enable-hdf5v1_4       Compile the HDF5 v1.4 compatibility interface
                           [default=no]
   --enable-stream-vfd     Build the Stream Virtual File Driver [default=no]
+  --enable-gpfs           Enable GPFS hints for the MPI/POSIX file driver.
+                          [default=no]
   --enable-debug=all      Turn on debugging in all packages. One may also
                           specify a comma-separated list of package names
                           without the leading H5 or the word no. The default
@@ -4110,7 +4112,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4113 "configure"' > conftest.$ac_ext
+  echo '#line 4115 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4651,7 +4653,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6462,7 +6464,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6465 "configure"
+#line 6467 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6560,7 +6562,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6563 "configure"
+#line 6565 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -30014,6 +30016,16 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+# Check whether --enable-gpfs or --disable-gpfs was given.
+if test "${enable_gpfs+set}" = set; then
+  enableval="$enable_gpfs"
+
+else
+  enableval=no
+fi;
+
+case "X-$enableval" in
+  X-yes)
 
 for ac_header in gpfs.h
 do
@@ -30125,7 +30137,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 _ACEOF
  echo "$as_me:$LINENO: checking for GPFS support" >&5
 echo $ECHO_N "checking for GPFS support... $ECHO_C" >&6
-                 cat >conftest.$ac_ext <<_ACEOF
+                     cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"
 #include <gpfs.h>
@@ -30160,22 +30172,30 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_GPFS 1
 _ACEOF
 
-                                echo "$as_me:$LINENO: result: yes" >&5
+                                    echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-                                LIBS="$LIBS -lgpfs"
-                                GPFS="yes"
+                                    LIBS="$LIBS -lgpfs"
+                                    GPFS="yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-                                GPFS="no"
+                                    GPFS="no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 done
 
+    ;;
+  X-no|*)
+    echo "$as_me:$LINENO: checking for gpfs" >&5
+echo $ECHO_N "checking for gpfs... $ECHO_C" >&6
+    echo "$as_me:$LINENO: result: suppressed" >&5
+echo "${ECHO_T}suppressed" >&6
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for debug flags" >&5
 echo $ECHO_N "checking for debug flags... $ECHO_C" >&6