* 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.

diff --git a/ChangeLog b/ChangeLog
index 6318be58da060dd71cb48c83941e8fc13b73dbba..67ced0924c7c1e8d770fe3c63c2de8a0a547dba9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-12  Akim Demaille  <akim@epita.fr>
+
+       * 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  <duret_g@epita.fr>
 
        * automake.in (scan_texinfo_file): Typo from 2001-11-05.

diff --git a/m4/make.m4 b/m4/make.m4
index cc2e856ed174df8a1c3894e49d9a3655b1196f2e..f40edbdd687122ad82ba521eea4abaae31a06dcf 100644 (file)
--- 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 43ba91d6e8682610dbac5e39587cb4e49a141ff4..822420000fd320fa7deb67d045da42d4ff7e56c4 100644 (file)
--- 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
 ])