fnmatch, fnmatch-gnu: Move AC_LIBOBJ invocations to module description.

* m4/fnmatch.m4 (gl_PREREQ_FNMATCH): New macro, extracted from
gl_FUNC_FNMATCH_POSIX.
(gl_FUNC_FNMATCH_POSIX): Move AC_LIBOBJ and gl_PREREQ_FNMATCH
invocations from here...
* modules/fnmatch (configure.ac): ... to here.
* modules/fnmatch-gnu (configure.ac): ... and here.

diff --git a/ChangeLog b/ChangeLog
index 56ced8388550e91c4b1d0c7849f80f248457ad3d..16aed5e2728d1d5cc48a0271f919ac4715fec803 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-07  Bruno Haible  <bruno@clisp.org>
+
+       fnmatch, fnmatch-gnu: Move AC_LIBOBJ invocations to module description.
+       * m4/fnmatch.m4 (gl_PREREQ_FNMATCH): New macro, extracted from
+       gl_FUNC_FNMATCH_POSIX.
+       (gl_FUNC_FNMATCH_POSIX): Move AC_LIBOBJ and gl_PREREQ_FNMATCH
+       invocations from here...
+       * modules/fnmatch (configure.ac): ... to here.
+       * modules/fnmatch-gnu (configure.ac): ... and here.
+
 2011-05-07  Bruno Haible  <bruno@clisp.org>
 
        flock: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 4ddfbaecc0db4106aed1d4c011ba978404faf8fe..22ba35cf1598a36fe566e43beb4d0b4b071f2512 100644 (file)
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -1,4 +1,4 @@
-# Check for fnmatch - serial 6.
+# Check for fnmatch - serial 7.
 
 # Copyright (C) 2000-2007, 2009-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -128,17 +128,6 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
     rm -f "$gl_source_base/fnmatch.h"
   else
     FNMATCH_H=fnmatch.h
-    AC_LIBOBJ([fnmatch])
-    dnl We must choose a different name for our function, since on ELF systems
-    dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
-    dnl compiled into a shared library.
-    AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
-      [Define to a replacement function name for fnmatch().])
-    dnl Prerequisites of lib/fnmatch.c.
-    AC_REQUIRE([AC_TYPE_MBSTATE_T])
-    AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
-    AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
-    AC_CHECK_HEADERS_ONCE([wctype.h])
   fi
   AC_SUBST([FNMATCH_H])
   AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
@@ -151,3 +140,17 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU],
 
   AC_REQUIRE([gl_FUNC_FNMATCH_POSIX])
 ])
+
+AC_DEFUN([gl_PREREQ_FNMATCH],
+[
+  dnl We must choose a different name for our function, since on ELF systems
+  dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
+  dnl compiled into a shared library.
+  AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
+    [Define to a replacement function name for fnmatch().])
+  dnl Prerequisites of lib/fnmatch.c.
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
+  AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
+  AC_CHECK_HEADERS_ONCE([wctype.h])
+])

diff --git a/modules/fnmatch b/modules/fnmatch
index 12e5906afd66839d5344e3987607594a63f529a1..8a46af2a7fcf5abf49909fbba8a92719eb58c1eb 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -22,6 +22,10 @@ mbsinit         [test -n "$FNMATCH_H"]
 
 configure.ac:
 gl_FUNC_FNMATCH_POSIX
+if test -n "$FNMATCH_H"; then
+  AC_LIBOBJ([fnmatch])
+  gl_PREREQ_FNMATCH
+fi
 
 Makefile.am:
 BUILT_SOURCES += $(FNMATCH_H)

diff --git a/modules/fnmatch-gnu b/modules/fnmatch-gnu
index 143344e343a4ba3543e6d110990725891dff5c9e..cf2fe1f137d70a471826bf2c9971d03aae803c39 100644 (file)
--- a/modules/fnmatch-gnu
+++ b/modules/fnmatch-gnu
@@ -8,6 +8,10 @@ fnmatch
 
 configure.ac:
 gl_FUNC_FNMATCH_GNU
+if test -n "$FNMATCH_H"; then
+  AC_LIBOBJ([fnmatch])
+  gl_PREREQ_FNMATCH
+fi
 
 Makefile.am: