From: Tom Tromey <tromey@redhat.com>
Date: Thu, 11 Mar 1999 22:56:16 +0000 (+0000)
Subject: 	* m4/error.m4, m4/mktime.m4, m4/obstack.m4, m4/regex.m4,
X-Git-Tag: user-dep-gen-branchpoint~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0922e6c7949081bb659e69d2766fefeaf211b795;p=thirdparty%2Fautomake.git

	* m4/error.m4, m4/mktime.m4, m4/obstack.m4, m4/regex.m4,
	m4/strtod.m4: Use $ac_objext, not `.o'.  From Jim Meyering.
---

diff --git a/ChangeLog b/ChangeLog
index 23cf724ea..61cbcaf9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-03-11  Tom Tromey  <tromey@cygnus.com>
 
+	* m4/error.m4, m4/mktime.m4, m4/obstack.m4, m4/regex.m4,
+	m4/strtod.m4: Use $ac_objext, not `.o'.  From Jim Meyering.
+
 	From Jim Meyering:
 	* automake.in (handle_dist): Add `;\' to end of distcheck-hook
 	line.
diff --git a/TODO b/TODO
index 0b857a7da..fb94eeecc 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,8 @@
   still won't put the file into the disty.  This is wrong.
   From Mark H Wilkinson <mhw@kremvax.demon.co.uk>
 
+* If we see `foo.o' in LIBOBJS, and we've seen AC_OBJEXT, then complain.
+
 * subdir warning for source files is bogus.  I removed it at Cygnus;
   probably should remove it from net release
 
diff --git a/m4/error.m4 b/m4/error.m4
index eac272a50..96826534e 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -7,7 +7,7 @@ AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
               am_cv_lib_error_at_line=yes,
 	      am_cv_lib_error_at_line=no)])
  if test $am_cv_lib_error_at_line = no; then
-   LIBOBJS="$LIBOBJS error.o"
+   LIBOBJS="$LIBOBJS error.$ac_objext"
  fi
  AC_SUBST(LIBOBJS)dnl
 ])
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 8e54aa8e7..7c6d305d5 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -162,6 +162,6 @@ changequote([, ])dnl
 	     am_cv_func_working_mktime=no)
   ])
   if test $am_cv_func_working_mktime = no; then
-    LIBOBJS="$LIBOBJS mktime.o"
+    LIBOBJS="$LIBOBJS mktime.$ac_objext"
   fi
 ])
diff --git a/m4/obstack.m4 b/m4/obstack.m4
index df6fcba62..273caff18 100644
--- a/m4/obstack.m4
+++ b/m4/obstack.m4
@@ -10,6 +10,6 @@ AC_DEFUN(AM_FUNC_OBSTACK,
  if test $am_cv_func_obstack = yes; then
    AC_DEFINE(HAVE_OBSTACK,1,[Define if libc includes obstacks])
  else
-   LIBOBJS="$LIBOBJS obstack.o"
+   LIBOBJS="$LIBOBJS obstack.$ac_objext"
  fi
 ])
diff --git a/m4/regex.m4 b/m4/regex.m4
index 309102ea3..80c65243a 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -27,11 +27,11 @@ if test -n "$am_with_regex"; then
     AC_TRY_LINK([], [extern int re_max_failures; re_max_failures = 1],
 		am_cv_gnu_regex=yes, am_cv_gnu_regex=no))
   if test $am_cv_gnu_regex = no; then
-    LIBOBJS="$LIBOBJS regex.o"
+    LIBOBJS="$LIBOBJS regex.$ac_objext"
   fi
 else
   AC_MSG_RESULT(rx)
-  AC_CHECK_FUNC(re_rx_search, , [LIBOBJS="$LIBOBJS rx.o"])
+  AC_CHECK_FUNC(re_rx_search, , [LIBOBJS="$LIBOBJS rx.$ac_objext"])
 fi
 AC_SUBST(LIBOBJS)dnl
 ])
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 8aaf4b793..a090d958e 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -23,7 +23,7 @@
 ## @maindex FUNC_STRTOD
 ## @ovindex LIBOBJS
 ## If the @code{strtod} function is not available, or does not work
-## correctly (like the one on SunOS 5.4), add @samp{strtod.o} to output
+## correctly (like the one on SunOS 5.4), add @samp{strtod.$ac_objext} to output
 ## variable @code{LIBOBJS}.
 ## @end defmac
 
@@ -56,7 +56,7 @@ main()
   exit (0);
 }
 ], am_cv_func_strtod=yes, am_cv_func_strtod=no, am_cv_func_strtod=no)])
-test $am_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
+test $am_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.$ac_objext"
 AC_SUBST(LIBOBJS)dnl
 am_cv_func_strtod_needs_libm=no
 if test $am_cv_func_strtod = no; then