13 files changed, 27 insertions, 12 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 6a60a9f21..fcdd0645c 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,19 @@
 1999-02-06  Jim Meyering  <meyering@ascend.com>
 
+	* 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 b3c0a7c43..73ae469c3 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -42,7 +42,7 @@ AC_DEFUN(jm_FUNC_CHOWN,
 	     jm_cv_func_working_chown=no)
   ])
   if test $jm_cv_func_working_chown = no; then
-    LIBOBJS="$LIBOBJS chown.o"
+    LIBOBJS="$LIBOBJS chown.$ac_objext"
     AC_DEFINE_UNQUOTED(chown, rpl_chown,
       [Define to rpl_chown if the replacement function should be used.])
   fi
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index a94f45dd2..85e40ddaa 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -10,7 +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
-    LIBOBJS="$LIBOBJS fnmatch.o"
+    LIBOBJS="$LIBOBJS fnmatch.$ac_objext"
     AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch,
       [Define to rpl_fnmatch if the replacement function should be used.])
   fi
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 37387dda3..2200056b6 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -38,7 +38,7 @@ AC_DEFUN(jm_FUNC_GETGROUPS,
 	       jm_cv_func_working_getgroups=no)
     ])
     if test $jm_cv_func_working_getgroups = no; then
-      LIBOBJS="$LIBOBJS getgroups.o"
+      LIBOBJS="$LIBOBJS getgroups.$ac_objext"
       AC_DEFINE_UNQUOTED(getgroups, rpl_getgroups,
 	[Define as rpl_getgroups if getgroups doesn't work right.])
     fi
diff --git a/m4/getline.m4 b/m4/getline.m4
index 834b1a287..f3d6a8124 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -39,7 +39,7 @@ AC_DEFUN(AM_FUNC_GETLINE,
   fi
 
   if test $am_cv_func_working_getline = no; then
-    LIBOBJS="$LIBOBJS getline.o"
+    LIBOBJS="$LIBOBJS getline.$ac_objext"
     AC_SUBST(LIBOBJS)dnl
   fi
 ])
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 8378645c9..0908c4d80 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -30,7 +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
-    LIBOBJS="$LIBOBJS lstat.o"
+    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
    file name argument.  The lstat from SunOS4.1.4 and the Hurd as of 1998-11-01)
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 893c6e21d..b491ad4ce 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -27,7 +27,7 @@ AC_DEFUN(jm_FUNC_MALLOC,
 	 jm_cv_func_working_malloc=no)
   ])
   if test $jm_cv_func_working_malloc = no; then
-    LIBOBJS="$LIBOBJS malloc.o"
+    LIBOBJS="$LIBOBJS malloc.$ac_objext"
     AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
       [Define to rpl_malloc if the replacement function should be used.])
   fi
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 390014f41..1c08adc22 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -38,7 +38,8 @@ changequote([, ])dnl
    jm_cv_func_memcmp_working=yes,
    jm_cv_func_memcmp_working=no,
    jm_cv_func_memcmp_working=no)])
-test $jm_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.o"
+test $jm_cv_func_memcmp_working = no \
+  && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 AC_SUBST(LIBOBJS)dnl
 ])
 
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index c1f444b2f..8743cc918 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -33,7 +33,7 @@ AC_DEFUN(jm_FUNC_PUTENV,
 	     jm_cv_func_svid_putenv=no)
   ])
   if test $jm_cv_func_svid_putenv = no; then
-    LIBOBJS="$LIBOBJS putenv.o"
+    LIBOBJS="$LIBOBJS putenv.$ac_objext"
     AC_DEFINE_UNQUOTED(putenv, rpl_putenv,
       [Define to rpl_memcmp if the replacement function should be used.])
   fi
diff --git a/m4/realloc.m4 b/m4/realloc.m4
index 989d53b66..2c8674876 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -27,7 +27,7 @@ AC_DEFUN(jm_FUNC_REALLOC,
 	 jm_cv_func_working_realloc=no)
   ])
   if test $jm_cv_func_working_realloc = no; then
-    LIBOBJS="$LIBOBJS realloc.o"
+    LIBOBJS="$LIBOBJS realloc.$ac_objext"
     AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
       [Define to rpl_realloc if the replacement function should be used.])
   fi
diff --git a/m4/regex.m4 b/m4/regex.m4
index b7a038942..df78cbb89 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -63,7 +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
-	  LIBOBJS="$LIBOBJS regex.o"
+	  LIBOBJS="$LIBOBJS regex.$ac_objext"
 	fi
       ],
     )
diff --git a/m4/stat.m4 b/m4/stat.m4
index 767b9a5d7..c18654108 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -30,7 +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
-    LIBOBJS="$LIBOBJS stat.o"
+    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
    file name argument.  The stat from SunOS4.1.4 and the Hurd as of 1998-11-01)
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index fd4b6ffa5..e2074abeb 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -133,7 +133,7 @@ changequote([, ])dnl
 	     jm_cv_func_working_gnu_strftime=no)
   ])
   if test $jm_cv_func_working_gnu_strftime = no; then
-    LIBOBJS="$LIBOBJS strftime.o"
+    LIBOBJS="$LIBOBJS strftime.$ac_objext"
     AC_DEFINE_UNQUOTED(strftime, gnu_strftime,
       [Define to gnu_strftime if the replacement function should be used.])
   fi