# Files that can be generated, but should be up to date for a distribution.
DISTDEP = info Makefile
# Files to distribute.
-DISTFILES = COPYING ChangeLog ChangeLog.1 INSTALL Makefile.in NEWS \
- README TODO \
+DISTFILES = COPYING ChangeLog ChangeLog.1 ChangeLog.0 INSTALL \
+ Makefile.in NEWS README TODO \
acconfig.h acfunctions acgeneral.m4 acheaders acidentifiers \
acmakevars acoldnames.m4 acprograms acspecific.m4 autoconf.info* \
autoconf.sh autoconf.texi install.texi \
support deciding unguessable features based on the host and target types.
* AC_CONFIG_SUBDIRS to recursively configure a source tree.
* AC_CHECK_TYPE, which checks whether sys/types.h defines a given type.
-* AC_TRY_LINK, which obsoletes AC_COMPILE_CHECK.
* AC_MSG_CHECKING and AC_MSG_RESULT to print test results, on a single line,
whether or not the test succeeds. They obsolete AC_CHECKING and AC_VERBOSE.
- configure --verbose no longer has any effect.
-* AC_PREFIX_PROGRAM, which obsoletes AC_PREFIX.
-* AC_HEADER_DIRENT, which obsoletes AC_DIR_HEADER.
-* AC_CHECK_LIB, which obsoletes AC_HAVE_LIBRARY.
-* AC_ARG_ENABLE and AC_ARG_WITH, which obsolete AC_ENABLE and AC_WITH.
* AC_SUBST_FILE, to insert one file into another.
** Changed macros:
* AC_DEFINE no longer prints anything, because of the new result reporting
mechanism (AC_MSG_CHECKING and AC_MSG_RESULT).
* AC_VERBOSE pays attention to --quiet/--silent, not --verbose.
-* AC_CHECK_FUNCS and AC_CHECK_HEADERS take an optional arg to execute
- on a match.
+* AC_CHECK_FUNCS and AC_CHECK_HEADERS take optional shell commands to
+ execute on success.
** New utilities:
* autoscan to generate a preliminary configure.in for a package by
* ifnames to list the symbols used in #if and #ifdef directives in a
source tree.
-* Changed utilities:
+** Changed utilities:
* autoheader can take pieces of acconfig.h to replace config.h.{top,bot}.
\f
Major changes in release 1.11:
dnl m4 diversions:
define(AC_DIVERSION_NORMAL, 0)dnl normal output
define(AC_DIVERSION_SED, 1)dnl sed substitutions for config.status
-define(AC_DIVERSION_VAR, 2)dnl variable assignments for config.status
define(AC_DIVERSION_HELP, 3)dnl --enable/--with help strings
define(AC_DIVERSION_ARG, 4)dnl --enable/--with actions
divert(AC_DIVERSION_NORMAL)dnl
[define([AC_SUBST_$1], )dnl
divert(AC_DIVERSION_SED)dnl
s%@$1@%[$]$1%g
-divert(AC_DIVERSION_VAR)dnl
-$1='[$]$1'
divert(AC_DIVERSION_NORMAL)dnl
])])dnl
dnl
divert(AC_DIVERSION_SED)dnl
/@$1@/r [$]$1
s%@$1@%%g
-divert(AC_DIVERSION_VAR)dnl
-$1='$2'
divert(AC_DIVERSION_NORMAL)dnl
])])dnl
dnl
dnl
dnl AC_MSG_ERROR(ERROR-DESCRIPTION)
AC_DEFUN(AC_MSG_ERROR,
-[echo "configure: $1" 1>&2; exit 1])dnl
+[{ echo "configure: $1" 1>&2; exit 1; }])dnl
dnl
dnl
dnl ### Selecting which language to use for testing
AC_DEFUN(AC_CHECK_FUNCS,
[for ac_func in $1
do
-changequote(, )dnl
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
+AC_CHECK_FUNC(${ac_func},
+[changequote(, )dnl
+ ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
changequote([, ])dnl
-AC_CHECK_FUNC(${ac_func}, AC_DEFINE(${ac_tr_func}) $2)dnl
+ AC_DEFINE(${ac_tr_func}) $2])dnl
done
])dnl
dnl
[AC_REQUIRE_CPP()dnl Make sure the cpp check happens outside the loop.
for ac_hdr in $1
do
-changequote(, )dnl
-ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
+AC_CHECK_HEADER(${ac_hdr},
+[changequote(, )dnl
+ ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
changequote([, ])dnl
-AC_CHECK_HEADER(${ac_hdr}, AC_DEFINE(${ac_tr_hdr}) $2)dnl
+ AC_DEFINE(${ac_tr_hdr}) $2])dnl
done
])dnl
dnl
# Substitute for predefined variables.
changequote([, ])dnl
AC_SUBST(LIBS)dnl
-AC_SUBST(srcdir)dnl
-AC_SUBST(top_srcdir)dnl
AC_SUBST(prefix)dnl
AC_SUBST(exec_prefix)dnl
dnl Substituting for DEFS would confuse sed if it contains multiple lines.
s%@DEFS@%-DHAVE_CONFIG_H%],
[divert(AC_DIVERSION_SED)dnl
s%@DEFS@%$DEFS%
-divert(AC_DIVERSION_VAR)dnl
-DEFS='$DEFS'
])dnl
-divert(AC_DIVERSION_VAR)dnl
-ac_vpsub='$ac_vpsub'
-extrasub='$extrasub'
divert(AC_DIVERSION_NORMAL)dnl
# Without the "./", some shells look in PATH for config.status.
ifdef([AC_LIST_HEADERS],
[trap 'rm -fr $1 AC_LIST_HEADERS conftest*; exit 1' 1 2 15],
[trap 'rm -f $1; exit 1' 1 2 15])
-dnl Insert the variable assignments.
-undivert(AC_DIVERSION_VAR)dnl
-EOF
-cat >> ${CONFIG_STATUS} <<\EOF
ac_given_srcdir=$srcdir
-ac_given_INSTALL=$INSTALL
+EOF
+cat >> ${CONFIG_STATUS} <<\EOF
CONFIG_FILES=${CONFIG_FILES-"$1"}
for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then
top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
- case "$ac_given_INSTALL" in
+ifdef([AC_PROVIDE_AC_PROG_INSTALL],
+[ case "$ac_given_INSTALL" in
changequote(, )dnl
[/$]*) INSTALL="$ac_given_INSTALL" ;;
changequote([, ])dnl
*) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
-
+])dnl
echo creating "$ac_file"
rm -f "$ac_file"
comment_str="Generated automatically from `echo $ac_file_in|sed 's|.*/||'` by configure."
case "$ac_file" in
- *.c | *.h | *.C | *.cc | *.m )
+ *.c | *.h | *.C | *.cc | *.cpp | *.hpp | *.m )
ac_comsub="1i\\
/* $comment_str */" ;;
* ) # Add the comment on the second line of scripts, first line of others.
esac
sed -e "
$ac_comsub
+EOF
+cat >> ${CONFIG_STATUS} <<EOF
$ac_vpsub
dnl Shell code in configure.in might set extrasub.
$extrasub
-dnl Insert the sed substitutions.
-undivert(AC_DIVERSION_SED)dnl
+dnl Insert the sed substitutions of variables.
+undivert(AC_DIVERSION_SED)
+s%@srcdir@%\$srcdir%g
+s%@top_srcdir@%\$top_srcdir%g
+ifdef([AC_PROVIDE_AC_PROG_INSTALL], [s%@INSTALL@%\$INSTALL%g
+])dnl
+EOF
+cat >> ${CONFIG_STATUS} <<\EOF
" $ac_given_srcdir/$ac_file_in > $ac_file
fi; done
ifdef([AC_LIST_HEADERS], [AC_OUTPUT_HEADER(AC_LIST_HEADERS)])dnl
dnl
AC_DEFUN(AC_PROG_INSTALL,
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Make sure to not get the incompatible SysV /etc/install and
-# /usr/sbin/install, which might be in PATH before a BSD-like install,
-# or the SunOS /usr/etc/install directory, or the AIX /bin/install,
-# or the AFS install, which mishandles nonexistent args, or
-# /usr/ucb/install on SVR4, which tries to use the nonexistent group
-# "staff", or /sbin/install on IRIX which has incompatible command-line
-# syntax. Sigh.
-#
-# On most BSDish systems install is in /usr/bin, not /usr/ucb
-# anyway.
-# This turns out not to be true, so the mere pathname is not an indication
-# of whether the program works. What we really need is a set of tests for
-# the install program to see if it actually works in all the required ways.
-#
-# Avoid using ./install, which might have been erroneously created
-# by make from ./install.sh.
+# Make sure to not get an incompatible install:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
AC_MSG_CHECKING(for a BSD compatible install)
if test -z "${INSTALL}"; then
AC_CACHE_VAL(ac_cv_path_install,
[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
case "$ac_dir" in
- ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;;
+ ''|.|/etc|/usr/sbin|/usr/etc|/sbin|/usr/afsws/bin|/usr/ucb) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
for ac_prog in ginstall installbsd scoinst install; do
test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"])dnl
INSTALL="$ac_cv_path_install"
fi
+dnl We do this instead of AC_SUBST, to get relative paths right.
+ac_given_INSTALL=$INSTALL
AC_MSG_RESULT($INSTALL)
-AC_SUBST(INSTALL)dnl
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
' $arg | sort -u | sed 's,$, '$arg','
done | awk '
{ files[$1] = files[$1] " " $2 }
-END { for (n in files) print n files[n] }' | sort
+END { for (sym in files) print sym files[sym] }' | sort
dnl their path, the installer can configure with a path that has GNU m4
dnl first and get that path embedded in the installed autoconf and
dnl autoheader scripts.
-AC_PROGRAMS_PATH(M4, gnum4 gm4 m4, m4)
+AC_PATH_PROGS(M4, gnum4 gm4 m4, m4)
dnl We use a path for perl so the #! line in autoscan will work.
-AC_PROGRAM_PATH(PERL, perl, no-perl)
+AC_PATH_PROG(PERL, perl, no-perl)
AC_SUBST(PERL)dnl
AC_SUBST(PROGS)dnl
if test "$PERL" != no-perl; then
PROGS=autoscan
else
- AC_WARN(autoscan will not be built since perl is not found)
+ AC_MSG_WARN(autoscan will not be built since perl is not found)
fi
-AC_PROGRAM_CHECK(BASH, bash, no-bash)
+AC_CHECK_PROG(BASH, bash, no-bash)
if test "$BASH" != no-bash; then
PROGS="$PROGS shindent"
else
- AC_WARN(shindent will not be built since bash is not found)
+ AC_MSG_WARN(shindent will not be built since bash is not found)
fi
AC_PROG_INSTALL
# Files that can be generated, but should be up to date for a distribution.
DISTDEP = info Makefile
# Files to distribute.
-DISTFILES = COPYING ChangeLog ChangeLog.1 INSTALL Makefile.in NEWS \
- README TODO \
+DISTFILES = COPYING ChangeLog ChangeLog.1 ChangeLog.0 INSTALL \
+ Makefile.in NEWS README TODO \
acconfig.h acfunctions acgeneral.m4 acheaders acidentifiers \
acmakevars acoldnames.m4 acprograms acspecific.m4 autoconf.info* \
autoconf.sh autoconf.texi install.texi \
' $arg | sort -u | sed 's,$, '$arg','
done | awk '
{ files[$1] = files[$1] " " $2 }
-END { for (n in files) print n files[n] }' | sort
+END { for (sym in files) print sym files[sym] }' | sort
' $arg | sort -u | sed 's,$, '$arg','
done | awk '
{ files[$1] = files[$1] " " $2 }
-END { for (n in files) print n files[n] }' | sort
+END { for (sym in files) print sym files[sym] }' | sort
dnl m4 diversions:
define(AC_DIVERSION_NORMAL, 0)dnl normal output
define(AC_DIVERSION_SED, 1)dnl sed substitutions for config.status
-define(AC_DIVERSION_VAR, 2)dnl variable assignments for config.status
define(AC_DIVERSION_HELP, 3)dnl --enable/--with help strings
define(AC_DIVERSION_ARG, 4)dnl --enable/--with actions
divert(AC_DIVERSION_NORMAL)dnl
[define([AC_SUBST_$1], )dnl
divert(AC_DIVERSION_SED)dnl
s%@$1@%[$]$1%g
-divert(AC_DIVERSION_VAR)dnl
-$1='[$]$1'
divert(AC_DIVERSION_NORMAL)dnl
])])dnl
dnl
divert(AC_DIVERSION_SED)dnl
/@$1@/r [$]$1
s%@$1@%%g
-divert(AC_DIVERSION_VAR)dnl
-$1='$2'
divert(AC_DIVERSION_NORMAL)dnl
])])dnl
dnl
dnl
dnl AC_MSG_ERROR(ERROR-DESCRIPTION)
AC_DEFUN(AC_MSG_ERROR,
-[echo "configure: $1" 1>&2; exit 1])dnl
+[{ echo "configure: $1" 1>&2; exit 1; }])dnl
dnl
dnl
dnl ### Selecting which language to use for testing
AC_DEFUN(AC_CHECK_FUNCS,
[for ac_func in $1
do
-changequote(, )dnl
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
+AC_CHECK_FUNC(${ac_func},
+[changequote(, )dnl
+ ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
changequote([, ])dnl
-AC_CHECK_FUNC(${ac_func}, AC_DEFINE(${ac_tr_func}) $2)dnl
+ AC_DEFINE(${ac_tr_func}) $2])dnl
done
])dnl
dnl
[AC_REQUIRE_CPP()dnl Make sure the cpp check happens outside the loop.
for ac_hdr in $1
do
-changequote(, )dnl
-ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
+AC_CHECK_HEADER(${ac_hdr},
+[changequote(, )dnl
+ ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
changequote([, ])dnl
-AC_CHECK_HEADER(${ac_hdr}, AC_DEFINE(${ac_tr_hdr}) $2)dnl
+ AC_DEFINE(${ac_tr_hdr}) $2])dnl
done
])dnl
dnl
# Substitute for predefined variables.
changequote([, ])dnl
AC_SUBST(LIBS)dnl
-AC_SUBST(srcdir)dnl
-AC_SUBST(top_srcdir)dnl
AC_SUBST(prefix)dnl
AC_SUBST(exec_prefix)dnl
dnl Substituting for DEFS would confuse sed if it contains multiple lines.
s%@DEFS@%-DHAVE_CONFIG_H%],
[divert(AC_DIVERSION_SED)dnl
s%@DEFS@%$DEFS%
-divert(AC_DIVERSION_VAR)dnl
-DEFS='$DEFS'
])dnl
-divert(AC_DIVERSION_VAR)dnl
-ac_vpsub='$ac_vpsub'
-extrasub='$extrasub'
divert(AC_DIVERSION_NORMAL)dnl
# Without the "./", some shells look in PATH for config.status.
ifdef([AC_LIST_HEADERS],
[trap 'rm -fr $1 AC_LIST_HEADERS conftest*; exit 1' 1 2 15],
[trap 'rm -f $1; exit 1' 1 2 15])
-dnl Insert the variable assignments.
-undivert(AC_DIVERSION_VAR)dnl
-EOF
-cat >> ${CONFIG_STATUS} <<\EOF
ac_given_srcdir=$srcdir
-ac_given_INSTALL=$INSTALL
+EOF
+cat >> ${CONFIG_STATUS} <<\EOF
CONFIG_FILES=${CONFIG_FILES-"$1"}
for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then
top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
- case "$ac_given_INSTALL" in
+ifdef([AC_PROVIDE_AC_PROG_INSTALL],
+[ case "$ac_given_INSTALL" in
changequote(, )dnl
[/$]*) INSTALL="$ac_given_INSTALL" ;;
changequote([, ])dnl
*) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
-
+])dnl
echo creating "$ac_file"
rm -f "$ac_file"
comment_str="Generated automatically from `echo $ac_file_in|sed 's|.*/||'` by configure."
case "$ac_file" in
- *.c | *.h | *.C | *.cc | *.m )
+ *.c | *.h | *.C | *.cc | *.cpp | *.hpp | *.m )
ac_comsub="1i\\
/* $comment_str */" ;;
* ) # Add the comment on the second line of scripts, first line of others.
esac
sed -e "
$ac_comsub
+EOF
+cat >> ${CONFIG_STATUS} <<EOF
$ac_vpsub
dnl Shell code in configure.in might set extrasub.
$extrasub
-dnl Insert the sed substitutions.
-undivert(AC_DIVERSION_SED)dnl
+dnl Insert the sed substitutions of variables.
+undivert(AC_DIVERSION_SED)
+s%@srcdir@%\$srcdir%g
+s%@top_srcdir@%\$top_srcdir%g
+ifdef([AC_PROVIDE_AC_PROG_INSTALL], [s%@INSTALL@%\$INSTALL%g
+])dnl
+EOF
+cat >> ${CONFIG_STATUS} <<\EOF
" $ac_given_srcdir/$ac_file_in > $ac_file
fi; done
ifdef([AC_LIST_HEADERS], [AC_OUTPUT_HEADER(AC_LIST_HEADERS)])dnl
dnl
AC_DEFUN(AC_PROG_INSTALL,
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Make sure to not get the incompatible SysV /etc/install and
-# /usr/sbin/install, which might be in PATH before a BSD-like install,
-# or the SunOS /usr/etc/install directory, or the AIX /bin/install,
-# or the AFS install, which mishandles nonexistent args, or
-# /usr/ucb/install on SVR4, which tries to use the nonexistent group
-# "staff", or /sbin/install on IRIX which has incompatible command-line
-# syntax. Sigh.
-#
-# On most BSDish systems install is in /usr/bin, not /usr/ucb
-# anyway.
-# This turns out not to be true, so the mere pathname is not an indication
-# of whether the program works. What we really need is a set of tests for
-# the install program to see if it actually works in all the required ways.
-#
-# Avoid using ./install, which might have been erroneously created
-# by make from ./install.sh.
+# Make sure to not get an incompatible install:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
AC_MSG_CHECKING(for a BSD compatible install)
if test -z "${INSTALL}"; then
AC_CACHE_VAL(ac_cv_path_install,
[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
case "$ac_dir" in
- ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;;
+ ''|.|/etc|/usr/sbin|/usr/etc|/sbin|/usr/afsws/bin|/usr/ucb) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
for ac_prog in ginstall installbsd scoinst install; do
test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"])dnl
INSTALL="$ac_cv_path_install"
fi
+dnl We do this instead of AC_SUBST, to get relative paths right.
+ac_given_INSTALL=$INSTALL
AC_MSG_RESULT($INSTALL)
-AC_SUBST(INSTALL)dnl
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
projects / thirdparty / autoconf.git / commitdiff
