* 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 23cf724eaf30151fdec151ab2f0ed5031f64c20f..61cbcaf9a7070157c5bd3b2a3fbd0a51284a2804 100644 (file)
--- 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 0b857a7dab2a6d59222399f182bf91f7743a244c..fb94eeecc2626f646a50c9b053a53051b51fae7a 100644 (file)
--- 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 eac272a5080a271ab18382053b92c44170857c95..96826534e9e44ef9a4ecf28b1c8a2cc554909d35 100644 (file)
--- 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 8e54aa8e79961e7891bbc39c1ee11518bd05337b..7c6d305d5e16ac72282e5123566f8387fcccd1b2 100644 (file)
--- 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 df6fcba6238a2d7dda4e4c280648cf6268583619..273caff18975549e8c358c908e0104bdfd6241f4 100644 (file)
--- 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 309102ea300bcab71782680f382121e15fc8a33c..80c65243a799bf27fe30ff7351a4a0fa718f9425 100644 (file)
--- 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 8aaf4b7930b9d053abe2e703c9cdbbfbaf97abbe..a090d958e26b76033364b230d056d4169219e7e9 100644 (file)
--- 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