diff options
| -rwxr-xr-x | configure | 97 | ||||
| -rw-r--r-- | configure.in | 54 |
2 files changed, 124 insertions, 27 deletions
@@ -9715,6 +9715,17 @@ touch ./config/stamp1 # Then the config.status file (but not makefiles) saved_no_create=$no_create no_create=yes + +EXTRA_H4_MAKEFILES= + +if test -n "$H4TOH5"; then + EXTRA_H4_MAKEFILES="$EXTRA_H4_MAKEFILES tools/h4toh5/Makefile" +fi + +if test -n "$H5TOH4"; then + EXTRA_H4_MAKEFILES="$EXTRA_H4_MAKEFILES tools/h5toh4/Makefile" +fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -9816,17 +9827,42 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "src/libhdf5.settings config/depend1 config/depend2 config/depend3 - config/depend4 config/dependN config/commence config/conclude - Makefile src/Makefile pablo/Makefile test/Makefile - testpar/Makefile tools/Makefile examples/Makefile - doc/Makefile doc/html/Makefile doc/html/ADGuide/Makefile - doc/html/Graphics/Makefile doc/html/Intro/Makefile - doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile - doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile +trap 'rm -fr `echo "src/libhdf5.settings + config/depend1 + config/depend2 + config/depend3 + config/depend4 + config/dependN + config/commence + config/conclude + Makefile + src/Makefile + pablo/Makefile + test/Makefile + testpar/Makefile + tools/Makefile + tools/h5debug/Makefile + tools/h5dump/Makefile + tools/h5import/Makefile + tools/h5ls/Makefile + tools/h5repart/Makefile + tools/lib/Makefile + tools/misc/Makefile + $EXTRA_H4_MAKEFILES + examples/Makefile + doc/Makefile + doc/html/Makefile + doc/html/ADGuide/Makefile + doc/html/Graphics/Makefile + doc/html/Intro/Makefile + doc/html/PSandPDF/Makefile + doc/html/TechNotes/Makefile + doc/html/Tutor/Makefile + doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/Tutor/examples/java/Makefile - doc/html/cpplus/Makefile doc/html/fortran/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + doc/html/cpplus/Makefile + doc/html/fortran/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -9960,17 +9996,42 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"src/libhdf5.settings config/depend1 config/depend2 config/depend3 - config/depend4 config/dependN config/commence config/conclude - Makefile src/Makefile pablo/Makefile test/Makefile - testpar/Makefile tools/Makefile examples/Makefile - doc/Makefile doc/html/Makefile doc/html/ADGuide/Makefile - doc/html/Graphics/Makefile doc/html/Intro/Makefile - doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile - doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile +CONFIG_FILES=\${CONFIG_FILES-"src/libhdf5.settings + config/depend1 + config/depend2 + config/depend3 + config/depend4 + config/dependN + config/commence + config/conclude + Makefile + src/Makefile + pablo/Makefile + test/Makefile + testpar/Makefile + tools/Makefile + tools/h5debug/Makefile + tools/h5dump/Makefile + tools/h5import/Makefile + tools/h5ls/Makefile + tools/h5repart/Makefile + tools/lib/Makefile + tools/misc/Makefile + $EXTRA_H4_MAKEFILES + examples/Makefile + doc/Makefile + doc/html/Makefile + doc/html/ADGuide/Makefile + doc/html/Graphics/Makefile + doc/html/Intro/Makefile + doc/html/PSandPDF/Makefile + doc/html/TechNotes/Makefile + doc/html/Tutor/Makefile + doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/Tutor/examples/java/Makefile - doc/html/cpplus/Makefile doc/html/fortran/Makefile"} + doc/html/cpplus/Makefile + doc/html/fortran/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index 917fea3..58dde41 100644 --- a/configure.in +++ b/configure.in @@ -1550,17 +1550,53 @@ touch ./config/stamp1 # Then the config.status file (but not makefiles) saved_no_create=$no_create no_create=yes -AC_OUTPUT(src/libhdf5.settings config/depend1 config/depend2 config/depend3 - config/depend4 config/dependN config/commence config/conclude - Makefile src/Makefile pablo/Makefile test/Makefile - testpar/Makefile tools/Makefile examples/Makefile - doc/Makefile doc/html/Makefile doc/html/ADGuide/Makefile - doc/html/Graphics/Makefile doc/html/Intro/Makefile - doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile - doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile + +EXTRA_H4_MAKEFILES= + +if test -n "$H4TOH5"; then + EXTRA_H4_MAKEFILES="$EXTRA_H4_MAKEFILES tools/h4toh5/Makefile" +fi + +if test -n "$H5TOH4"; then + EXTRA_H4_MAKEFILES="$EXTRA_H4_MAKEFILES tools/h5toh4/Makefile" +fi + +AC_OUTPUT(src/libhdf5.settings + config/depend1 + config/depend2 + config/depend3 + config/depend4 + config/dependN + config/commence + config/conclude + Makefile + src/Makefile + pablo/Makefile + test/Makefile + testpar/Makefile + tools/Makefile + tools/h5debug/Makefile + tools/h5dump/Makefile + tools/h5import/Makefile + tools/h5ls/Makefile + tools/h5repart/Makefile + tools/lib/Makefile + tools/misc/Makefile + $EXTRA_H4_MAKEFILES + examples/Makefile + doc/Makefile + doc/html/Makefile + doc/html/ADGuide/Makefile + doc/html/Graphics/Makefile + doc/html/Intro/Makefile + doc/html/PSandPDF/Makefile + doc/html/TechNotes/Makefile + doc/html/Tutor/Makefile + doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/Tutor/examples/java/Makefile - doc/html/cpplus/Makefile doc/html/fortran/Makefile) + doc/html/cpplus/Makefile + doc/html/fortran/Makefile) no_create=$saved_no_create # Then the stamp2 file for H5config.h |