From: David MacKenzie Date: Thu, 23 Mar 1995 23:49:35 +0000 (+0000) Subject: fix little nits X-Git-Tag: fsf-origin~298 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c29fe2579bc804f400cdf32ea12bd901921babf;p=thirdparty%2Fautoconf.git fix little nits --- diff --git a/Makefile.in b/Makefile.in index 9ab5a2a59..4066ce47c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -166,9 +166,9 @@ uninstall: ${srcdir}/configure: configure.in $(M4FILES) cd $(srcdir) && \ - rm -f $@ $@.tmp && \ - $(M4) autoconf.m4 configure.in > $@.tmp && \ - chmod +x $@.tmp && mv $@.tmp $@ + rm -f configure configure.tmp && \ + $(M4) autoconf.m4 configure.in > configure.tmp && \ + chmod +x configure.tmp && mv configure.tmp configure Makefile: Makefile.in config.status ./config.status config.status: configure diff --git a/TODO b/TODO index 227e43cf2..0f757e0d9 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,7 @@ -*- outline -*- Things it might be nice to do someday. I haven't evaluated all of -these suggestions... their presence here doesn't imply my endorsement, -just that I haven't looked at them closely enough to reject them yet. +these suggestions... their presence here doesn't imply my endorsement. -djm ------------------------------------------------------------------------------ @@ -324,6 +323,46 @@ that directory is removed. ------------------------------------------------------------------------------ +Document this trick: + +>> Half my time these days seems to be spent porting +>> configure.in files to new OS releases.) Alas, there doesn't seem to +>> be any way to turn off caching (with a configure.in directive). + +define([AC_CACHE_LOAD], )dnl +define([AC_CACHE_SAVE], )dnl +AC_INIT(whatever) + ... rest of configure.in ... + +------------------------------------------------------------------------------ + +Testing for ANSI header files (AC_HEADER_STDC) fails under linux when +using the latest libraries (libc-4.6.30, at least libc-4.6.27 works +ok) when LC_CTYPE is set to ISO-8859-1. The islower/toupper test +reports errors. +Anyway, adding a line like +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +to the configure script can solve the problem. +From: tom@vlsivie.tuwien.ac.AT (Thomas Winder) + +------------------------------------------------------------------------------ + +A number of people have tried to fix configuration problems by editing +acconfig.h. (Despite comments at the top of the file.) I think they're +confused because anything.h looks like a regular source file name. +Maybe acconfig.h could be called acconfig.extra or something? +From: kb@cs.umb.edu (K. Berry) + +------------------------------------------------------------------------------ + +Using the macro AC_CHECK_LIB, if the library name contains a dot (which is +the case of the library complib.sgimath on Irix 5.x) a syntax error occurs +because the corresponding cache variable name contains a dot. +Should dots be converted to underlines in variable names by autoconf? +From: Frederic.DEvernay@sophia.inria.fr (Frederic Devernay) + +------------------------------------------------------------------------------ + * Test suite: more things to test: ** That the shell scripts produce correct output on some simple data. ** Configuration header files. That autoheader does the right thing, diff --git a/acgeneral.m4 b/acgeneral.m4 index f161944e3..9f70d97f5 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -51,7 +51,7 @@ dnl divert(-1)dnl Throw away output until AC_INIT is called. changequote([, ]) -define(AC_ACVERSION, 2.2) +define(AC_ACVERSION, 2.2.1) dnl Some old m4's don't support m4exit. But they provide dnl equivalent functionality by core dumping because of the @@ -1023,8 +1023,8 @@ AC_DEFUN(AC_LANG_C, ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&AC_FD_CC 2>&AC_FD_CC' -ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC' +ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&AC_FD_CC 2>&AC_FD_CC' +ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC' ]) dnl AC_LANG_CPLUSPLUS() @@ -1666,7 +1666,9 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL" ])dnl ifdef([AC_LIST_HEADER], -[trap 'rm -fr `echo $1 AC_LIST_HEADER | tr : " "` conftest*; exit 1' 1 2 15], +[changequote({,}) +trap 'rm -fr `echo $1 AC_LIST_HEADER | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +changequote(,)], [trap 'rm -f $1; exit 1' 1 2 15]) AC_OUTPUT_FILES($1) diff --git a/autoconf.texi b/autoconf.texi index bb36b08eb..2ffc97e08 100644 --- a/autoconf.texi +++ b/autoconf.texi @@ -6,8 +6,8 @@ @c @setchapternewpage odd @c %**end of header -@set EDITION 2.2 -@set VERSION 2.2 +@set EDITION 2.2.1 +@set VERSION 2.2.1 @set UPDATED March 1995 @iftex @@ -21,6 +21,8 @@ START-INFO-DIR-ENTRY END-INFO-DIR-ENTRY @end format +Autoconf: Creating Automatic Configuration Scripts, by David MacKenzie. + This file documents the GNU Autoconf package for creating scripts to configure source code packages using templates and an @code{m4} macro package. @@ -3928,17 +3930,19 @@ should call @code{AC_ARG_WITH} to detect whether the @code{configure} user asked to use it. Whether each package is used or not by default, and which arguments are valid, is up to you. -@defmac AC_ARG_WITH (@var{package}, @var{help-string}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]}) +@defmac AC_ARG_WITH (@var{package}, @var{help-string} @r{[}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]]}) @maindex ARG_WITH If the user gave @code{configure} the option @samp{--with-@var{package}} or @samp{--without-@var{package}}, run shell commands -@var{action-if-given}. Otherwise run shell commands +@var{action-if-given}. If neither option was given, run shell commands @var{action-if-not-given}. The name @var{package} indicates another software package that this program should work with. It should consist only of alphanumeric characters and dashes. The option's argument is available to the shell commands -@var{action-if-given} in the shell variable @code{withval}. +@var{action-if-given} in the shell variable @code{withval}, which is +actually just the value of the shell variable @code{with_@var{package}}; +you may use that variable instead, if you wish. The argument @var{help-string} is a description of the option which looks like this: @@ -3988,17 +3992,19 @@ For each optional feature, @file{configure.in} should call to include it. Whether each feature is included or not by default, and which arguments are valid, is up to you. -@defmac AC_ARG_ENABLE (@var{feature}, @var{help-string}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]}) +@defmac AC_ARG_ENABLE (@var{feature}, @var{help-string} @r{[}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]]}) @maindex ARG_ENABLE If the user gave @code{configure} the option @samp{--enable-@var{feature}} or @samp{--disable-@var{feature}}, run -shell commands @var{action-if-given}. Otherwise run shell commands -@var{action-if-not-given}. The name @var{feature} indicates an optional -user-level facility. It should consist only of alphanumeric characters -and dashes. +shell commands @var{action-if-given}. If neither option was given, run +shell commands @var{action-if-not-given}. The name @var{feature} +indicates an optional user-level facility. It should consist only of +alphanumeric characters and dashes. The option's argument is available to the shell commands -@var{action-if-given} in the shell variable @code{enableval}. +@var{action-if-given} in the shell variable @code{enableval}, which is +actually just the value of the shell variable @code{enable_@var{package}}; +you may use that variable instead, if you wish. The @var{help-string} argument is like that of @code{AC_ARG_WITH} (@pxref{External Software}). @end defmac @@ -4090,7 +4096,7 @@ same name. For example, if you configure GNU @code{diff} with @samp{--program-prefix=g}, then when you run @samp{make install} it is installed as @file{/usr/local/bin/gdiff}. -As a more sophistocated example, you could use +As a more sophisticated example, you could use @example --program-transform-name='s/^/g/; s/^gg/g/; s/^gless/less/' @end example @@ -4425,14 +4431,12 @@ database would be a maintenance nightmare. Autoconf may appear to be this kind of database, but in fact it is not. Instead of listing host dependencies, it lists program requirements. -Imake is special-purpose. It is directed at building the X11 -distribution. By comparison to the GNU tools, this is a simple problem. If you view the GNU suite as a collection of native tools, then the -problems are similar. But the GNU tools are more powerful than that. -The development tools can be configured as cross tools in almost any -host+target permutation. All of these configurations can be installed -concurrently. They can even be configured to share host independent -files across hosts. Imake doesn't address these issues. +problems are similar. But the GNU development tools can be configured +as cross tools in almost any host+target permutation. All of these +configurations can be installed concurrently. They can even be +configured to share host independent files across hosts. Imake doesn't +address these issues. Imake templates are a form of standardization. The GNU coding standards address the same issues without necessarily imposing the same diff --git a/doc/Makefile.in b/doc/Makefile.in index 9ab5a2a59..4066ce47c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -166,9 +166,9 @@ uninstall: ${srcdir}/configure: configure.in $(M4FILES) cd $(srcdir) && \ - rm -f $@ $@.tmp && \ - $(M4) autoconf.m4 configure.in > $@.tmp && \ - chmod +x $@.tmp && mv $@.tmp $@ + rm -f configure configure.tmp && \ + $(M4) autoconf.m4 configure.in > configure.tmp && \ + chmod +x configure.tmp && mv configure.tmp configure Makefile: Makefile.in config.status ./config.status config.status: configure diff --git a/doc/autoconf.texi b/doc/autoconf.texi index bb36b08eb..2ffc97e08 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -6,8 +6,8 @@ @c @setchapternewpage odd @c %**end of header -@set EDITION 2.2 -@set VERSION 2.2 +@set EDITION 2.2.1 +@set VERSION 2.2.1 @set UPDATED March 1995 @iftex @@ -21,6 +21,8 @@ START-INFO-DIR-ENTRY END-INFO-DIR-ENTRY @end format +Autoconf: Creating Automatic Configuration Scripts, by David MacKenzie. + This file documents the GNU Autoconf package for creating scripts to configure source code packages using templates and an @code{m4} macro package. @@ -3928,17 +3930,19 @@ should call @code{AC_ARG_WITH} to detect whether the @code{configure} user asked to use it. Whether each package is used or not by default, and which arguments are valid, is up to you. -@defmac AC_ARG_WITH (@var{package}, @var{help-string}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]}) +@defmac AC_ARG_WITH (@var{package}, @var{help-string} @r{[}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]]}) @maindex ARG_WITH If the user gave @code{configure} the option @samp{--with-@var{package}} or @samp{--without-@var{package}}, run shell commands -@var{action-if-given}. Otherwise run shell commands +@var{action-if-given}. If neither option was given, run shell commands @var{action-if-not-given}. The name @var{package} indicates another software package that this program should work with. It should consist only of alphanumeric characters and dashes. The option's argument is available to the shell commands -@var{action-if-given} in the shell variable @code{withval}. +@var{action-if-given} in the shell variable @code{withval}, which is +actually just the value of the shell variable @code{with_@var{package}}; +you may use that variable instead, if you wish. The argument @var{help-string} is a description of the option which looks like this: @@ -3988,17 +3992,19 @@ For each optional feature, @file{configure.in} should call to include it. Whether each feature is included or not by default, and which arguments are valid, is up to you. -@defmac AC_ARG_ENABLE (@var{feature}, @var{help-string}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]}) +@defmac AC_ARG_ENABLE (@var{feature}, @var{help-string} @r{[}, @var{action-if-given} @r{[}, @var{action-if-not-given}@r{]]}) @maindex ARG_ENABLE If the user gave @code{configure} the option @samp{--enable-@var{feature}} or @samp{--disable-@var{feature}}, run -shell commands @var{action-if-given}. Otherwise run shell commands -@var{action-if-not-given}. The name @var{feature} indicates an optional -user-level facility. It should consist only of alphanumeric characters -and dashes. +shell commands @var{action-if-given}. If neither option was given, run +shell commands @var{action-if-not-given}. The name @var{feature} +indicates an optional user-level facility. It should consist only of +alphanumeric characters and dashes. The option's argument is available to the shell commands -@var{action-if-given} in the shell variable @code{enableval}. +@var{action-if-given} in the shell variable @code{enableval}, which is +actually just the value of the shell variable @code{enable_@var{package}}; +you may use that variable instead, if you wish. The @var{help-string} argument is like that of @code{AC_ARG_WITH} (@pxref{External Software}). @end defmac @@ -4090,7 +4096,7 @@ same name. For example, if you configure GNU @code{diff} with @samp{--program-prefix=g}, then when you run @samp{make install} it is installed as @file{/usr/local/bin/gdiff}. -As a more sophistocated example, you could use +As a more sophisticated example, you could use @example --program-transform-name='s/^/g/; s/^gg/g/; s/^gless/less/' @end example @@ -4425,14 +4431,12 @@ database would be a maintenance nightmare. Autoconf may appear to be this kind of database, but in fact it is not. Instead of listing host dependencies, it lists program requirements. -Imake is special-purpose. It is directed at building the X11 -distribution. By comparison to the GNU tools, this is a simple problem. If you view the GNU suite as a collection of native tools, then the -problems are similar. But the GNU tools are more powerful than that. -The development tools can be configured as cross tools in almost any -host+target permutation. All of these configurations can be installed -concurrently. They can even be configured to share host independent -files across hosts. Imake doesn't address these issues. +problems are similar. But the GNU development tools can be configured +as cross tools in almost any host+target permutation. All of these +configurations can be installed concurrently. They can even be +configured to share host independent files across hosts. Imake doesn't +address these issues. Imake templates are a form of standardization. The GNU coding standards address the same issues without necessarily imposing the same diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index f161944e3..9f70d97f5 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -51,7 +51,7 @@ dnl divert(-1)dnl Throw away output until AC_INIT is called. changequote([, ]) -define(AC_ACVERSION, 2.2) +define(AC_ACVERSION, 2.2.1) dnl Some old m4's don't support m4exit. But they provide dnl equivalent functionality by core dumping because of the @@ -1023,8 +1023,8 @@ AC_DEFUN(AC_LANG_C, ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&AC_FD_CC 2>&AC_FD_CC' -ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC' +ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&AC_FD_CC 2>&AC_FD_CC' +ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC' ]) dnl AC_LANG_CPLUSPLUS() @@ -1666,7 +1666,9 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL" ])dnl ifdef([AC_LIST_HEADER], -[trap 'rm -fr `echo $1 AC_LIST_HEADER | tr : " "` conftest*; exit 1' 1 2 15], +[changequote({,}) +trap 'rm -fr `echo $1 AC_LIST_HEADER | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +changequote(,)], [trap 'rm -f $1; exit 1' 1 2 15]) AC_OUTPUT_FILES($1)