From: Akim Demaille <akim@epita.fr>
Date: Mon, 10 Jul 2000 10:26:42 +0000 (+0000)
Subject: AC_LIBOBJ when used by AC_REPLACE_FUNCS should not complain for
X-Git-Tag: autoconf-2.50~743
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ecd09aa98fd58790e643a2edd618f84befc307f;p=thirdparty%2Fautoconf.git

AC_LIBOBJ when used by AC_REPLACE_FUNCS should not complain for
variables as argument.

* acgeneral.m4 (_AC_LIBOBJ): Same as the former AC_LIBOBJ, but
takes an additional argument: action to perform when non-literal
argument.
(AC_LIBOBJ): Use it.
(AC_REPLACE_FUNCS): Use _AC_LIBOBJ, not AC_LIBOBJ.
---

diff --git a/ChangeLog b/ChangeLog
index c8f7d3434..eab8ed141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+	AC_LIBOBJ when used by AC_REPLACE_FUNCS should not complain for
+	variables as argument.
+
+	* acgeneral.m4 (_AC_LIBOBJ): Same as the former AC_LIBOBJ, but
+	takes an additional argument: action to perform when non-literal
+	argument.
+	(AC_LIBOBJ): Use it.
+	(AC_REPLACE_FUNCS): Use _AC_LIBOBJ, not AC_LIBOBJ.
+
 2000-07-10  Akim Demaille  <akim@epita.fr>
 
 	LANGUAGE should be neutralized too.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 019d20a7d..bf6144968 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3499,24 +3499,34 @@ done
 define([AC_LIBOBJ_DECL], [])
 
 
-# AC_LIBOBJ(FILENAME-NOEXT)
-# -------------------------
+# _AC_LIBOBJ(FILENAME-NOEXT, ACTION-IF-INDIR)
+# -------------------------------------------
 # We need `FILENAME-NOEXT.o', save this into `LIBOBJS'.
 # We don't use AC_SUBST/2 because it forces an unneeded eol.
-define([AC_LIBOBJ],
+define([_AC_LIBOBJ],
 [AC_VAR_IF_INDIR([$1],
-                 [AC_DIAGNOSE(syntax,
-                              [$0: you should use literals])],
+                 [$2],
                  [AC_LIBOBJ_DECL([$1])])dnl
 AC_SUBST([LIBOBJS])dnl
 LIBOBJS="$LIBOBJS $1.${ac_objext}"])
 
 
+# AC_LIBOBJ(FILENAME-NOEXT)
+# -------------------------
+# We need `FILENAME-NOEXT.o', save this into `LIBOBJS'.
+# We don't use AC_SUBST/2 because it forces an unneeded eol.
+define([AC_LIBOBJ],
+[_AC_LIBOBJ([$1],
+            [AC_DIAGNOSE(syntax,
+                         [$0($1): you should use literals])])dnl
+])
+
+
 # AC_REPLACE_FUNCS(FUNCTION...)
 # -----------------------------
 AC_DEFUN([AC_REPLACE_FUNCS],
 [AC_FOREACH([AC_Func], [$1], [AC_LIBOBJ_DECL(AC_Func)])dnl
-AC_CHECK_FUNCS([$1], , [AC_LIBOBJ(${ac_func})])
+AC_CHECK_FUNCS([$1], , [_AC_LIBOBJ(${ac_func})])
 ])
 
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 019d20a7d..bf6144968 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3499,24 +3499,34 @@ done
 define([AC_LIBOBJ_DECL], [])
 
 
-# AC_LIBOBJ(FILENAME-NOEXT)
-# -------------------------
+# _AC_LIBOBJ(FILENAME-NOEXT, ACTION-IF-INDIR)
+# -------------------------------------------
 # We need `FILENAME-NOEXT.o', save this into `LIBOBJS'.
 # We don't use AC_SUBST/2 because it forces an unneeded eol.
-define([AC_LIBOBJ],
+define([_AC_LIBOBJ],
 [AC_VAR_IF_INDIR([$1],
-                 [AC_DIAGNOSE(syntax,
-                              [$0: you should use literals])],
+                 [$2],
                  [AC_LIBOBJ_DECL([$1])])dnl
 AC_SUBST([LIBOBJS])dnl
 LIBOBJS="$LIBOBJS $1.${ac_objext}"])
 
 
+# AC_LIBOBJ(FILENAME-NOEXT)
+# -------------------------
+# We need `FILENAME-NOEXT.o', save this into `LIBOBJS'.
+# We don't use AC_SUBST/2 because it forces an unneeded eol.
+define([AC_LIBOBJ],
+[_AC_LIBOBJ([$1],
+            [AC_DIAGNOSE(syntax,
+                         [$0($1): you should use literals])])dnl
+])
+
+
 # AC_REPLACE_FUNCS(FUNCTION...)
 # -----------------------------
 AC_DEFUN([AC_REPLACE_FUNCS],
 [AC_FOREACH([AC_Func], [$1], [AC_LIBOBJ_DECL(AC_Func)])dnl
-AC_CHECK_FUNCS([$1], , [AC_LIBOBJ(${ac_func})])
+AC_CHECK_FUNCS([$1], , [_AC_LIBOBJ(${ac_func})])
 ])