Skip to content

Commit

Permalink
Remove/update references to configure.in
Browse files Browse the repository at this point in the history
  • Loading branch information
yadij committed Dec 10, 2010
1 parent 3cb1ffc commit a6093a2
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion acinclude/krb5.m4
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.

dnl these checks must be performed in the same order as here defined,
dnl and have mostly been lifted out of an inlined configure.in.
dnl and have mostly been lifted out of an inlined configure.ac.

dnl checks for a broken solaris header file, and sets squid_cv_broken_krb5_h
dnl to yes if that's the case
Expand Down
2 changes: 1 addition & 1 deletion lib/libTrie/INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.

The file `configure.ac' (or `configure.in') is used to create
The file `configure.ac' is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
Expand Down
2 changes: 1 addition & 1 deletion mkrelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if [ ${name} != ${PACKAGE}-${VERSION} ]; then
exit 1
fi
RELEASE=`echo $VERSION | cut -d. -f1,2 | cut -d- -f1`
ed -s configure.in <<EOS
ed -s configure.ac <<EOS
g/${VERSION}-BZR/ s//${VERSION}/
w
EOS
Expand Down
4 changes: 2 additions & 2 deletions mksnapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ trap "echo FAIL-BUILD_${VERSION} ; rm -rf ${tmpdir}" 0

rm -f ${tag}.out
bzr export ${tmpdir} ${BZRROOT}/${module}/${branchpath} || exit 1
if [ ! -f ${tmpdir}/configure ] && [ -f ${tmpdir}/configure.in ]; then
if [ ! -f ${tmpdir}/configure ] && [ -f ${tmpdir}/configure.ac ]; then
sh -c "cd ${tmpdir} && ./bootstrap.sh"
fi
if [ ! -f ${tmpdir}/configure ]; then
Expand All @@ -35,7 +35,7 @@ fi
cd ${tmpdir}
eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'`
eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'`
ed -s configure.in <<EOS
ed -s configure.ac <<EOS
g/${VERSION}-[A-Z]*/ s//${VERSION}-${date}/
w
EOS
Expand Down
4 changes: 2 additions & 2 deletions src/StoreFileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
\par
* The storage types live in \em src/fs/. Each subdirectory corresponds
* to the name of the storage type. When a new storage type is implemented
* configure.in must be updated to autogenerate a Makefile in
* configure.ac must be updated to autogenerate a Makefile in
* \em src/fs/foo/ from a Makefile.in file.
*
\todo DOCS: add template addition to configure.in for storage module addition.
\todo DOCS: add template addition to configure.ac for storage module addition.
\todo DOCS: add template Makefile.am for storage module addition.
*
\par
Expand Down
6 changes: 3 additions & 3 deletions test-suite/buildtests/layer-01-minimal.opts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
MAKETEST="distcheck"
#
#
# The options for this level can be easily generated semi-automatically from configure.in by:
# grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
# The options for this level can be easily generated semi-automatically from configure.ac by:
# grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
# followed by insertion of ' --disable-' and '\' strings
#
# grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
# grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
# followed by insertion of ' --without-' and ' \' strings
#
# sometimes it's just too automatic.. Following options should be just stripped
Expand Down
6 changes: 3 additions & 3 deletions test-suite/buildtests/layer-02-maximus.opts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
MAKETEST="distcheck"
#
#
# The options for this level can be easily generated semi-automatically from configure.in by:
# grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
# The options for this level can be easily generated semi-automatically from configure.ac by:
# grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
# followed by insertion of ' --enable-' and '\' strings
#
# grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
# grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
# followed by insertion of ' --with-' and ' \' strings
#
# sometimes it's just too automatic..
Expand Down

0 comments on commit a6093a2

Please sign in to comment.