From: Pavel Roskin Date: Fri, 24 Nov 2000 02:25:13 +0000 (+0000) Subject: * m4/regex.m4 (AM_WITH_REGEX): This macro was broken because X-Git-Tag: Release-1-4b~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f11c70895eae6a27750cc415f8c4125f2278e09;p=thirdparty%2Fautomake.git * m4/regex.m4 (AM_WITH_REGEX): This macro was broken because of M4 underquoting. * m4/ccstdc.m4 (AC_PROG_CC_STDC): Added some M4 quotes. * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise. * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise. * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise. * m4/multi.m4 (AM_WITH_DMALLOC): Likewise. * m4/python.m4 (AM_PATH_PYTHON): Likewise. * m4/strtod.m4 (AM_FUNC_STRTOD): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 172f491dc..585d4e573 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-11-23 Pavel Roskin + + * m4/regex.m4 (AM_WITH_REGEX): This macro was broken because + of M4 underquoting. + * m4/ccstdc.m4 (AC_PROG_CC_STDC): Added some M4 quotes. + * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise. + * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise. + * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise. + * m4/multi.m4 (AM_WITH_DMALLOC): Likewise. + * m4/python.m4 (AM_PATH_PYTHON): Likewise. + * m4/strtod.m4 (AM_FUNC_STRTOD): Likewise. + 2000-11-23 Tom Tromey * automake.in (require_file_internal): Pass $file as second diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4 index bf472f053..f8382295f 100644 --- a/m4/ccstdc.m4 +++ b/m4/ccstdc.m4 @@ -30,7 +30,7 @@ dnl like #elif. dnl FIXME: can't do this because then AC_AIX won't work due to a dnl circular dependency. dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) +AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) AC_CACHE_VAL(am_cv_prog_cc_stdc, [am_cv_prog_cc_stdc=no ac_save_CC="$CC" @@ -83,7 +83,7 @@ CC="$ac_save_CC" if test -z "$am_cv_prog_cc_stdc"; then AC_MSG_RESULT([none needed]) else - AC_MSG_RESULT($am_cv_prog_cc_stdc) + AC_MSG_RESULT([$am_cv_prog_cc_stdc]) fi case "x$am_cv_prog_cc_stdc" in x|xno) ;; diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4 index 6828c9f90..f72467089 100644 --- a/m4/dmalloc.m4 +++ b/m4/dmalloc.m4 @@ -6,7 +6,7 @@ # serial 1 AC_DEFUN([AM_WITH_DMALLOC], -[AC_MSG_CHECKING(if malloc debugging is wanted) +[AC_MSG_CHECKING([if malloc debugging is wanted]) AC_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc, as in http://www.dmalloc.com/dmalloc.tar.gz], diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index 59b4678c8..7f8b1bb65 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -11,7 +11,7 @@ AC_DEFUN([AM_PATH_LISPDIR], [ --with-lispdir Override the default lisp directory ], [ lispdir="$withval" AC_MSG_CHECKING([where .elc files should go]) - AC_MSG_RESULT($lispdir)], + AC_MSG_RESULT([$lispdir])], [ # If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. diff --git a/m4/maintainer.m4 b/m4/maintainer.m4 index 4e8f34882..3cde2ee56 100644 --- a/m4/maintainer.m4 +++ b/m4/maintainer.m4 @@ -11,8 +11,8 @@ AC_DEFUN([AM_MAINTAINER_MODE], (and sometimes confusing) to the casual installer], USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE AC_SUBST(MAINT)dnl ] diff --git a/m4/multi.m4 b/m4/multi.m4 index 85c6bc2c4..065f9db0f 100644 --- a/m4/multi.m4 +++ b/m4/multi.m4 @@ -8,7 +8,7 @@ AC_ARG_ENABLE(multilib, [case "${enableval}" in yes) multilib=yes ;; no) multilib=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; + *) AC_MSG_ERROR([bad value ${enableval} for multilib option]) ;; esac], [multilib=yes]) # We may get other options which we are undocumented: diff --git a/m4/python.m4 b/m4/python.m4 index 8efacb165..cad69f557 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -99,5 +99,5 @@ Valid options are `module' or `package' dnl All done. - AC_MSG_RESULT(looks good) + AC_MSG_RESULT([looks good]) ]) diff --git a/m4/regex.m4 b/m4/regex.m4 index 406f258e9..265a239f6 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -15,7 +15,7 @@ # will result in a smaller executable file. AC_DEFUN([AM_WITH_REGEX], -[AC_MSG_CHECKING(which of GNU rx or gawk's regex is wanted) +[AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted]) AC_ARG_WITH(regex, [ --without-regex use GNU rx in lieu of gawk's regex for matching], [test "$withval" = yes && am_with_regex=1], @@ -24,8 +24,8 @@ if test -n "$am_with_regex"; then AC_MSG_RESULT(regex) AC_DEFINE(WITH_REGEX,1,[Define if using GNU regex]) AC_CACHE_CHECK([for GNU regex in libc], am_cv_gnu_regex, - AC_TRY_LINK([], [extern int re_max_failures; re_max_failures = 1], - am_cv_gnu_regex=yes, am_cv_gnu_regex=no)) + [AC_TRY_LINK([], [extern int re_max_failures; re_max_failures = 1], + am_cv_gnu_regex=yes, am_cv_gnu_regex=no)]) if test $am_cv_gnu_regex = no; then LIBOBJS="$LIBOBJS regex.$ac_objext" fi diff --git a/m4/strtod.m4 b/m4/strtod.m4 index d78d12d3a..4bdcdb0ed 100644 --- a/m4/strtod.m4 +++ b/m4/strtod.m4 @@ -63,7 +63,7 @@ if test $am_cv_func_strtod = no; then AC_CHECK_FUNCS(pow) if test $ac_cv_func_pow = no; then AC_CHECK_LIB(m, pow, [am_cv_func_strtod_needs_libm=yes], - [AC_MSG_WARN(can't find library containing definition of pow)]) + [AC_MSG_WARN([can't find library containing definition of pow])]) fi fi ])