From: Akim Demaille Date: Fri, 19 May 2000 13:16:06 +0000 (+0000) Subject: * acgeneral.m4 (AC_PACKAGE): Rename as _AC_INIT_PACKAGE. X-Git-Tag: autoconf-2.50~898 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a409fcca4277c1d88565309bd2a82088bca4f506;p=thirdparty%2Fautoconf.git * acgeneral.m4 (AC_PACKAGE): Rename as _AC_INIT_PACKAGE. (AC_INIT): Dispatch your arguments either to _AC_INIT_PACKAGE or to AC_CONFIG_SRCDIR. (AU::AC_INIT): New. * configure.in: Adjust. Use `#', not `dnl'. * doc/autoconf.texi (configure.in Layout): Document the new form of AC_INIT. Document AC_CONFIG_SRCDIR. (Obsolete Macros): Document the old one. --- diff --git a/ChangeLog b/ChangeLog index b0fc579ed..40ddd0d98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-05-19 Akim Demaille + + * acgeneral.m4 (AC_PACKAGE): Rename as _AC_INIT_PACKAGE. + (AC_INIT): Dispatch your arguments either to _AC_INIT_PACKAGE or + to AC_CONFIG_SRCDIR. + (AU::AC_INIT): New. + * configure.in: Adjust. + Use `#', not `dnl'. + * doc/autoconf.texi (configure.in Layout): Document the new form + of AC_INIT. + Document AC_CONFIG_SRCDIR. + (Obsolete Macros): Document the old one. + 2000-05-19 Akim Demaille * acgeneral.m4: Simplify all the unjustified `[\$]foo' into diff --git a/acgeneral.m4 b/acgeneral.m4 index 4faefa8b3..5ad6b75ad 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -731,9 +731,9 @@ popdef([AC_Prefix])dnl -# AC_PACKAGE(PACKAGE, VERSION, [BUG-REPORT]) -# ------------------------------------------ -AC_DEFUN(AC_PACKAGE, +# _AC_INIT_PACKAGE(PACKAGE, VERSION, [BUG-REPORT]) +# ------------------------------------------------ +define([_AC_INIT_PACKAGE], [define([AC_PACKAGE_NAME], [$1])dnl define([AC_PACKAGE_VERSION], [$2])dnl define([AC_PACKAGE_STRING], [$1 $2])dnl @@ -751,11 +751,8 @@ define([AC_PACKAGE_BUGREPORT], [$3])dnl # would have be to use m4_quote to force an evaluation: # # patsubst(m4_quote($1), [^], [# ]) -# -# AC_INIT must be run before, exactly like for AC_REVISION. -AC_DEFUN(AC_COPYRIGHT, -[AC_REQUIRE([AC_INIT])dnl -AC_DIVERT([NOTICE], +AC_DEFUN([AC_COPYRIGHT], +[AC_DIVERT([NOTICE], [patsubst([ $1], [^], [@%:@ ])])dnl AC_DIVERT([VERSION_BEGIN], @@ -1597,15 +1594,27 @@ gives unlimited permission to copy, distribute and modify it.])dnl ])# _AC_INIT -# AC_INIT([UNIQUE-FILE-IN-SOURCE-DIR]) -# ------------------------------------ +# AU::AC_INIT([UNIQUE-FILE-IN-SOURCE-DIR]) +# ---------------------------------------- +# This macro is used only for Autoupdate. +AU_DEFUN([AC_INIT], +[ifval([$2], [[AC_INIT($@)]], + [ifval([$1], +[[AC_INIT] +AC_CONFIG_SRCDIR([$1])], [[AC_INIT]])])[]dnl +]) + + +# AC_INIT([PACKAGE, VERSION, [BUG-REPORT]) +# ---------------------------------------- # Wrapper around _AC_INIT which guarantees _AC_INIT is expanded only # once. # Note that the order is important: first initialize, then set the # AC_CONFIG_SRCDIR. AC_DEFUN([AC_INIT], [AC_EXPAND_ONCE([_AC_INIT()])dnl -ifval([$1], [AC_CONFIG_SRCDIR([$1])])dnl +ifval([$2], [_AC_INIT_PACKAGE($@)], + [ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl ]) @@ -3776,7 +3785,7 @@ define([_AC_LIST_SUBDIRS]) AU_DEFUN([AC_OUTPUT], [ifval([$1], - [AC_CONFIG_FILES([$1]) + [AC_CONFIG_FILES([$1]) ])dnl ifval([$2$3], [AC_CONFIG_COMMANDS(default, [[$2]], [[$3]]) diff --git a/configure b/configure index 7b125aa28..2df3bc4cd 100755 --- a/configure +++ b/configure @@ -432,7 +432,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat < $0 $ac_configure_args " >&5 @@ -691,7 +688,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # 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. -echo "configure:609: checking for a BSD compatible install" >&5 +echo "configure:605: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -738,7 +735,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "configure:655: result: $INSTALL" >&5 +echo "configure:651: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -749,7 +746,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "configure:662: checking whether build environment is sane" >&5 +echo "configure:658: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -786,7 +783,7 @@ else Check your system clock" >&2; exit 1; } fi rm -f conftest* -echo "configure:697: result: yes" >&5 +echo "configure:693: result: yes" >&5 echo "${ECHO_T}yes" >&6 if test "$program_transform_name" = s,x,x,; then program_transform_name= @@ -807,7 +804,7 @@ test "$program_suffix" != NONE && # sed with no file args requires a program. test -z "$program_transform_name" && program_transform_name="s,x,x," -echo "configure:716: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:712: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -827,11 +824,11 @@ fi rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "configure:736: result: yes" >&5 + echo "configure:732: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "configure:740: result: no" >&5 + echo "configure:736: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -853,88 +850,93 @@ cat >>confdefs.h <&5 +echo "configure:752: checking for working aclocal" >&5 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (aclocal --version) < /dev/null > /dev/null 2>&1; then ACLOCAL=aclocal - echo "configure:763: result: found" >&5 + echo "configure:759: result: found" >&5 echo "${ECHO_T}found" >&6 else ACLOCAL="$missing_dir/missing aclocal" - echo "configure:767: result: missing" >&5 + echo "configure:763: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:770: checking for working autoconf" >&5 +echo "configure:766: checking for working autoconf" >&5 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoconf --version) < /dev/null > /dev/null 2>&1; then AUTOCONF=autoconf - echo "configure:777: result: found" >&5 + echo "configure:773: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOCONF="$missing_dir/missing autoconf" - echo "configure:781: result: missing" >&5 + echo "configure:777: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:784: checking for working automake" >&5 +echo "configure:780: checking for working automake" >&5 echo $ECHO_N "checking for working automake... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (automake --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=automake - echo "configure:791: result: found" >&5 + echo "configure:787: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOMAKE="$missing_dir/missing automake" - echo "configure:795: result: missing" >&5 + echo "configure:791: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:798: checking for working autoheader" >&5 +echo "configure:794: checking for working autoheader" >&5 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoheader --version) < /dev/null > /dev/null 2>&1; then AUTOHEADER=autoheader - echo "configure:805: result: found" >&5 + echo "configure:801: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOHEADER="$missing_dir/missing autoheader" - echo "configure:809: result: missing" >&5 + echo "configure:805: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:812: checking for working makeinfo" >&5 +echo "configure:808: checking for working makeinfo" >&5 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (makeinfo --version) < /dev/null > /dev/null 2>&1; then MAKEINFO=makeinfo - echo "configure:819: result: found" >&5 + echo "configure:815: result: found" >&5 echo "${ECHO_T}found" >&6 else MAKEINFO="$missing_dir/missing makeinfo" - echo "configure:823: result: missing" >&5 + echo "configure:819: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi +# Initialize the test suite. AT_TESTPATH=.. +# We use a path for GNU m4 so even if users have another m4 first in +# their path, the installer can configure with a path that has GNU m4 +# first and get that path embedded in the installed autoconf and +# autoheader scripts. for ac_prog in gm4 gnum4 m4 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "configure:831: checking for $ac_word" >&5 +echo "configure:832: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_M4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -959,10 +961,10 @@ esac fi M4=$ac_cv_path_M4 if test -n "$M4"; then - echo "configure:856: result: $M4" >&5 + echo "configure:857: result: $M4" >&5 echo "${ECHO_T}$M4" >&6 else - echo "configure:859: result: no" >&5 + echo "configure:860: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -970,7 +972,7 @@ test -n "$M4" && break done test -n "$M4" || M4="m4" -echo "configure:865: checking whether m4 supports frozen files" >&5 +echo "configure:866: checking whether m4 supports frozen files" >&5 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6 if test "${ac_cv_prog_gnu_m4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -982,17 +984,20 @@ if test x"$M4" != x; then esac fi fi -echo "configure:877: result: $ac_cv_prog_gnu_m4" >&5 +echo "configure:878: result: $ac_cv_prog_gnu_m4" >&5 echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6 if test x"$ac_cv_prog_gnu_m4" != xyes; then { echo "configure: error: GNU m4 1.4 is required" >&2; exit 1; } fi +# This is needed because Automake does not seem to realize there is +# an AC_SUBST inside AC_PROG_GNU_M4. Grmph! +# `autoconf' and `ifnames' use AWK. for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "configure:886: checking for $ac_word" >&5 +echo "configure:890: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1017,34 +1022,36 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "configure:911: result: $AWK" >&5 + echo "configure:915: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "configure:914: result: no" >&5 + echo "configure:918: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "configure:919: checking for working help2man" >&5 +# Generating man pages. +echo "configure:924: checking for working help2man" >&5 echo $ECHO_N "checking for working help2man... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (help2man --version) < /dev/null > /dev/null 2>&1; then HELP2MAN=help2man - echo "configure:926: result: found" >&5 + echo "configure:931: result: found" >&5 echo "${ECHO_T}found" >&6 else HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man" - echo "configure:930: result: missing" >&5 + echo "configure:935: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi +# We use a path for perl so the #! line in autoscan will work. # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "configure:935: checking for $ac_word" >&5 +echo "configure:941: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1070,10 +1077,10 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "configure:961: result: $PERL" >&5 + echo "configure:967: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "configure:964: result: no" >&5 + echo "configure:970: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1094,7 +1101,7 @@ fi # 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. -echo "configure:983: checking for a BSD compatible install" >&5 +echo "configure:989: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -1141,7 +1148,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "configure:1029: result: $INSTALL" >&5 +echo "configure:1035: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1337,7 +1344,7 @@ do ac_option=`echo "$1" | sed -e 's/=.*//'` ac_optarg=`echo "$1" | sed -e 's/[^=]*=//'` shift - set dummy "\$ac_option" "$ac_optarg" ${1+"$@"} + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} shift ;; -*);; diff --git a/configure.in b/configure.in index 1094f4bdb..6ceeda024 100644 --- a/configure.in +++ b/configure.in @@ -1,32 +1,31 @@ -dnl Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script. AC_PREREQ(2.14a) -AC_PACKAGE(Autoconf, 2.14a, bug-autoconf@gnu.org) - -AC_INIT(acgeneral.m4) +AC_INIT(Autoconf, 2.14a, bug-autoconf@gnu.org) +AC_CONFIG_SRCDIR(acgeneral.m4) AM_INIT_AUTOMAKE(autoconf, 2.14a) -dnl Initialize the test suite. +# Initialize the test suite. AT_CONFIG(..) -dnl We use a path for GNU m4 so even if users have another m4 first in -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. +# We use a path for GNU m4 so even if users have another m4 first in +# their path, the installer can configure with a path that has GNU m4 +# first and get that path embedded in the installed autoconf and +# autoheader scripts. AC_PROG_GNU_M4 if test x"$ac_cv_prog_gnu_m4" != xyes; then AC_MSG_ERROR([GNU m4 1.4 is required]) fi -dnl This is needed because Automake does not seem to realize there is -dnl an AC_SUBST inside AC_PROG_GNU_M4. Grmph! +# This is needed because Automake does not seem to realize there is +# an AC_SUBST inside AC_PROG_GNU_M4. Grmph! AC_SUBST(M4) -dnl `autoconf' and `ifnames' use AWK. +# `autoconf' and `ifnames' use AWK. AC_PROG_AWK -dnl Generating man pages. +# Generating man pages. AM_MISSING_PROG(HELP2MAN, help2man, [\${SHELL} \${top_srcdir}]) -dnl We use a path for perl so the #! line in autoscan will work. +# We use a path for perl so the #! line in autoscan will work. AC_PATH_PROG(PERL, perl, no) AC_SUBST(PERL)dnl AC_SUBST(PERLSCRIPTS)dnl @@ -40,9 +39,8 @@ AC_PROG_INSTALL # Work with the GNU or Cygnus source tree layout. if test -f $srcdir/standards.texi; then - standards_texi=standards.texi + AC_SUBST(standards_texi, standards.texi)dnl fi -AC_SUBST(standards_texi)dnl AC_OUTPUT(acversion.m4 Makefile m4/Makefile man/Makefile doc/Makefile tests/Makefile tests/atconfig) diff --git a/doc/autoconf.texi b/doc/autoconf.texi index ced9da0ef..1de7b59a9 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -746,8 +746,8 @@ functions could be affected by types and libraries. @display @group Autoconf requirements +@code{AC_INIT(@var{package}, @var{version}, @var{bug-report-address})} information on the package -@code{AC_INIT(@var{file})} checks for programs checks for libraries checks for header files @@ -1166,6 +1166,8 @@ and do not create @code{configure}. For example: @example AC_PREREQ(@value{VERSION}) @end example + +This macro is the only macro which might be used before @code{AC_INIT}. @end defmac @defmac AC_COPYRIGHT(@var{copyright-notice}) @@ -1214,9 +1216,16 @@ Every @code{configure} script must call @code{AC_INIT} before doing anything else. The only other required macro is @code{AC_OUTPUT} (@pxref{Output}). -@defmac AC_INIT (@var{unique-file-in-source-dir}) +@defmac AC_INIT (@var{package}, @var{version}, @ovar{bug-report-address}) @maindex INIT -Process any command-line arguments and find the source code directory. +Process any command-line arguments and perform various initializations +and verifications. Set the name of the @var{package} and its +@var{version}. The optional argument @var{bug-report-address} should be +the email to which users should send bug reports. +@end defmac + +@defmac AC_CONFIG_SRCDIR (@var{unique-file-in-source-dir}) +@maindex CONFIG_SRCDIR @var{unique-file-in-source-dir} is some file that is in the package's source directory; @code{configure} checks for this file's existence to make sure that the directory that it is told contains the source code in @@ -1225,6 +1234,7 @@ with @samp{--srcdir}; this is a safety check. @xref{Invoking configure}, for more information. @end defmac + @c FIXME: Remove definitively once --install explained. @c @c Small packages may store all their macros in @code{aclocal.m4}. As the @@ -7716,6 +7726,17 @@ all of those cases, the compiler is passed @samp{-lfoo}. However, @code{AC_EGREP_HEADER} @end defmac +@defmac AC_INIT (@var{unique-file-in-source-dir}) +@maindex INIT +Formerly @code{AC_INIT} used to have a single argument, and was +equivalent to: + +@example +AC_INIT +AC_CONFIG_SRCDIR(@var{unique-file-in-source-dir}) +@end example +@end defmac + @defmac AC_INLINE @maindex INLINE @code{AC_C_INLINE} diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 4faefa8b3..5ad6b75ad 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -731,9 +731,9 @@ popdef([AC_Prefix])dnl -# AC_PACKAGE(PACKAGE, VERSION, [BUG-REPORT]) -# ------------------------------------------ -AC_DEFUN(AC_PACKAGE, +# _AC_INIT_PACKAGE(PACKAGE, VERSION, [BUG-REPORT]) +# ------------------------------------------------ +define([_AC_INIT_PACKAGE], [define([AC_PACKAGE_NAME], [$1])dnl define([AC_PACKAGE_VERSION], [$2])dnl define([AC_PACKAGE_STRING], [$1 $2])dnl @@ -751,11 +751,8 @@ define([AC_PACKAGE_BUGREPORT], [$3])dnl # would have be to use m4_quote to force an evaluation: # # patsubst(m4_quote($1), [^], [# ]) -# -# AC_INIT must be run before, exactly like for AC_REVISION. -AC_DEFUN(AC_COPYRIGHT, -[AC_REQUIRE([AC_INIT])dnl -AC_DIVERT([NOTICE], +AC_DEFUN([AC_COPYRIGHT], +[AC_DIVERT([NOTICE], [patsubst([ $1], [^], [@%:@ ])])dnl AC_DIVERT([VERSION_BEGIN], @@ -1597,15 +1594,27 @@ gives unlimited permission to copy, distribute and modify it.])dnl ])# _AC_INIT -# AC_INIT([UNIQUE-FILE-IN-SOURCE-DIR]) -# ------------------------------------ +# AU::AC_INIT([UNIQUE-FILE-IN-SOURCE-DIR]) +# ---------------------------------------- +# This macro is used only for Autoupdate. +AU_DEFUN([AC_INIT], +[ifval([$2], [[AC_INIT($@)]], + [ifval([$1], +[[AC_INIT] +AC_CONFIG_SRCDIR([$1])], [[AC_INIT]])])[]dnl +]) + + +# AC_INIT([PACKAGE, VERSION, [BUG-REPORT]) +# ---------------------------------------- # Wrapper around _AC_INIT which guarantees _AC_INIT is expanded only # once. # Note that the order is important: first initialize, then set the # AC_CONFIG_SRCDIR. AC_DEFUN([AC_INIT], [AC_EXPAND_ONCE([_AC_INIT()])dnl -ifval([$1], [AC_CONFIG_SRCDIR([$1])])dnl +ifval([$2], [_AC_INIT_PACKAGE($@)], + [ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl ]) @@ -3776,7 +3785,7 @@ define([_AC_LIST_SUBDIRS]) AU_DEFUN([AC_OUTPUT], [ifval([$1], - [AC_CONFIG_FILES([$1]) + [AC_CONFIG_FILES([$1]) ])dnl ifval([$2$3], [AC_CONFIG_COMMANDS(default, [[$2]], [[$3]]) diff --git a/man/autoreconf.1 b/man/autoreconf.1 index 4aff30cb1..5dcac404d 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH AUTORECONF "1" "March 2000" "GNU autoconf 2.14a" FSF +.TH AUTORECONF "1" "May 2000" "GNU autoconf 2.14a" FSF .SH NAME autoreconf \- Update generated configuration files .SH SYNOPSIS diff --git a/man/autoscan.1 b/man/autoscan.1 index 806115340..36bb36b8f 100644 --- a/man/autoscan.1 +++ b/man/autoscan.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH AUTOSCAN "1" "April 2000" "GNU autoconf 2.14a" FSF +.TH AUTOSCAN "1" "May 2000" "GNU autoconf 2.14a" FSF .SH NAME autoscan \- Generate a preliminary configure.in .SH SYNOPSIS diff --git a/man/ifnames.1 b/man/ifnames.1 index fdfcfb20f..4ba679b62 100644 --- a/man/ifnames.1 +++ b/man/ifnames.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH IFNAMES "1" "March 2000" "GNU autoconf 2.14a" FSF +.TH IFNAMES "1" "May 2000" "GNU autoconf 2.14a" FSF .SH NAME ifnames \- Extract CPP conditionals from a set of files .SH SYNOPSIS