[svn-r26084] Configure now just checks for O_DIRECT being defined instead of trying

to build and run a program using it, which is problematic (depends on
file system, issues with cross-compiling).

Part of HDFFV-9057

Tested on: jam (configure only)

2 files changed, 36 insertions, 63 deletions

diff --git a/configure b/configure
index dc12ef5..dd492c3 100755
--- a/configure
+++ b/configure
@@ -28286,33 +28286,23 @@ else
 fi
 
 
-if test "$DIRECT_VFD" = "yes"; then
-   if ${hdf5_cv_direct_io+:} false; then :
+if test "X$DIRECT_VFD" = "Xyes"; then
+    if ${hdf5_cv_direct_io+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+  ac_fn_c_check_decl "$LINENO" "O_DIRECT" "ac_cv_have_decl_O_DIRECT" "#include <fcntl.h>
+"
+if test "x$ac_cv_have_decl_O_DIRECT" = xyes; then :
+  hdf5_cv_direct_io=yes
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  hdf5_cv_direct_io=no
+fi
 
-	  #include <sys/types.h>
-	  #include <sys/stat.h>
-	  #include <fcntl.h>
-          int main(void)
-          {
-             int fid;
-             if((fid=open("tst_file", O_CREAT | O_TRUNC | O_DIRECT, 0755))<0)
-		exit(1);
-             close(fid);
-             remove("tst_file");
-             exit (0);
-          }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+fi
+
+    if ${hdf5_cv_posix_memalign+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28333,35 +28323,28 @@ posix_memalign()
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  hdf5_cv_direct_io=yes
+  hdf5_cv_posix_memalign=yes
 else
-  hdf5_cv_direct_io=no
+  hdf5_cv_posix_memalign=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-else
-  hdf5_cv_direct_io=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
 fi
 
 
-   if test ${hdf5_cv_direct_io} = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    if test ${hdf5_cv_direct_io} = "yes" && test ${hdf5_cv_posix_memalign} = "yes" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_DIRECT 1" >>confdefs.h
 
-   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      DIRECT_VFD=no
-   fi
+        DIRECT_VFD=no
+    fi
 else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
 $as_echo "suppressed" >&6; }
 fi
 
diff --git a/configure.ac b/configure.ac
index 3a14090..1a8f204 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2531,32 +2531,22 @@ AC_ARG_ENABLE([direct-vfd],
                                flag. [default=no]])],
               [DIRECT_VFD=$enableval], [DIRECT_VFD=no])
 
-if test "$DIRECT_VFD" = "yes"; then
-   AC_CACHE_VAL([hdf5_cv_direct_io],
-       [AC_TRY_RUN([
-	  #include <sys/types.h>
-	  #include <sys/stat.h>
-	  #include <fcntl.h>
-          int main(void)
-          {
-             int fid; 
-             if((fid=open("tst_file", O_CREAT | O_TRUNC | O_DIRECT, 0755))<0)
-		exit(1);
-             close(fid);  
-             remove("tst_file"); 
-             exit (0);
-          }], [AC_TRY_LINK(, [posix_memalign()], [hdf5_cv_direct_io=yes], [hdf5_cv_direct_io=no])], [hdf5_cv_direct_io=no],)])
-
-   if test ${hdf5_cv_direct_io} = "yes"; then
-      AC_MSG_RESULT([yes])
-      AC_DEFINE([HAVE_DIRECT], [1],
+if test "X$DIRECT_VFD" = "Xyes"; then
+    AC_CACHE_VAL([hdf5_cv_direct_io],
+        AC_CHECK_DECL([O_DIRECT], [hdf5_cv_direct_io=yes], [hdf5_cv_direct_io=no], [[#include <fcntl.h>]]))
+    AC_CACHE_VAL([hdf5_cv_posix_memalign],
+        AC_TRY_LINK(, [posix_memalign()], [hdf5_cv_posix_memalign=yes], [hdf5_cv_posix_memalign=no]))
+
+    if test ${hdf5_cv_direct_io} = "yes" && test ${hdf5_cv_posix_memalign} = "yes" ; then
+        AC_MSG_RESULT([yes])
+        AC_DEFINE([HAVE_DIRECT], [1],
                 [Define if the direct I/O virtual file driver (VFD) should be compiled])
-   else
-      AC_MSG_RESULT([no])
-      DIRECT_VFD=no
-   fi
+    else
+        AC_MSG_RESULT([no])
+        DIRECT_VFD=no
+    fi
 else
-      AC_MSG_RESULT([suppressed])
+    AC_MSG_RESULT([suppressed])
 fi
 
 AM_CONDITIONAL([DIRECT_VFD_CONDITIONAL], [test "X$DIRECT_VFD" = "Xyes"])