Use AC_SUBST(LIBOBJS) since we set LIBOBJS.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 20afa84c6e0baf2f5c8f6a656361a818a6d47550..1c3ef633ef7d3d7e2b63ba80d3adcd3202e04a7a 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -11,6 +11,20 @@
        * stat.m4: Likewise.
        * strftime.m4: Likewise.
 
+       * chown.m4: Use `.$ac_objext', not `.o'.
+       * fnmatch.m4: Likewise.
+       * getgroups.m4: Likewise.
+       * getline.m4: Likewise.
+       * lstat.m4: Likewise.
+       * malloc.m4: Likewise.
+       * memcmp.m4: Likewise.
+       * putenv.m4: Likewise.
+       * realloc.m4: Likewise.
+       * regex.m4: Likewise.
+       * stat.m4: Likewise.
+       * strftime.m4: Likewise.
+       Suggestion from Alain Magloire.
+
        * jm-macros.m4: Actually invoke jm_WITH_REGEX now that it requires
        an argument.
 

diff --git a/m4/chown.m4 b/m4/chown.m4
index 73ae469c34251449940f7a2aed13ff11c36c3756..deae13b4176a058bb18ddb10712cfe24281877cc 100644 (file)
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -42,6 +42,7 @@ AC_DEFUN(jm_FUNC_CHOWN,
             jm_cv_func_working_chown=no)
   ])
   if test $jm_cv_func_working_chown = no; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS chown.$ac_objext"
     AC_DEFINE_UNQUOTED(chown, rpl_chown,
       [Define to rpl_chown if the replacement function should be used.])

diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 85e40ddaa03a36ac13ee40566e826d1e2142209d..c560fd2fa19c189e96fd27d39fba0f91dc5dd994 100644 (file)
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -10,6 +10,7 @@ AC_DEFUN(jm_FUNC_FNMATCH,
   AC_FUNC_FNMATCH
   if test $ac_cv_func_fnmatch_works = no \
       && test $ac_cv_gnu_library = no; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS fnmatch.$ac_objext"
     AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch,
       [Define to rpl_fnmatch if the replacement function should be used.])

diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 2200056b68e143517a3ffb8e271658759ae6ecd9..15f7abcaf8a03aa45c90c463a8660d86bc4c90f6 100644 (file)
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -38,6 +38,7 @@ AC_DEFUN(jm_FUNC_GETGROUPS,
               jm_cv_func_working_getgroups=no)
     ])
     if test $jm_cv_func_working_getgroups = no; then
+      AC_SUBST(LIBOBJS)
       LIBOBJS="$LIBOBJS getgroups.$ac_objext"
       AC_DEFINE_UNQUOTED(getgroups, rpl_getgroups,
        [Define as rpl_getgroups if getgroups doesn't work right.])

diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 0908c4d806d4bbfd41687aa4ca8a159e1be0b207..82e11abde663ad38fc5cca7be67243f5d89a19a7 100644 (file)
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -30,6 +30,7 @@ AC_DEFUN(jm_FUNC_LSTAT,
         jm_cv_func_lstat_empty_string_bug=yes)
   ])
   if test $jm_cv_func_lstat_empty_string_bug = yes; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS lstat.$ac_objext"
     AC_DEFINE_UNQUOTED(HAVE_LSTAT_EMPTY_STRING_BUG, 1,
 [Define if lstat has the bug that it succeeds when given the zero-length

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index b491ad4ced7cc8faa6e2cd65eef7a1e292f3a1d9..4978eaf6b37e21623213bb68aabc6531a65aa4ff 100644 (file)
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -27,6 +27,7 @@ AC_DEFUN(jm_FUNC_MALLOC,
         jm_cv_func_working_malloc=no)
   ])
   if test $jm_cv_func_working_malloc = no; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS malloc.$ac_objext"
     AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
       [Define to rpl_malloc if the replacement function should be used.])

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 8743cc918426c737591ca99eb38a076900dcbc33..c95418b2f04e92220aeb4c96aa378e004cf6679f 100644 (file)
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -33,6 +33,7 @@ AC_DEFUN(jm_FUNC_PUTENV,
             jm_cv_func_svid_putenv=no)
   ])
   if test $jm_cv_func_svid_putenv = no; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS putenv.$ac_objext"
     AC_DEFINE_UNQUOTED(putenv, rpl_putenv,
       [Define to rpl_memcmp if the replacement function should be used.])

diff --git a/m4/realloc.m4 b/m4/realloc.m4
index 2c867487694b512eb5d47131b3e7fe2588a73789..bfbef0c1652503b94734b6f6752c62e77a38aaeb 100644 (file)
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -27,6 +27,7 @@ AC_DEFUN(jm_FUNC_REALLOC,
         jm_cv_func_working_realloc=no)
   ])
   if test $jm_cv_func_working_realloc = no; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS realloc.$ac_objext"
     AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
       [Define to rpl_realloc if the replacement function should be used.])

diff --git a/m4/regex.m4 b/m4/regex.m4
index df78cbb89fd693782789002da8a5eb0e82e9ce3a..bb201ed2feb8523706a2528e8e0be10a1c2af3e3 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -63,6 +63,7 @@ AC_DEFUN(jm_WITH_REGEX,
                    jm_with_regex=$withval,
                    jm_with_regex=$ac_use_included_regex)
        if test "$jm_with_regex" = yes; then
+         AC_SUBST(LIBOBJS)
          LIBOBJS="$LIBOBJS regex.$ac_objext"
        fi
       ],

diff --git a/m4/stat.m4 b/m4/stat.m4
index c1865410823ca7e48b937fe651deac220d56580b..7d22116041aef9e6597195341b09332247636673 100644 (file)
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -30,6 +30,7 @@ AC_DEFUN(jm_FUNC_STAT,
         jm_cv_func_stat_empty_string_bug=yes)
   ])
   if test $jm_cv_func_stat_empty_string_bug = yes; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS stat.$ac_objext"
     AC_DEFINE_UNQUOTED(HAVE_STAT_EMPTY_STRING_BUG, 1,
 [Define if stat has the bug that it succeeds when given the zero-length

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index e2074abeb7082a00e4cc67ed54e6662f3c7bbf17..9590519530ce20945641e7709eec961ea52b9809 100644 (file)
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -133,6 +133,7 @@ changequote([, ])dnl
             jm_cv_func_working_gnu_strftime=no)
   ])
   if test $jm_cv_func_working_gnu_strftime = no; then
+    AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS strftime.$ac_objext"
     AC_DEFINE_UNQUOTED(strftime, gnu_strftime,
       [Define to gnu_strftime if the replacement function should be used.])