From: Stepan Kasal <kasal@ucw.cz>
Date: Fri, 17 Dec 2004 14:36:23 +0000 (+0000)
Subject: * lib/autoconf/general.m4 (_AC_LIBOBJ): We can use AC_SUBST/2,
X-Git-Tag: AUTOCONF-2.59c~548
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc1b400cc4e503f74a64466b216f4f1fa6e131ea;p=thirdparty%2Fautoconf.git

* lib/autoconf/general.m4 (_AC_LIBOBJ): We can use AC_SUBST/2,
  remove the comment which said we cannot.
---

diff --git a/ChangeLog b/ChangeLog
index 6e0402ccd..8defaf67e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-17  Stepan Kasal  <kasal@ucw.cz>
+
+	* lib/autoconf/general.m4 (_AC_LIBOBJ): We can use AC_SUBST/2,
+	  remove the comment which said we cannot.
+
 2004-12-17  Stepan Kasal  <kasal@ucw.cz>
 
 	Add a specialized check for resolv.h.  Thanks to Gerrit P. Haase,
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f5ea2b682..786c825ff 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2425,27 +2425,23 @@ m4_define([AC_LIBSOURCES],
 # _AC_LIBOBJ(FILE-NAME-NOEXT, ACTION-IF-INDIR)
 # --------------------------------------------
 # We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
-# We don't use AC_SUBST/2 because it forces an unnecessary eol.
 m4_define([_AC_LIBOBJ],
 [AS_LITERAL_IF([$1],
 	       [AC_LIBSOURCE([$1.c])],
 	       [$2])dnl
-AC_SUBST([LIB@&t@OBJS])dnl
 case $LIB@&t@OBJS in
     "$1.$ac_objext"   | \
   *" $1.$ac_objext"   | \
     "$1.$ac_objext "* | \
   *" $1.$ac_objext "* ) ;;
-  *) LIB@&t@OBJS="$LIB@&t@OBJS $1.$ac_objext" ;;
+  *) AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS $1.$ac_objext"]) ;;
 esac
 ])
 
 
-
 # AC_LIBOBJ(FILE-NAME-NOEXT)
 # -------------------------
 # We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
-# We don't use AC_SUBST/2 because it forces an unnecessary eol.
 m4_define([AC_LIBOBJ],
 [_AC_LIBOBJ([$1],
 	    [AC_DIAGNOSE(syntax,