AC_LIBOBJ: optimize internal use

* lib/autoconf/general.m4 (_AC_LIBOBJ): Move literal check...
(AC_LIBOBJ): ...into callers.
* lib/autoconf/functions.m4 (_AC_REPLACE_FUNC): Likewise, thus
avoiding a second call to AS_LITERAL_IF.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 27ab27d50d4c4e0c4695445009e6bc8683282f12..a1a451a5dab2debc41438db63bb0bdd7840075ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-09-21  Eric Blake  <eblake@redhat.com>
 
+       AC_LIBOBJ: optimize internal use
+       * lib/autoconf/general.m4 (_AC_LIBOBJ): Move literal check...
+       (AC_LIBOBJ): ...into callers.
+       * lib/autoconf/functions.m4 (_AC_REPLACE_FUNC): Likewise, thus
+       avoiding a second call to AS_LITERAL_IF.
+
        AC_REPLACE_FUNCS: restore shell loop for non-literal
        * lib/autoconf/functions.m4 (AC_REPLACE_FUNCS): Handle
        non-literals, which was lost in 2010-02-26 optimization.

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index ca0271245e30c507d24e1412a4b1d902fbbe7e97..70a7ddf31902d15817ce5ac59c507ec095ab2ab9 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -123,7 +123,7 @@ m4_define([_AC_FUNCS_EXPANSION],
 m4_define([_AC_REPLACE_FUNC],
 [AC_CHECK_FUNC([$1],
   [_AH_CHECK_FUNC([$1])AC_DEFINE(AS_TR_CPP([HAVE_$1]))],
-  [AC_LIBOBJ([$1])])])
+  [_AC_LIBOBJ([$1])AC_LIBSOURCE([$1.c])])])
 
 # AC_REPLACE_FUNCS(FUNCTION...)
 # -----------------------------

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 14109213ebad7fd1d35c63f9068b104bc89826a8..59c47abb6372aeee47f443ac4f11f2ae19ba4e06 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2926,10 +2926,7 @@ AC_DEFUN([AC_LIBSOURCES],
 # --------------------------------------------
 # We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
 m4_define([_AC_LIBOBJ],
-[AS_LITERAL_WORD_IF([$1],
-              [AC_LIBSOURCE([$1.c])],
-              [$2])dnl
-case " $LIB@&t@OBJS " in
+[case " $LIB@&t@OBJS " in
   *" $1.$ac_objext "* ) ;;
   *) AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS $1.$ac_objext"]) ;;
 esac
@@ -2940,10 +2937,9 @@ esac
 # --------------------------
 # We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
 AC_DEFUN([AC_LIBOBJ],
-[_AC_LIBOBJ([$1],
-           [AC_DIAGNOSE(syntax,
-                        [$0($1): you should use literals])])dnl
-])
+[_AC_LIBOBJ([$1])]dnl
+[AS_LITERAL_WORD_IF([$1], [AC_LIBSOURCE([$1.c])],
+  [AC_DIAGNOSE([syntax], [$0($1): you should use literals])])])
 
 
 # _AC_LIBOBJS_NORMALIZE