[svn-r5267] Purpose:

    Update
Description:
    Added a conversion of the H5config_fortran.h file to
    H5pubconf_fortran.h so as to keep with the HDF5 format of using H5_
    as a prefix for HAVE_* macros.
Platforms tested:
    Linux

3 files changed, 108 insertions, 5 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 9a8809a..ef50799 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -108,7 +108,7 @@ distclean:
 	-$(RM) config/commence config/conclude
 	-$(RM) config/stamp1 config/stamp2 config/depend?
 	-$(RM) config.cache config.log config.status
-	-$(RM) src/H5config_fortran.h
+	-$(RM) src/H5config_fortran.h src/H5pubconf_fortran.h
 	-$(RM) libtool Makefile
 
 maintainer-clean:
diff --git a/fortran/configure b/fortran/configure
index c8d2f97..8809326 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -1402,6 +1402,9 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 
+ac_config_commands="$ac_config_commands default-1"
+
+
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -3873,7 +3876,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3876 "configure"' > conftest.$ac_ext
+  echo '#line 3879 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4414,7 +4417,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4420: \"$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
@@ -6225,7 +6228,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6228 "configure"
+#line 6231 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6323,7 +6326,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6326 "configure"
+#line 6329 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8921,6 +8924,9 @@ $config_files
 Configuration headers:
 $config_headers
 
+Configuration commands:
+$config_commands
+
 Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 
@@ -9004,8 +9010,15 @@ done
 
 _ACEOF
 
+cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS section.
+#
+
 
 
+_ACEOF
+
 
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -9026,6 +9039,7 @@ do
   "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
   "$PARALLEL_MAKE" ) CONFIG_FILES="$CONFIG_FILES $PARALLEL_MAKE" ;;
   "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "src/H5config_fortran.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/H5config_fortran.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -9040,6 +9054,7 @@ done
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Create a temporary directory, and hook for its removal unless debugging.
@@ -9581,6 +9596,79 @@ done; }
   fi
 done
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_dest" : 'X\(//\)[^/]' \| \
+         X"$ac_dest" : 'X\(//\)$' \| \
+         X"$ac_dest" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    default-1 )
+  echo "creating src/H5pubconf_fortran.h"
+  sed 's/#define /#define H5_/' < src/H5config_fortran.h |\
+    sed 's/#undef /#undef H5_/' > pubconf_fortran
+
+  if test ! -f src/H5pubconf_fortran.h; then
+    /bin/mv -f pubconf_fortran src/H5pubconf_fortran.h
+  elif (diff pubconf_fortran src/H5pubconf_fortran.h >/dev/null); then
+    /bin/rm -f pubconf_fortran
+    echo "src/H5pubconf_fortran.h is unchanged"
+  else
+    /bin/mv -f pubconf_fortran src/H5pubconf_fortran.h
+  fi
+ ;;
+  esac
+done
+_ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
 
diff --git a/fortran/configure.in b/fortran/configure.in
index f8bb515..98045f0 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -24,6 +24,21 @@ AC_CONFIG_HEADER([src/H5config_fortran.h])
 
 AC_CONFIG_AUX_DIR([../bin])
 
+AC_OUTPUT_COMMANDS([
+  echo "creating src/H5pubconf_fortran.h"
+  sed 's/#define /#define H5_/' < src/H5config_fortran.h |\
+    sed 's/#undef /#undef H5_/' > pubconf_fortran
+
+  if test ! -f src/H5pubconf_fortran.h; then
+    /bin/mv -f pubconf_fortran src/H5pubconf_fortran.h
+  elif (diff pubconf_fortran src/H5pubconf_fortran.h >/dev/null); then
+    /bin/rm -f pubconf_fortran
+    echo "src/H5pubconf_fortran.h is unchanged"
+  else
+    /bin/mv -f pubconf_fortran src/H5pubconf_fortran.h
+  fi
+])
+
 AC_CANONICAL_HOST
 AC_SUBST(CPPFLAGS)
 AC_SUBST(FFLAGS)