X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffnmatch.m4;h=c560fd2fa19c189e96fd27d39fba0f91dc5dd994;hb=8b94df3a1dedad41a6e4413162a827a109182dd5;hp=96d1a354a4e5a73dce7e1a5f191e84daa95420cb;hpb=f3a83132f9b3722087a4180e29733705d596b242;p=gnulib.git

diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 96d1a354a..c560fd2fa 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -1,13 +1,8 @@
-#serial 1
+#serial 2
 
 dnl Determine whether to add fnmatch.o to LIBOBJS and to
 dnl define fnmatch to rpl_fnmatch.
 dnl
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl  /* Define to rpl_fnmatch if the replacement function should be used.  */
-dnl  #undef fnmatch
-dnl
 
 AC_DEFUN(jm_FUNC_FNMATCH,
 [
@@ -15,7 +10,9 @@ 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"
-    AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
+    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.])
   fi
-]
+])