Use AC_SUBST(LIBOBJS) since we set LIBOBJS.

11 files changed, 24 insertions, 0 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 20afa84c6..1c3ef633e 100644
--- 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 73ae469c3..deae13b41 100644
--- 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 85e40ddaa..c560fd2fa 100644
--- 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 2200056b6..15f7abcaf 100644
--- 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 0908c4d80..82e11abde 100644
--- 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 b491ad4ce..4978eaf6b 100644
--- 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 8743cc918..c95418b2f 100644
--- 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 2c8674876..bfbef0c16 100644
--- 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 df78cbb89..bb201ed2f 100644
--- 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 c18654108..7d2211604 100644
--- 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 e2074abeb..959051953 100644
--- 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.])