diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/chkcopyright | 22 | ||||
| -rwxr-xr-x | bin/h5vers | 14 | ||||
| -rwxr-xr-x | bin/reconfigure | 16 |
3 files changed, 30 insertions, 22 deletions
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,9 +159,9 @@ 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, +# 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.in, +# 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) { @@ -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/bin/reconfigure b/bin/reconfigure index e176cfa..dba5a67 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -33,6 +33,8 @@ AUTOMAKE_VERSION="automake (GNU automake) 1.12.3" AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.69" ACLOCAL_VERSION="aclocal (GNU automake) 1.12.3" LIBTOOL_VERSION="(GNU libtool) 2.4.2" +M4_VERSION="m4 (GNU M4) 1.4.16" + # # When upgrading automake's version, don't forget to also update its # helper utilities, especially depcomp. @@ -55,6 +57,9 @@ fi if test -z ${LIBTOOL}; then LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.4.2/bin/libtool fi +if test -z ${M4}; then + M4=/mnt/hdf/packages/m4/m4-1.4.16/bin/m4 +fi # Check version numbers of all autotools against the "correct" versions AC_VERS=`${AUTOCONF} --version 2>&1 | grep "^${AUTOCONF_VERSION}"` @@ -82,14 +87,17 @@ if test -z "${LT_VERS}"; then echo "${LIBTOOL} version is not ${LIBTOOL_VERSION}" exit 1 fi - -# Use the latest version of M4 -PATH=/mnt/hdf/packages/m4/m4-1.4.16/bin:/mnt/hdf/packages/m4/m4-1.4.16/share:$PATH +M4_VERS=`${M4} --version 2>&1 | grep "${M4_VERSION}"` +if test -z "${M4_VERS}"; then + echo "${M4} version is not ${M4_VERSION}" + exit 1 +fi # Make sure that the tools are in the path. AUTOCONF_DIR=`dirname ${AUTOCONF}` LIBTOOL_DIR=`dirname ${LIBTOOL}` -PATH=${AUTOCONF_DIR}:$PATH +M4_DIR=`dirname ${M4}` +PATH=${AUTOCONF_DIR}:${M4_DIR}:$PATH # Run autoconf/automake commands in order echo ${ACLOCAL} -I ${LIBTOOL_DIR}/../share/aclocal |