From: David MacKenzie Date: Mon, 20 Nov 1995 20:34:22 +0000 (+0000) Subject: bug fixes from net X-Git-Tag: fsf-origin~237 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32dcea46acbd2c686a429fcca60c3e42fa9bb57e;p=thirdparty%2Fautoconf.git bug fixes from net --- diff --git a/ChangeLog b/ChangeLog index 9474e8f22..598a2ae00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Mon Nov 20 15:26:50 1995 David J. MacKenzie + + * acgeneral.m4 (AC_INIT_PARSE_ARGS): Prettify usage message somewhat. + + * Makefile.in: Use @bindir@, @datadir@, @infodir@. + (install): Find ASCRIPTS in $(srcdir). + +Sat Nov 18 14:21:55 1995 Karl Berry + + * autoconf.sh: Allow lowercase letters in the undefined-macro name. + Fri Nov 17 15:05:44 1995 Roland McGrath * Version 2.5 released. diff --git a/Makefile.in b/Makefile.in index 4026d9fd1..bfb7c3620 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,14 +39,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ # Directory in which to install scripts. -bindir = $(exec_prefix)/bin +bindir = @bindir@ # Directory in which to install library files. -datadir = $(prefix)/share +datadir = @datadir@ acdatadir = $(datadir)/autoconf # Directory in which to install documentation info files. -infodir = $(prefix)/info +infodir = @infodir@ #### End of system configuration section. #### @@ -130,7 +130,7 @@ install: all $(M4FILES) acconfig.h installdirs install-info *) echo Error: Autoconf requires GNU m4 1.1 or later; exit 1 ;; \ esac for p in $(ASCRIPTS); do \ - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \ done for i in $(M4FILES) acconfig.h; do \ $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ diff --git a/acgeneral.m4 b/acgeneral.m4 index c9a98176c..befb5770e 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -306,9 +306,11 @@ Directory and file names: --bindir=DIR user executables in DIR [EPREFIX/bin] --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR [PREFIX/share] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR [PREFIX/com] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] --libdir=DIR object code libraries in DIR [EPREFIX/lib] --includedir=DIR C header files in DIR [PREFIX/include] @@ -318,7 +320,8 @@ Directory and file names: --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names EOF cat << EOF Host type: @@ -332,9 +335,11 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help changequote([, ])dnl EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) diff --git a/autoconf.in b/autoconf.in index 65b1326d8..5e136c137 100644 --- a/autoconf.in +++ b/autoconf.in @@ -127,7 +127,7 @@ pattern="AC_" status=0 if grep "${pattern}" $tmpout > /dev/null 2>&1; then echo "autoconf: Undefined macros:" >&2 - grep "${pattern}" $tmpout | sed "s/.*\(${pattern}[_A-Z0-9]*\).*/\1/" | + grep "${pattern}" $tmpout | sed "s/.*\(${pattern}[_A-Za-z0-9]*\).*/\1/" | while read name; do grep -n $name $infile /dev/null done | sort -u >&2 diff --git a/autoconf.sh b/autoconf.sh index 65b1326d8..5e136c137 100644 --- a/autoconf.sh +++ b/autoconf.sh @@ -127,7 +127,7 @@ pattern="AC_" status=0 if grep "${pattern}" $tmpout > /dev/null 2>&1; then echo "autoconf: Undefined macros:" >&2 - grep "${pattern}" $tmpout | sed "s/.*\(${pattern}[_A-Z0-9]*\).*/\1/" | + grep "${pattern}" $tmpout | sed "s/.*\(${pattern}[_A-Za-z0-9]*\).*/\1/" | while read name; do grep -n $name $infile /dev/null done | sort -u >&2 diff --git a/bin/autoconf.in b/bin/autoconf.in index 65b1326d8..5e136c137 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -127,7 +127,7 @@ pattern="AC_" status=0 if grep "${pattern}" $tmpout > /dev/null 2>&1; then echo "autoconf: Undefined macros:" >&2 - grep "${pattern}" $tmpout | sed "s/.*\(${pattern}[_A-Z0-9]*\).*/\1/" | + grep "${pattern}" $tmpout | sed "s/.*\(${pattern}[_A-Za-z0-9]*\).*/\1/" | while read name; do grep -n $name $infile /dev/null done | sort -u >&2 diff --git a/doc/Makefile.in b/doc/Makefile.in index 4026d9fd1..bfb7c3620 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -39,14 +39,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ # Directory in which to install scripts. -bindir = $(exec_prefix)/bin +bindir = @bindir@ # Directory in which to install library files. -datadir = $(prefix)/share +datadir = @datadir@ acdatadir = $(datadir)/autoconf # Directory in which to install documentation info files. -infodir = $(prefix)/info +infodir = @infodir@ #### End of system configuration section. #### @@ -130,7 +130,7 @@ install: all $(M4FILES) acconfig.h installdirs install-info *) echo Error: Autoconf requires GNU m4 1.1 or later; exit 1 ;; \ esac for p in $(ASCRIPTS); do \ - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \ done for i in $(M4FILES) acconfig.h; do \ $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index c9a98176c..befb5770e 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -306,9 +306,11 @@ Directory and file names: --bindir=DIR user executables in DIR [EPREFIX/bin] --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR [PREFIX/share] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR [PREFIX/com] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] --libdir=DIR object code libraries in DIR [EPREFIX/lib] --includedir=DIR C header files in DIR [PREFIX/include] @@ -318,7 +320,8 @@ Directory and file names: --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names EOF cat << EOF Host type: @@ -332,9 +335,11 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help changequote([, ])dnl EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho)