diff options
author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-04-23 19:24:56 (GMT) |
---|---|---|
committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-04-23 19:24:56 (GMT) |
commit | 960e7dc164aebd68340947ac8287f0ee4030e4ef (patch) | |
tree | f169e361b6609133ba09bff693a0b680db1dcec7 | |
parent | 7db648599a3e449a503c2b4bd413d5b7785a3c5d (diff) | |
download | hdf5-960e7dc164aebd68340947ac8287f0ee4030e4ef.zip hdf5-960e7dc164aebd68340947ac8287f0ee4030e4ef.tar.gz hdf5-960e7dc164aebd68340947ac8287f0ee4030e4ef.tar.bz2 |
[svn-r5234] Purpose:
Update
Description:
Updated the way some of the macros were being used in the configure
file. Some of the behavior is deprecated. Mostly has to do with the
AC_OUTPUT and AC_INIT macros...
Platforms tested:
Linux
-rwxr-xr-x | c++/configure | 346 | ||||
-rw-r--r-- | c++/configure.in | 361 | ||||
-rwxr-xr-x | configure | 68 | ||||
-rw-r--r-- | configure.in | 105 | ||||
-rwxr-xr-x | fortran/configure | 66 | ||||
-rw-r--r-- | fortran/configure.in | 59 |
6 files changed, 568 insertions, 437 deletions
diff --git a/c++/configure b/c++/configure index 212e8d8..cf8ea7e 100755 --- a/c++/configure +++ b/c++/configure @@ -1,7 +1,9 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.53 for HDF5 C++ 1.4.4. +# +# Report bugs to <hdfhelp@ncsa.uiuc.edu>. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -412,11 +414,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='HDF5 C++' +PACKAGE_TARNAME='hdf5-c--' +PACKAGE_VERSION='1.4.4' +PACKAGE_STRING='HDF5 C++ 1.4.4' +PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/H5Library.cpp" # Factoring default headers for most tests. @@ -932,7 +934,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 this package to adapt to many kinds of systems. +\`configure' configures HDF5 C++ 1.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -992,7 +994,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of HDF5 C++ 1.4.4:";; + esac cat <<\_ACEOF Optional Features: @@ -1026,6 +1030,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to <hdfhelp@ncsa.uiuc.edu>. _ACEOF fi @@ -1088,6 +1093,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +HDF5 C++ configure 1.4.4 +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1101,7 +1108,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 $as_me, which was +It was created by HDF5 C++ $as_me 1.4.4, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1371,6 +1378,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + ac_aux_dir= for ac_dir in ../bin $srcdir/../bin; do if test -f $ac_dir/install-sh; then @@ -1396,6 +1412,7 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + # 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 @@ -1485,57 +1502,57 @@ echo "$as_me: error: config.cache file is invalid" >&2;} fi case "$host_os" in - aix4.*) - host_os_novers=aix4.x - ;; - freebsd*) - host_os_novers=freebsd - ;; - irix5.*) - host_os_novers=irix5.x - ;; - irix6.*) - host_os_novers=irix6.x - ;; - osf4.*) - host_os_novers=osf4.x - ;; - solaris2.*) - host_os_novers=solaris2.x - ;; - *) - host_os_novers=$host_os - ;; + aix4.*) + host_os_novers=aix4.x + ;; + freebsd*) + host_os_novers=freebsd + ;; + irix5.*) + host_os_novers=irix5.x + ;; + irix6.*) + host_os_novers=irix6.x + ;; + osf4.*) + host_os_novers=osf4.x + ;; + solaris2.*) + host_os_novers=solaris2.x + ;; + *) + host_os_novers=$host_os + ;; esac DEFAULT_LIBS="" host_config="none" for f in $host_cpu-$host_vendor-$host_os \ - $host_cpu-$host_vendor-$host_os_novers \ - $host_vendor-$host_os \ + $host_cpu-$host_vendor-$host_os_novers \ + $host_vendor-$host_os \ $host_vendor-$host_os_novers \ - $host_cpu-$host_os \ + $host_cpu-$host_os \ $host_cpu-$host_os_novers \ $host_cpu-$host_vendor \ - $host_os \ - $host_os_novers \ - $host_vendor \ - $host_cpu ; do - echo "$as_me:$LINENO: checking for config $f" >&5 + $host_os \ + $host_os_novers \ + $host_vendor \ + $host_cpu ; do + echo "$as_me:$LINENO: checking for config $f" >&5 echo $ECHO_N "checking for config $f... $ECHO_C" >&6 - if test -f $srcdir/config/$f; then - host_config=$srcdir/config/$f - echo "$as_me:$LINENO: result: found" >&5 + if test -f $srcdir/config/$f; then + host_config=$srcdir/config/$f + echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 - break - fi - echo "$as_me:$LINENO: result: no" >&5 + break + fi + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 done if test "X$host_config" != "Xnone"; then - CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" - . $host_config + CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" + . $host_config fi ac_ext=cc @@ -4377,7 +4394,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4380 "configure"' > conftest.$ac_ext + echo '#line 4397 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4918,7 +4935,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4938: \"$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 @@ -6729,7 +6746,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 6732 "configure" +#line 6749 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -6827,7 +6844,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 6830 "configure" +#line 6847 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7642,28 +7659,28 @@ fi if test -z "$SEARCH"; then - echo "$as_me:$LINENO: checking how make searches directories" >&5 + echo "$as_me:$LINENO: checking how make searches directories" >&5 echo $ECHO_N "checking how make searches directories... $ECHO_C" >&6 - while true; do #for break - cat >maketest <<EOF + while true; do #for break + cat >maketest <<EOF VPATH=$srcdir/config $srcdir/src $srcdir/bin .c.o: - cp $< H5.o + cp $< H5.o foo: H5.o /bin/rm -f H5.o @echo works EOF - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=' ' - echo "$as_me:$LINENO: result: VPATH=DIR1 DIR2 ..." >&5 + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=' ' + echo "$as_me:$LINENO: result: VPATH=DIR1 DIR2 ..." >&5 echo "${ECHO_T}VPATH=DIR1 DIR2 ..." >&6 - break - fi + break + fi - cat >maketest <<EOF + cat >maketest <<EOF VPATH=$srcdir/config:$srcdir/src:$srcdir/bin .c.o: cp $< H5.o @@ -7673,15 +7690,15 @@ foo: H5.o @echo works EOF - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=':' - echo "$as_me:$LINENO: result: VPATH=DIR1:DIR2:..." >&5 + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=':' + echo "$as_me:$LINENO: result: VPATH=DIR1:DIR2:..." >&5 echo "${ECHO_T}VPATH=DIR1:DIR2:..." >&6 - break - fi + break + fi - cat >maketest <<EOF + cat >maketest <<EOF .PATH: $srcdir/config $srcdir/src $srcdir/bin .c.o: cp $< H5.o @@ -7690,26 +7707,26 @@ foo: H5.o /bin/rm -f H5.o @echo works EOF - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='.PATH: ' - SEARCH_SEP=' ' - echo "$as_me:$LINENO: result: .PATH: DIR1 DIR2 ..." >&5 + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='.PATH: ' + SEARCH_SEP=' ' + echo "$as_me:$LINENO: result: .PATH: DIR1 DIR2 ..." >&5 echo "${ECHO_T}.PATH: DIR1 DIR2 ..." >&6 - break - fi + break + fi - SEARCH_RULE='## SEARCH DISABLED: ' - SEARCH_SEP=' ' - echo "$as_me:$LINENO: result: it doesn't" >&5 + SEARCH_RULE='## SEARCH DISABLED: ' + SEARCH_SEP=' ' + echo "$as_me:$LINENO: result: it doesn't" >&5 echo "${ECHO_T}it doesn't" >&6 - if test ! -f configure; then - { { echo "$as_me:$LINENO: error: ${MAKE-make} requires the build and source directories to be the same" >&5 + if test ! -f configure; then + { { echo "$as_me:$LINENO: error: ${MAKE-make} requires the build and source directories to be the same" >&5 echo "$as_me: error: ${MAKE-make} requires the build and source directories to be the same" >&2;} { (exit 1); exit 1; }; } - fi - break - done - rm maketest + fi + break + done + rm maketest fi echo "$as_me:$LINENO: checking for production mode" >&5 @@ -7721,32 +7738,32 @@ if test "${enable_production+set}" = set; then fi; case "X-$enable_production" in - X-yes) - echo "$as_me:$LINENO: result: \"production\"" >&5 + X-yes) + echo "$as_me:$LINENO: result: \"production\"" >&5 echo "${ECHO_T}\"production\"" >&6 - CONFIG_MODE=production - CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" - ;; - X-|X-no) - echo "$as_me:$LINENO: result: \"development\"" >&5 + CONFIG_MODE=production + CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" + ;; + X-|X-no) + echo "$as_me:$LINENO: result: \"development\"" >&5 echo "${ECHO_T}\"development\"" >&6 - CONFIG_MODE=development - CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" - ;; - X-pg|X-profile) - echo "$as_me:$LINENO: result: \"profile\"" >&5 + CONFIG_MODE=development + CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" + ;; + X-pg|X-profile) + echo "$as_me:$LINENO: result: \"profile\"" >&5 echo "${ECHO_T}\"profile\"" >&6 - CONFIG_MODE=profile - CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" - ;; - *) - echo "$as_me:$LINENO: result: \"user-defined\"" >&5 + CONFIG_MODE=profile + CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" + ;; + *) + echo "$as_me:$LINENO: result: \"user-defined\"" >&5 echo "${ECHO_T}\"user-defined\"" >&6 - CONFIG_MODE="$X-enableval" - ;; + CONFIG_MODE="$X-enableval" + ;; esac echo "$as_me:$LINENO: checking if should build only statically linked executables" >&5 @@ -7758,11 +7775,11 @@ if test "${enable_static_exec+set}" = set; then fi; if test "X$STATIC_EXEC" = "Xyes"; then - echo "yes" - LT_STATIC_EXEC="-all-static" + echo "yes" + LT_STATIC_EXEC="-all-static" else - echo "no" - LT_STATIC_EXEC="" + echo "no" + LT_STATIC_EXEC="" fi @@ -7802,7 +7819,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo no + echo no else echo "$as_me: program exited with status $ac_status" >&5 @@ -7810,8 +7827,8 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ( exit $ac_status ) - echo yes - CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" + echo yes + CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -7950,7 +7967,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo yes + echo yes else echo "$as_me: program exited with status $ac_status" >&5 @@ -7958,8 +7975,8 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ( exit $ac_status ) - echo no - CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" + echo no + CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -8025,70 +8042,70 @@ echo "$as_me:$LINENO: checking make" >&5 echo $ECHO_N "checking make... $ECHO_C" >&6 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then - echo "$as_me:$LINENO: result: GNU make" >&5 + sed -n 1p|cut -c1-8`" = "GNU Make"; then + echo "$as_me:$LINENO: result: GNU make" >&5 echo "${ECHO_T}GNU make" >&6 - GMAKE=yes - if test "X$GCC" = "Xyes"; then - DEPEND=config/depend1 - else - DEPEND=config/depend2 - fi -else - echo "$as_me:$LINENO: result: generic" >&5 + GMAKE=yes + if test "X$GCC" = "Xyes"; then + DEPEND=config/depend1 + else + DEPEND=config/depend2 + fi +else + echo "$as_me:$LINENO: result: generic" >&5 echo "${ECHO_T}generic" >&6 fi if test -z "$DEPEND"; then - echo "$as_me:$LINENO: checking how to include a makefile" >&5 + echo "$as_me:$LINENO: checking how to include a makefile" >&5 echo $ECHO_N "checking how to include a makefile... $ECHO_C" >&6 - cat >makeinc <<EOF + cat >makeinc <<EOF foo: @: EOF - while true; do echo '.include <makeinc>' >maketest - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: .include <FILE>" >&5 + while true; do echo '.include <makeinc>' >maketest + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + echo "$as_me:$LINENO: result: .include <FILE>" >&5 echo "${ECHO_T}.include <FILE>" >&6 - DEPEND=config/depend3 - break - fi + DEPEND=config/depend3 + break + fi - echo 'include makeinc' >maketest - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: include FILE" >&5 + echo 'include makeinc' >maketest + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + echo "$as_me:$LINENO: result: include FILE" >&5 echo "${ECHO_T}include FILE" >&6 - DEPEND=config/depend4 - break; - fi + DEPEND=config/depend4 + break; + fi - echo "$as_me:$LINENO: result: you have a deficient make command" >&5 + echo "$as_me:$LINENO: result: you have a deficient make command" >&5 echo "${ECHO_T}you have a deficient make command" >&6 - DEPEND=config/dependN - break - done - rm makeinc maketest + DEPEND=config/dependN + break + done + rm makeinc maketest fi rm -f conftest core core.* *.core conftest.o conftest.c dummy.o $ac_clean_files DYNAMIC_DIRS="" if test -n "$LDFLAGS"; then - for d in $LDFLAGS ; do - case "$d" in - -L*) - d=`echo $d | sed -e 's/-L//g'` - case "$d" in - .*) - d=${ROOT}/$d - ;; - esac - DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" - ;; - esac - done + for d in $LDFLAGS ; do + case "$d" in + -L*) + d=`echo $d | sed -e 's/-L//g'` + case "$d" in + .*) + d=${ROOT}/$d + ;; + esac + DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" + ;; + esac + done fi @@ -8096,15 +8113,15 @@ fi CONCLUDE=config/conclude if test -z "$SEARCH"; then - SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' - cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' - SEARCH="$SEARCH_RULE`eval $cmd`" + SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' + cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' + SEARCH="$SEARCH_RULE`eval $cmd`" fi if test "X$GMAKE" = "Xyes"; then - SETX=":" + SETX=":" else - SETX="set -x" + SETX="set -x" fi rm -f conftest conftest.o conftest.c core core.* *.core dummy.o @@ -8113,6 +8130,7 @@ rm -f conftest conftest.o conftest.c core core.* *.core dummy.o saved_no_create=$no_create no_create=yes ac_config_files="$ac_config_files config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/Makefile test/Makefile examples/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -8469,7 +8487,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by HDF5 C++ $as_me 1.4.4, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8523,7 +8541,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +HDF5 C++ config.status 1.4.4 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/c++/configure.in b/c++/configure.in index 78c4e8d..ce50178 100644 --- a/c++/configure.in +++ b/c++/configure.in @@ -10,8 +10,18 @@ dnl ---------------------------------------------------------------------- dnl Initialize configure. dnl AC_REVISION($Id$) -AC_INIT(src/H5Library.cpp) -AC_CONFIG_AUX_DIR(../bin) + +dnl AC_INIT takes the name of the package, the version number, and an +dnl email address to report bugs. AC_CONFIG_SRCDIR takes a unique file +dnl as its argument. +dnl +dnl NOTE: Don't forget to change the version number here when we do a +dnl release!!! +dnl +AC_INIT([HDF5 C++], [1.4.4], [hdfhelp@ncsa.uiuc.edu]) +AC_CONFIG_SRCDIR([src/H5Library.cpp]) +AC_CONFIG_AUX_DIR([../bin]) + AC_CANONICAL_HOST AC_SUBST(CPPFLAGS) @@ -65,27 +75,27 @@ dnl dnl If the `OS' ends with a version number then remove it. For instance, dnl `freebsd3.1' would become `freebsd' case "$host_os" in - aix4.*) - host_os_novers=aix4.x - ;; - freebsd*) - host_os_novers=freebsd - ;; - irix5.*) - host_os_novers=irix5.x - ;; - irix6.*) - host_os_novers=irix6.x - ;; - osf4.*) - host_os_novers=osf4.x - ;; - solaris2.*) - host_os_novers=solaris2.x - ;; - *) - host_os_novers=$host_os - ;; + aix4.*) + host_os_novers=aix4.x + ;; + freebsd*) + host_os_novers=freebsd + ;; + irix5.*) + host_os_novers=irix5.x + ;; + irix6.*) + host_os_novers=irix6.x + ;; + osf4.*) + host_os_novers=osf4.x + ;; + solaris2.*) + host_os_novers=solaris2.x + ;; + *) + host_os_novers=$host_os + ;; esac dnl Different compilers may need default libraries. They are specified in @@ -96,27 +106,27 @@ AC_SUBST(DEFAULT_LIBS) DEFAULT_LIBS="" host_config="none" for f in $host_cpu-$host_vendor-$host_os \ - $host_cpu-$host_vendor-$host_os_novers \ - $host_vendor-$host_os \ + $host_cpu-$host_vendor-$host_os_novers \ + $host_vendor-$host_os \ $host_vendor-$host_os_novers \ - $host_cpu-$host_os \ + $host_cpu-$host_os \ $host_cpu-$host_os_novers \ $host_cpu-$host_vendor \ - $host_os \ - $host_os_novers \ - $host_vendor \ - $host_cpu ; do - AC_MSG_CHECKING(for config $f) - if test -f $srcdir/config/$f; then - host_config=$srcdir/config/$f - AC_MSG_RESULT(found) - break - fi - AC_MSG_RESULT(no) + $host_os \ + $host_os_novers \ + $host_vendor \ + $host_cpu ; do + AC_MSG_CHECKING(for config $f) + if test -f $srcdir/config/$f; then + host_config=$srcdir/config/$f + AC_MSG_RESULT(found) + break + fi + AC_MSG_RESULT(no) done if test "X$host_config" != "Xnone"; then - CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" - . $host_config + CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" + . $host_config fi dnl ---------------------------------------------------------------------- @@ -153,29 +163,29 @@ dnl with an action should override the `all' default target. So we have dnl to decide what the proper syntax is. dnl if test -z "$SEARCH"; then - AC_MSG_CHECKING(how make searches directories) - while true; do #for break - dnl The most common method is `VPATH=DIR1 DIR2 ...' - cat >maketest <<EOF + AC_MSG_CHECKING(how make searches directories) + while true; do #for break + dnl The most common method is `VPATH=DIR1 DIR2 ...' + cat >maketest <<EOF VPATH=$srcdir/config $srcdir/src $srcdir/bin .c.o: - cp $< H5.o + cp $< H5.o foo: H5.o /bin/rm -f H5.o @echo works EOF - - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=' ' - AC_MSG_RESULT([VPATH=DIR1 DIR2 ...]) - break - fi - - dnl The second most common method is like above except with the - dnl directories separated by colons. - cat >maketest <<EOF + + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=' ' + AC_MSG_RESULT([VPATH=DIR1 DIR2 ...]) + break + fi + + dnl The second most common method is like above except with the + dnl directories separated by colons. + cat >maketest <<EOF VPATH=$srcdir/config:$srcdir/src:$srcdir/bin .c.o: cp $< H5.o @@ -185,15 +195,15 @@ foo: H5.o @echo works EOF - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=':' - AC_MSG_RESULT([VPATH=DIR1:DIR2:...]) - break - fi - - dnl pmake uses the construct `.PATH: DIR1 DIR2 - cat >maketest <<EOF + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=':' + AC_MSG_RESULT([VPATH=DIR1:DIR2:...]) + break + fi + + dnl pmake uses the construct `.PATH: DIR1 DIR2 + cat >maketest <<EOF .PATH: $srcdir/config $srcdir/src $srcdir/bin .c.o: cp $< H5.o @@ -202,23 +212,23 @@ foo: H5.o /bin/rm -f H5.o @echo works EOF - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - SEARCH_RULE='.PATH: ' - SEARCH_SEP=' ' - AC_MSG_RESULT([.PATH: DIR1 DIR2 ...]) - break - fi - - dnl No way for make to search directories - SEARCH_RULE='## SEARCH DISABLED: ' + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='.PATH: ' SEARCH_SEP=' ' - AC_MSG_RESULT([it doesn't]) - if test ! -f configure; then - AC_MSG_ERROR(${MAKE-make} requires the build and source directories to be the same) - fi + AC_MSG_RESULT([.PATH: DIR1 DIR2 ...]) break - done - rm maketest + fi + + dnl No way for make to search directories + SEARCH_RULE='## SEARCH DISABLED: ' + SEARCH_SEP=' ' + AC_MSG_RESULT([it doesn't]) + if test ! -f configure; then + AC_MSG_ERROR(${MAKE-make} requires the build and source directories to be the same) + fi + break + done + rm maketest fi dnl ---------------------------------------------------------------------- @@ -230,28 +240,28 @@ AC_ARG_ENABLE(production, [ --enable-production Determines how to run the compiler.]) case "X-$enable_production" in - X-yes) - AC_MSG_RESULT("production") - CONFIG_MODE=production - CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" - ;; - X-|X-no) - AC_MSG_RESULT("development") - CONFIG_MODE=development - CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" - ;; - X-pg|X-profile) - AC_MSG_RESULT("profile") - CONFIG_MODE=profile - CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" - ;; - *) - AC_MSG_RESULT("user-defined") - CONFIG_MODE="$X-enableval" - ;; + X-yes) + AC_MSG_RESULT("production") + CONFIG_MODE=production + CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" + ;; + X-|X-no) + AC_MSG_RESULT("development") + CONFIG_MODE=development + CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" + ;; + X-pg|X-profile) + AC_MSG_RESULT("profile") + CONFIG_MODE=profile + CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" + ;; + *) + AC_MSG_RESULT("user-defined") + CONFIG_MODE="$X-enableval" + ;; esac dnl ---------------------------------------------------------------------- @@ -259,15 +269,15 @@ dnl If we should build only static executables dnl AC_MSG_CHECKING(if should build only statically linked executables) AC_ARG_ENABLE(static_exec, - [ --enable-static-exec Build only statically linked executables [default=no]], - STATIC_EXEC=$enableval) + [ --enable-static-exec Build only statically linked executables [default=no]], + STATIC_EXEC=$enableval) if test "X$STATIC_EXEC" = "Xyes"; then - echo "yes" - LT_STATIC_EXEC="-all-static" + echo "yes" + LT_STATIC_EXEC="-all-static" else - echo "no" - LT_STATIC_EXEC="" + echo "no" + LT_STATIC_EXEC="" fi AC_SUBST(LT_STATIC_EXEC) @@ -282,10 +292,10 @@ AC_TRY_RUN([ int main(void) { return 0; } ], [ - echo no + echo no ], [ - echo yes - CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" + echo yes + CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" ]) AC_MSG_CHECKING(if $CXX can handle namespaces) @@ -337,10 +347,10 @@ int main(void) { return 0; } ], [ - echo yes + echo yes ], [ - echo no - CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" + echo no + CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" ]) dnl ---------------------------------------------------------------------- @@ -353,52 +363,52 @@ AC_CACHE_SAVE AC_MSG_CHECKING(make) AC_SUBST_FILE(DEPEND) if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then - AC_MSG_RESULT(GNU make) - GMAKE=yes - if test "X$GCC" = "Xyes"; then - DEPEND=config/depend1 - else - DEPEND=config/depend2 - fi + sed -n 1p|cut -c1-8`" = "GNU Make"; then + AC_MSG_RESULT(GNU make) + GMAKE=yes + if test "X$GCC" = "Xyes"; then + DEPEND=config/depend1 + else + DEPEND=config/depend2 + fi else - AC_MSG_RESULT(generic) + AC_MSG_RESULT(generic) fi dnl How do we include another file into a Makefile? if test -z "$DEPEND"; then - AC_MSG_CHECKING(how to include a makefile) + AC_MSG_CHECKING(how to include a makefile) - dnl The include file contains the target for `foo' - cat >makeinc <<EOF + dnl The include file contains the target for `foo' + cat >makeinc <<EOF foo: @: EOF - while true; do dnl for break - dnl pmake. We have to be careful because some pmake think that the - dnl contents of the MAKE environment variable is a target. - echo '.include <makeinc>' >maketest - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - AC_MSG_RESULT([.include <FILE>]) - DEPEND=config/depend3 - break - fi - - dnl Most make's use `include FILE' - echo 'include makeinc' >maketest - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - AC_MSG_RESULT(include FILE) - DEPEND=config/depend4 - break; - fi - - dnl default - AC_MSG_RESULT(you have a deficient make command) - DEPEND=config/dependN + while true; do dnl for break + dnl pmake. We have to be careful because some pmake think that the + dnl contents of the MAKE environment variable is a target. + echo '.include <makeinc>' >maketest + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + AC_MSG_RESULT([.include <FILE>]) + DEPEND=config/depend3 break - done - rm makeinc maketest + fi + + dnl Most make's use `include FILE' + echo 'include makeinc' >maketest + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + AC_MSG_RESULT(include FILE) + DEPEND=config/depend4 + break; + fi + + dnl default + AC_MSG_RESULT(you have a deficient make command) + DEPEND=config/dependN + break + done + rm makeinc maketest fi dnl Some cleanup stuff @@ -411,21 +421,21 @@ dnl libraries. dnl DYNAMIC_DIRS="" if test -n "$LDFLAGS"; then - for d in $LDFLAGS ; do - case "$d" in - -L*) - d=`echo $d | sed -e 's/-L//g'` - case "$d" in - .*) - dnl If the path isn't absolute, make it so by prepending the - dnl ROOT directory to it. - d=${ROOT}/$d - ;; - esac - DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" - ;; - esac - done + for d in $LDFLAGS ; do + case "$d" in + -L*) + d=`echo $d | sed -e 's/-L//g'` + case "$d" in + .*) + dnl If the path isn't absolute, make it so by prepending the + dnl ROOT directory to it. + d=${ROOT}/$d + ;; + esac + DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" + ;; + esac + done fi AC_SUBST(DYNAMIC_DIRS) @@ -439,17 +449,17 @@ AC_SUBST_FILE(CONCLUDE) CONCLUDE=config/conclude dnl The directory search list if test -z "$SEARCH"; then - AC_SUBST(SEARCH) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' - cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' - SEARCH="$SEARCH_RULE`eval $cmd`" + AC_SUBST(SEARCH) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' + cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' + SEARCH="$SEARCH_RULE`eval $cmd`" fi dnl We don't need to say when we're entering directories if we're using dnl GNU make becuase make does it for us. if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" + AC_SUBST(SETX) SETX=":" else - AC_SUBST(SETX) SETX="set -x" + AC_SUBST(SETX) SETX="set -x" fi dnl Some cleanup stuff @@ -463,9 +473,18 @@ dnl things need to be done. dnl Then the config.status file (but not makefiles) saved_no_create=$no_create no_create=yes -AC_OUTPUT(config/depend1 config/depend2 config/depend3 config/depend4 \ - config/dependN config/commence config/conclude Makefile \ - src/Makefile test/Makefile examples/Makefile) +AC_CONFIG_FILES([config/depend1 + config/depend2 + config/depend3 + config/depend4 + config/dependN + config/commence + config/conclude + Makefile + src/Makefile + test/Makefile + examples/Makefile]) +AC_OUTPUT no_create=$saved_no_create dnl Finally the makefiles @@ -1,7 +1,9 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.53 for HDF5 1.4.4. +# +# Report bugs to <hdfhelp@ncsa.uiuc.edu>. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -412,11 +414,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='HDF5' +PACKAGE_TARNAME='hdf5' +PACKAGE_VERSION='1.4.4' +PACKAGE_STRING='HDF5 1.4.4' +PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/H5.c" ac_subdirs_all="$ac_subdirs_all ${config_dirs}" @@ -921,7 +923,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 this package to adapt to many kinds of systems. +\`configure' configures HDF5 1.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -981,7 +983,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of HDF5 1.4.4:";; + esac cat <<\_ACEOF Optional Features: @@ -1046,6 +1050,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to <hdfhelp@ncsa.uiuc.edu>. _ACEOF fi @@ -1108,6 +1113,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +HDF5 configure 1.4.4 +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1121,7 +1128,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 $as_me, which was +It was created by HDF5 $as_me 1.4.4, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1391,9 +1398,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + ac_config_headers="$ac_config_headers src/H5config.h" -ac_config_commands="$ac_config_commands default-1" ac_aux_dir= for ac_dir in bin $srcdir/bin; do @@ -1420,6 +1435,10 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess" 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 @@ -1555,16 +1574,16 @@ esac host_config="none" for f in $host_cpu-$host_vendor-$host_os \ - $host_cpu-$host_vendor-$host_os_novers \ - $host_vendor-$host_os \ + $host_cpu-$host_vendor-$host_os_novers \ + $host_vendor-$host_os \ $host_vendor-$host_os_novers \ - $host_cpu-$host_os \ + $host_cpu-$host_os \ $host_cpu-$host_os_novers \ $host_cpu-$host_vendor \ - $host_os \ - $host_os_novers \ - $host_vendor \ - $host_cpu ; do + $host_os \ + $host_os_novers \ + $host_vendor \ + $host_cpu ; do echo "$as_me:$LINENO: checking for config $f" >&5 echo $ECHO_N "checking for config $f... $ECHO_C" >&6 if test -f "$srcdir/config/$f"; then @@ -4074,7 +4093,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4077 "configure"' > conftest.$ac_ext + echo '#line 4096 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4615,7 +4634,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4637: \"$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 @@ -6426,7 +6445,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 6429 "configure" +#line 6448 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -6524,7 +6543,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 6527 "configure" +#line 6546 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7259,7 +7278,7 @@ echo "$as_me:$LINENO: checking make" >&5 echo $ECHO_N "checking make... $ECHO_C" >&6 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then + sed -n 1p|cut -c1-8`" = "GNU Make"; then echo "$as_me:$LINENO: result: GNU make" >&5 echo "${ECHO_T}GNU make" >&6 GMAKE=yes @@ -29302,6 +29321,7 @@ if test -n "$TESTPARALLEL"; then fi ac_config_files="$ac_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 $PARALLEL_MAKE perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/gifconv/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 doc/html/Tutor/examples/Makefile doc/html/Tutor/examples/java/Makefile doc/html/cpplus/Makefile doc/html/fortran/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -29627,7 +29647,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by HDF5 $as_me 1.4.4, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29689,7 +29709,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +HDF5 config.status 1.4.4 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 60f6d91..3ac9eae 100644 --- a/configure.in +++ b/configure.in @@ -8,8 +8,20 @@ dnl ---------------------------------------------------------------------- dnl Initialize configure. dnl AC_REVISION($Id$) -AC_INIT(src/H5.c) -AC_CONFIG_HEADER(src/H5config.h) + +dnl AC_INIT takes the name of the package, the version number, and an +dnl email address to report bugs. AC_CONFIG_SRCDIR takes a unique file +dnl as its argument. +dnl +dnl NOTE: Don't forget to change the version number here when we do a +dnl release!!! +dnl +AC_INIT([HDF5], [1.4.4], [hdfhelp@ncsa.uiuc.edu]) +AC_CONFIG_SRCDIR([src/H5.c]) +AC_CONFIG_HEADER([src/H5config.h]) + +AC_CONFIG_AUX_DIR([bin]) + AC_OUTPUT_COMMANDS([ echo "creating src/H5pubconf.h" sed 's/#define /#define H5_/' <src/H5config.h |\ @@ -23,7 +35,7 @@ AC_OUTPUT_COMMANDS([ /bin/mv -f pubconf src/H5pubconf.h fi ]) -AC_CONFIG_AUX_DIR(bin) + AC_CANONICAL_HOST AC_SUBST(CPPFLAGS) @@ -114,16 +126,16 @@ esac host_config="none" for f in $host_cpu-$host_vendor-$host_os \ - $host_cpu-$host_vendor-$host_os_novers \ - $host_vendor-$host_os \ + $host_cpu-$host_vendor-$host_os_novers \ + $host_vendor-$host_os \ $host_vendor-$host_os_novers \ - $host_cpu-$host_os \ + $host_cpu-$host_os \ $host_cpu-$host_os_novers \ $host_cpu-$host_vendor \ - $host_os \ - $host_os_novers \ - $host_vendor \ - $host_cpu ; do + $host_os \ + $host_os_novers \ + $host_vendor \ + $host_cpu ; do AC_MSG_CHECKING(for config $f) if test -f "$srcdir/config/$f"; then host_config=$srcdir/config/$f @@ -257,7 +269,7 @@ esac AC_MSG_CHECKING(make) AC_SUBST_FILE(DEPEND) if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then + sed -n 1p|cut -c1-8`" = "GNU Make"; then AC_MSG_RESULT(GNU make) GMAKE=yes if test "X$GCC" = "Xyes"; then @@ -1602,41 +1614,42 @@ if test -n "$TESTPARALLEL"; then PARALLEL_MAKE="$TESTPARALLEL/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 - $PARALLEL_MAKE - perform/Makefile - tools/Makefile - tools/h5dump/Makefile - tools/h5ls/Makefile - tools/lib/Makefile - tools/misc/Makefile - tools/misc/h5cc - tools/gifconv/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 - doc/html/Tutor/examples/Makefile - doc/html/Tutor/examples/java/Makefile - doc/html/cpplus/Makefile - doc/html/fortran/Makefile) +AC_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 + $PARALLEL_MAKE + perform/Makefile + tools/Makefile + tools/h5dump/Makefile + tools/h5ls/Makefile + tools/lib/Makefile + tools/misc/Makefile + tools/misc/h5cc + tools/gifconv/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 + doc/html/Tutor/examples/Makefile + doc/html/Tutor/examples/java/Makefile + doc/html/cpplus/Makefile + doc/html/fortran/Makefile]) +AC_OUTPUT no_create=$saved_no_create # Then the stamp2 file for H5config.h diff --git a/fortran/configure b/fortran/configure index 1e89d25..066c124 100755 --- a/fortran/configure +++ b/fortran/configure @@ -1,7 +1,9 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.53 for HDF5 Fortran 1.4.4. +# +# Report bugs to <hdfhelp@ncsa.uiuc.edu>. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -412,11 +414,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='HDF5 Fortran' +PACKAGE_TARNAME='hdf5-fortran' +PACKAGE_VERSION='1.4.4' +PACKAGE_STRING='HDF5 Fortran 1.4.4' +PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/HDF5.f90" # Factoring default headers for most tests. @@ -920,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 this package to adapt to many kinds of systems. +\`configure' configures HDF5 Fortran 1.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -980,7 +982,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of HDF5 Fortran 1.4.4:";; + esac cat <<\_ACEOF Optional Features: @@ -998,7 +1002,16 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both - --with-zlib=DIR Use the GNU zlib compression + + For the following --with-xxx options, you can specify where the header + files and libraries are in two different ways: + + --with-xxx=INC,LIB - Specify individually the include directory and + library directory separated by a comma + --with-xxx=DIR - Specify only the directory which contains the + include/ and lib/ subdirectories + + --with-zlib=DIR Use the GNU zlib compression Some influential environment variables: CC C compiler command @@ -1012,6 +1025,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to <hdfhelp@ncsa.uiuc.edu>. _ACEOF fi @@ -1074,6 +1088,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +HDF5 Fortran configure 1.4.4 +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1087,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 $as_me, which was +It was created by HDF5 Fortran $as_me 1.4.4, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1357,6 +1373,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + ac_aux_dir= for ac_dir in ../bin $srcdir/../bin; do if test -f $ac_dir/install-sh; then @@ -1382,6 +1407,7 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + # 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 @@ -3850,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 3853 "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=$? @@ -4391,7 +4417,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4394: \"$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 @@ -6202,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 6205 "configure" +#line 6231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -6300,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 6303 "configure" +#line 6329 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7459,6 +7485,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Check whether --with-fnord or --without-fnord was given. +if test "${with_fnord+set}" = set; then + withval="$with_fnord" + +fi; + + ac_cv_lib_z_compress="" # Check whether --with-zlib or --without-zlib was given. @@ -8404,6 +8437,7 @@ fi saved_no_create=$no_create no_create=yes ac_config_files="$ac_config_files config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/H5fortran_types.f90 src/Makefile test/Makefile $PARALLEL_MAKE examples/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -8760,7 +8794,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by HDF5 Fortran $as_me 1.4.4, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8814,7 +8848,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +HDF5 Fortran config.status 1.4.4 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/fortran/configure.in b/fortran/configure.in index e9f138b..2c47a48 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -10,8 +10,18 @@ dnl ---------------------------------------------------------------------- dnl Initialize configure. dnl AC_REVISION($Id$) -AC_INIT(src/HDF5.f90) -AC_CONFIG_AUX_DIR(../bin) + +dnl AC_INIT takes the name of the package, the version number, and an +dnl email address to report bugs. AC_CONFIG_SRCDIR takes a unique file +dnl as its argument. +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_CONFIG_SRCDIR([src/HDF5.f90]) +AC_CONFIG_AUX_DIR([../bin]) + AC_CANONICAL_HOST AC_SUBST(CPPFLAGS) AC_SUBST(FFLAGS) @@ -260,6 +270,22 @@ dnl ---------------------------------------------------------------------- dnl Checks for libraries. dnl +dnl ---------------------------------------------------------------------- +dnl Fake --with-xxx option to allow us to create a help message for the +dnl following --with-xxx options which can take either a =DIR or =INC,LIB +dnl specifier. +dnl +AC_ARG_WITH(fnord, + [ + For the following --with-xxx options, you can specify where the header + files and libraries are in two different ways: + + --with-xxx=INC,LIB - Specify individually the include directory and + library directory separated by a comma + --with-xxx=DIR - Specify only the directory which contains the + include/ and lib/ subdirectories + ],,) + dnl Is the GNU zlib present? It has a header file `zlib.h' and a library dnl `-lz' and their locations might be specified with the `--enable-zlib' dnl command-line switch. The value is an include path and/or a library path. @@ -271,7 +297,7 @@ dnl Some systems where you need to specify exactly where the zlib is need dnl this. ac_cv_lib_z_compress="" AC_ARG_WITH(zlib, - [ --with-zlib[=DIR] Use the GNU zlib compression],, + [ --with-zlib[=DIR] Use the GNU zlib compression],, withval=yes) case "$withval" in @@ -657,19 +683,20 @@ fi dnl Then the config.status file (but not makefiles) saved_no_create=$no_create no_create=yes -AC_OUTPUT(config/depend1 - config/depend2 - config/depend3 - config/depend4 - config/dependN - config/commence - config/conclude - Makefile - src/H5fortran_types.f90 - src/Makefile - test/Makefile - $PARALLEL_MAKE - examples/Makefile) +AC_CONFIG_FILES([config/depend1 + config/depend2 + config/depend3 + config/depend4 + config/dependN + config/commence + config/conclude + Makefile + src/H5fortran_types.f90 + src/Makefile + test/Makefile + $PARALLEL_MAKE + examples/Makefile]) +AC_OUTPUT no_create=$saved_no_create dnl Then the stamp2 file for H5config.h |