diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-08-28 17:47:52 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-08-28 17:47:52 (GMT) |
| commit | 1673b04a23066b6dca3a4b372e7cc5a76888dd17 (patch) | |
| tree | 7ec54a58bcdbe8d3814c0257e4a419ca3281ee06 | |
| parent | b257bab294e5cef35dca83222c44572922f822fa (diff) | |
| download | hdf5-1673b04a23066b6dca3a4b372e7cc5a76888dd17.zip hdf5-1673b04a23066b6dca3a4b372e7cc5a76888dd17.tar.gz hdf5-1673b04a23066b6dca3a4b372e7cc5a76888dd17.tar.bz2 | |
[svn-r22722] Update all references from configure.in to configure.ac
Tested: h5committest
| -rwxr-xr-x | bin/chkconfigure | 4 | ||||
| -rwxr-xr-x | bin/chkcopyright | 22 | ||||
| -rwxr-xr-x | bin/h5vers | 18 | ||||
| -rw-r--r-- | config/Makefile.am.blank | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hl/tools/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/tools/Makefile.in | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 26 | ||||
| -rw-r--r-- | src/H5private.h | 4 | ||||
| -rw-r--r-- | vms/src/h5pubconf.h | 2 |
10 files changed, 37 insertions, 47 deletions
diff --git a/bin/chkconfigure b/bin/chkconfigure index f66619e..abafae8 100755 --- a/bin/chkconfigure +++ b/bin/chkconfigure @@ -18,8 +18,8 @@ # Created Date: 2004/12/07 # -# Configure: should be generated by autoconf version 2.68. -# autoconf: should be of version 2.68. +# Configure: should be generated by autoconf version 2.69. +# autoconf: should be of version 2.69. # variable initialization nerrors=0 diff --git a/bin/chkcopyright b/bin/chkcopyright index f5ad67a54..fe9fe49 100755 --- a/bin/chkcopyright +++ b/bin/chkcopyright @@ -57,7 +57,7 @@ SH_COPYRIGHT=/tmp/h5chkright_SH.$$ # SHELL style copyright SH_COPYRIGHT2=/tmp/h5chkright_SH2.$$ # SHELL style copyright, 2nd style. WINBAT_COPYRIGHT=/tmp/h5chkright_WINBAT.$$ # Windows Batch file Copyright notice VMSCMD_COPYRIGHT=/tmp/h5chkright_VMSCMD.$$ # VMS command file Copyright notice -CONFIGURE_IN_COPYRIGHT=/tmp/h5chkright_CONFIGURE_IN.$$ # configure.in file Copyright notice +CONFIGURE_AC_COPYRIGHT=/tmp/h5chkright_CONFIGURE_AC.$$ # configure.ac file Copyright notice tmpfixfile=/tmp/h5chkright_fix.$$ # Temporary fixed copy of file @@ -207,8 +207,8 @@ EOF @REM access to either file, you may request a copy from help@hdfgroup.org. EOF - # configure.in file Copyright notice - cat > ${CONFIGURE_IN_COPYRIGHT} << \EOF + # configure.ac file Copyright notice + cat > ${CONFIGURE_AC_COPYRIGHT} << \EOF dnl Copyright by The HDF Group. dnl Copyright by the Board of Trustees of the University of Illinois. dnl All rights reserved. @@ -635,10 +635,10 @@ VMSCMD_FILE() # Check Configure.in type files # -CONFIGURE_IN_FILE() +CONFIGURE_AC_FILE() { f=$1 - case `MATCH_COPYRIGHT $CONFIGURE_IN_COPYRIGHT $f` in + case `MATCH_COPYRIGHT $CONFIGURE_AC_COPYRIGHT $f` in PASSED) PASSED $f return @@ -646,9 +646,9 @@ CONFIGURE_IN_FILE() FAILED) # show the difference FAILED $f - $DIFF ${EXTRACTEDFILE} ${CONFIGURE_IN_COPYRIGHT} + $DIFF ${EXTRACTEDFILE} ${CONFIGURE_AC_COPYRIGHT} if [ -n "$FIXIT" ]; then - FIX_COPYRIGHT $CONFIGURE_IN_COPYRIGHT $f + FIX_COPYRIGHT $CONFIGURE_AC_COPYRIGHT $f fi ;; esac @@ -681,8 +681,8 @@ GUESS_File_Type() # Put this after C_SOURCE which may have #define and such lines. echo SHELL_FILE elif grep '^dnl' < $tmpfile > /dev/null; then - # Some lines start with a "dnl". It may be a configure.in type file. - echo CONFIGURE_IN_FILE + # Some lines start with a "dnl". It may be a configure.ac type file. + echo CONFIGURE_AC_FILE elif grep -i '^<html>' < $tmpfile > /dev/null || \ grep '^<!--' < $tmpfile > /dev/null ; then # Some lines start with a "<html>" or having an html comment tag. @@ -827,8 +827,8 @@ while read file; do *Makefile | *Makefile.in | *Makefile.am | Makefile.dist ) MAKE_FILE ${file} ;; - configure.in ) - CONFIGURE_IN_FILE ${file} + configure.ac ) + CONFIGURE_AC_FILE ${file} ;; *.bat | *.BAT ) # Windows Batch files @@ -71,7 +71,7 @@ use strict; # the command line) then the first line of the README.txt and RELEASE.txt files # one directory above the H5public.h file is also modified so it looks # something like: This is hdf5-1.2.3-pre1 currently under development. -# The AC_INIT macro in configure.in will also change in this case to be +# The AC_INIT macro in configure.ac will also change in this case to be # something like: AC_INIT([HDF5], [hdf5-1.2.3-pre1], [help@hdfgroup.org]) # Version changes are also reflected in the Windows-maintained H5pubconf.h # file. @@ -159,10 +159,10 @@ while ($_ = shift) { die "mutually exclusive options given\n" if $set && $inc; # Determine file to use as H5public.h, README.txt, -# release_docs/RELEASE.txt, configure.in, windows/src/H5pubconf.h, -# vms/src/h5pubcof.h and config/lt_vers.am. -# The README.txt, release_docs/RELEASE.txt, configure.in, -# windows/src/H5pubconf.h, vms/src/h5pubconf.h and config/lt_vers.am +# release_docs/RELEASE.txt, configure.ac, windows/src/H5pubconf.h, +# vms/src/h5pubconf.h and config/lt_vers.am. +# The README.txt, release_docs/RELEASE.txt, configure.ac, +# vms/src/h5pubconf.h, windows/src/H5pubconf.h, and config/lt_vers.am # files are always in the directory above H5public.h unless ($file) { for (@files) { @@ -183,9 +183,9 @@ die "unable to read file: $README\n" unless -r $file; my $RELEASE = $file; $RELEASE =~ s/[^\/]*$/..\/release_docs\/RELEASE.txt/; die "unable to read file: $RELEASE\n" unless -r $file; -# configure.in +# configure.ac my $CONFIGURE = $file; -$CONFIGURE =~ s/[^\/]*$/..\/configure.in/; +$CONFIGURE =~ s/[^\/]*$/..\/configure.ac/; die "unable to read file: $CONFIGURE\n" unless -r $file; # windows/src/H5pubconf.h my $H5PUBCONF = $file; @@ -339,7 +339,7 @@ sub gen_configure { print FILE @contents; close FILE; - $conf =~ /^(.*?)\/?configure.in$/; + $conf =~ /^(.*?)\/?configure.ac$/; if ($1) { $rc = system("cd $1 && bin/reconfigure >/dev/null 2>/dev/null && rm -rf autom4te.cache"); @@ -352,7 +352,7 @@ sub gen_configure { } } -# Update the configure.in files and regenerate them +# Update the configure.ac files and regenerate them gen_configure("HDF5", $CONFIGURE) if $CONFIGURE; sub gen_h5pubconf { diff --git a/config/Makefile.am.blank b/config/Makefile.am.blank index a091c60..05799fc 100644 --- a/config/Makefile.am.blank +++ b/config/Makefile.am.blank @@ -20,7 +20,7 @@ # ## Makefile.am template -## When automake is run, it scans configure.in to find all Makefiles used by +## When automake is run, it scans configure.ac to find all Makefiles used by ## the build that come from Makefile.in files. If there are Makefile.am's ## in any of those locations, it parses the Makefile.am's to produce ## Makefile.in's, which configure uses to create Makefiles. diff --git a/configure.ac b/configure.ac index 2969647..615f7be 100644 --- a/configure.ac +++ b/configure.ac @@ -922,7 +922,7 @@ fi dnl ---------------------------------------------------------------------- dnl Fortran libraries are not currently supported on Mac. Disable them. -dnl this is overridable with '--enable-unsupported'. +dnl (this is overridable with --enable-unsupported). dnl AC_SUBST([H5_FORTRAN_SHARED]) H5_FORTRAN_SHARED="no" diff --git a/hl/tools/Makefile.am b/hl/tools/Makefile.am index 71eb149..5ef8a96 100644 --- a/hl/tools/Makefile.am +++ b/hl/tools/Makefile.am @@ -22,6 +22,6 @@ include $(top_srcdir)/config/commence.am # All subdirectories -SUBDIRS=gif2h5 +SUBDIRS=gif2h5 include $(top_srcdir)/config/conclude.am diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 4a428ce..23baa17 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -424,7 +424,7 @@ TRACE = perl $(top_srcdir)/bin/trace CHECK_CLEANFILES = *.chkexe *.chklog *.clog # All subdirectories -SUBDIRS = gif2h5 +SUBDIRS = gif2h5 # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index aae4e6b..1426538 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1061,22 +1061,14 @@ Platforms Tested Sun Fortran 95 8.4 SunOS_sparc Patch 128231-06 Sun C++ 5.10 SunOS_sparc 128228-11 - - Windows XP Visual Studio 2008 w/ Intel Fortran 11.1 - Visual Studio 2010 - Cygwin(1.7.7 native gcc(4.3.4) compiler and gfortran) - - Windows XP x64 Visual Studio 2008 w/ Intel Fortran 11.1 - Visual Studio 2010 - Cygwin(1.7.7 native gcc(4.3.4) compiler and gfortran) - - Windows Vista Visual Studio 2008 w/ Intel Fortran 11.1 - - Windows Vista x64 Visual Studio 2008 w/ Intel Fortran 11.1 - Windows 7 Visual Studio 2010 + Windows 7 Visual Studio 2008 w/ Intel Fortran 11.1 (cmake) + Visual Studio 2010 w/ Intel Fortran 12 (cmake) + Cygwin(1.7.9 native gcc(4.5.3) compiler and gfortran) - Windows 7 x64 Visual Studio 2010 + Windows 7 x64 Visual Studio 2008 w/ Intel Fortran 11.1 (cmake) + Visual Studio 2010 w/ Intel Fortran 12 (cmake) + Cygwin(1.7.9 native gcc(4.5.3) compiler and gfortran) MAC OS 10.5 (Intel) gcc i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 G95 (GCC 4.0.3 (g95 0.91!) Nov 21 2006) @@ -1099,10 +1091,8 @@ Platform C F90 F90 C++ zlib SZIP parallel parallel SunOS5.10 64-bit n y n y y y SunOS5.10 32-bit n y n y y y -Windows XP n y(3) n(3) y y y -Windows XP x64 n y(3) n(3) y y y -Windows Vista n y(3) n(3) y y y -Windows Vista x64 n y(3) n(3) y y y +Windows 7 y y n y y y +Windows 7 x64 y y n y y y Mac OS X 10.5 Intel n y n y y y FreeBSD 8.2 32- and 64-bit n x n x y y RedHat EL4 2.6.9 i686 GNU W y(2) y(4) y(2) y y y diff --git a/src/H5private.h b/src/H5private.h index d30298f..7dfd349 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -94,13 +94,13 @@ /* * If a program may include both `time.h' and `sys/time.h' then - * TIME_WITH_SYS_TIME is defined (see AC_HEADER_TIME in configure.in). + * TIME_WITH_SYS_TIME is defined (see AC_HEADER_TIME in configure.ac). * On some older systems, `sys/time.h' includes `time.h' but `time.h' is not * protected against multiple inclusion, so programs should not explicitly * include both files. This macro is useful in programs that use, for example, * `struct timeval' or `struct timezone' as well as `struct tm'. It is best * used in conjunction with `HAVE_SYS_TIME_H', whose existence is checked - * by `AC_CHECK_HEADERS(sys/time.h)' in configure.in. + * by `AC_CHECK_HEADERS(sys/time.h)' in configure.ac. */ #if defined(H5_TIME_WITH_SYS_TIME) # include <sys/time.h> diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index 9043a6f..b3cbc5c 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -13,7 +13,7 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* src/H5config.h. Generated from H5config.h.in by configure. */ -/* src/H5config.h.in. Generated from configure.in by autoheader. */ +/* src/H5config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ /* #undef H5_AC_APPLE_UNIVERSAL_BUILD */ |