From 8e79ee446a8376051c69c8ec944b0079cfdec96b Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 12 Nov 2001 08:55:49 +0000 Subject: [PATCH] * m4/make.m4 (AM_MAKE_INCLUDE): Serial 2. Use `"#"' and `"""', which Autoconf mode prefers over `'#'' and `'"''. * m4/missing.m4 (AM_MISSING_HAS_RUN): Serial 3. Rely on AC_MSG 2.50's quotation. --- ChangeLog | 8 ++++++++ m4/make.m4 | 15 ++++++++------- m4/missing.m4 | 5 ++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6318be58..67ced092 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-11-12 Akim Demaille + + * m4/make.m4 (AM_MAKE_INCLUDE): Serial 2. + Use `"#"' and `"\""', which + Autoconf mode prefers over `'#'' and `'"''. + * m4/missing.m4 (AM_MISSING_HAS_RUN): Serial 3. + Rely on AC_MSG 2.50's quotation. + 2001-11-09 Alexandre Duret-Lutz * automake.in (scan_texinfo_file): Typo from 2001-11-05. diff --git a/m4/make.m4 b/m4/make.m4 index cc2e856e..f40edbdd 100644 --- a/m4/make.m4 +++ b/m4/make.m4 @@ -1,8 +1,4 @@ -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. - -# Copyright 2001 Free Software Foundation, Inc. +# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +15,11 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# serial 2 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' @@ -27,7 +28,7 @@ doit: END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -47,7 +48,7 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi diff --git a/m4/missing.m4 b/m4/missing.m4 index 43ba91d6..82242000 100644 --- a/m4/missing.m4 +++ b/m4/missing.m4 @@ -21,7 +21,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 2 +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -43,7 +43,6 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) -- 2.43.5