From 1673b04a23066b6dca3a4b372e7cc5a76888dd17 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 28 Aug 2012 12:47:52 -0500 Subject: [svn-r22722] Update all references from configure.in to configure.ac Tested: h5committest --- bin/chkconfigure | 4 ++-- bin/chkcopyright | 22 +++++++++++----------- bin/h5vers | 18 +++++++++--------- config/Makefile.am.blank | 2 +- configure.ac | 2 +- hl/tools/Makefile.am | 2 +- hl/tools/Makefile.in | 2 +- release_docs/RELEASE.txt | 26 ++++++++------------------ src/H5private.h | 4 ++-- 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 '^' < $tmpfile > /dev/null || \ grep '^