[svn-r5282] Purpose:

    Update
Description:
    Updated the h5vers script to also modify the configure.in files and
    regenerate the configure file.
Platforms tested:
    Linux

2 files changed, 117 insertions, 14 deletions

diff --git a/fortran/configure b/fortran/configure
index bcbbe45..5c9a580 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for HDF5 Fortran 1.4.4.
+# Generated by GNU Autoconf 2.53 for HDF5 Fortran 1.4.4-snap4.
 #
 # Report bugs to <hdfhelp@ncsa.uiuc.edu>.
 #
@@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='HDF5 Fortran'
 PACKAGE_TARNAME='hdf5-fortran'
-PACKAGE_VERSION='1.4.4'
-PACKAGE_STRING='HDF5 Fortran 1.4.4'
+PACKAGE_VERSION='1.4.4-snap4'
+PACKAGE_STRING='HDF5 Fortran 1.4.4-snap4'
 PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu'
 
 ac_unique_file="src/HDF5.f90"
@@ -922,7 +922,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 Fortran 1.4.4 to adapt to many kinds of systems.
+\`configure' configures HDF5 Fortran 1.4.4-snap4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -983,7 +983,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 Fortran 1.4.4:";;
+     short | recursive ) echo "Configuration of HDF5 Fortran 1.4.4-snap4:";;
    esac
   cat <<\_ACEOF
 
@@ -1088,7 +1088,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 Fortran configure 1.4.4
+HDF5 Fortran configure 1.4.4-snap4
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1103,7 +1103,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 Fortran $as_me 1.4.4, which was
+It was created by HDF5 Fortran $as_me 1.4.4-snap4, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -1411,6 +1411,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
@@ -3879,7 +3882,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3882 "configure"' > conftest.$ac_ext
+  echo '#line 3885 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4420,7 +4423,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4426: \"$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
@@ -6231,7 +6234,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6234 "configure"
+#line 6237 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6329,7 +6332,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6332 "configure"
+#line 6335 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8880,7 +8883,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by HDF5 Fortran $as_me 1.4.4, which was
+This file was extended by HDF5 Fortran $as_me 1.4.4-snap4, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8934,12 +8937,15 @@ $config_files
 Configuration headers:
 $config_headers
 
+Configuration commands:
+$config_commands
+
 Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-HDF5 Fortran config.status 1.4.4
+HDF5 Fortran config.status 1.4.4-snap4
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -9017,8 +9023,15 @@ done
 
 _ACEOF
 
+cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS section.
+#
+
 
 
+_ACEOF
+
 
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -9039,6 +9052,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;}
@@ -9053,6 +9067,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.
@@ -9594,6 +9609,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 5ab704d..c6f7241 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -18,12 +18,27 @@ dnl
 dnl NOTE: Don't forget to change the version number here when we do a
 dnl release!!!
 dnl
-AC_INIT([HDF5 Fortran], [1.4.4], [hdfhelp@ncsa.uiuc.edu])
+AC_INIT([HDF5 Fortran], [1.4.4-snap4], [hdfhelp@ncsa.uiuc.edu])
 AC_CONFIG_SRCDIR([src/HDF5.f90])
 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)