scandir: Move AC_LIBOBJ invocations to module description.

* m4/scandir.m4 (gl_FUNC_SCANDIR): Move AC_LIBOBJ and gl_PREREQ_SCANDIR
invocations from here...
* modules/scandir (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 50275a2..491c6de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       scandir: Move AC_LIBOBJ invocations to module description.
+       * m4/scandir.m4 (gl_FUNC_SCANDIR): Move AC_LIBOBJ and gl_PREREQ_SCANDIR
+       invocations from here...
+       * modules/scandir (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        rpmatch: Move AC_LIBOBJ invocations to module description.
        * m4/rpmatch.m4 (gl_FUNC_RPMATCH): Call AC_CHECK_FUNCS instead of
        AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_RPMATCH invocations from

diff --git a/m4/scandir.m4 b/m4/scandir.m4
index a53c3fd..25ebe06 100644 (file)
--- a/m4/scandir.m4
+++ b/m4/scandir.m4
@@ -1,4 +1,4 @@
-# scandir.m4 serial 1
+# scandir.m4 serial 2
 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14,8 +14,6 @@ AC_DEFUN([gl_FUNC_SCANDIR],
   AC_CHECK_FUNCS([scandir])
   if test $ac_cv_func_scandir = no; then
     HAVE_SCANDIR=0
-    AC_LIBOBJ([scandir])
-    gl_PREREQ_SCANDIR
   fi
 ])
 

diff --git a/modules/scandir b/modules/scandir
index d226f11..e071e54 100644 (file)
--- a/modules/scandir
+++ b/modules/scandir
@@ -11,6 +11,10 @@ extensions
 
 configure.ac:
 gl_FUNC_SCANDIR
+if test $HAVE_SCANDIR = 0; then
+  AC_LIBOBJ([scandir])
+  gl_PREREQ_SCANDIR
+fi
 gl_DIRENT_MODULE_INDICATOR([scandir])
 
 Makefile.am: