fdopendir: Move AC_LIBOBJ invocations to module description.

* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Move AC_LIBOBJ invocations from
here...
* modules/fdopendir (configure.ac): ... to here.
(Depends-on): Improve conditions.

diff --git a/ChangeLog b/ChangeLog
index efd0b791f897bf108a33cd997bb51119b98079fe..ff042a31fe4706bd825f6e74859f3e4b4ca87b79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-06  Bruno Haible  <bruno@clisp.org>
+
+       fdopendir: Move AC_LIBOBJ invocations to module description.
+       * m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Move AC_LIBOBJ invocations from
+       here...
+       * modules/fdopendir (configure.ac): ... to here.
+       (Depends-on): Improve conditions.
+
 2011-05-06  Bruno Haible  <bruno@clisp.org>
 
        _Exit: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
index 05aa77213f5000deba3eca0494126619c6b5393e..25dee3fc404ee56bd9543a19c87831883a7e3b61 100644 (file)
--- a/m4/fdopendir.m4
+++ b/m4/fdopendir.m4
@@ -1,4 +1,4 @@
-# serial 6
+# serial 7
 # See if we need to provide fdopendir.
 
 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
@@ -17,8 +17,6 @@ AC_DEFUN([gl_FUNC_FDOPENDIR],
     ]])
   AC_CHECK_FUNCS_ONCE([fdopendir])
   if test $ac_cv_func_fdopendir = no; then
-    AC_LIBOBJ([openat-proc])
-    AC_LIBOBJ([fdopendir])
     HAVE_FDOPENDIR=0
   else
     AC_CACHE_CHECK([whether fdopendir works],
@@ -41,7 +39,6 @@ extern DIR *fdopendir (int);
          [gl_cv_func_fdopendir_works="guessing no"])])
     if test "$gl_cv_func_fdopendir_works" != yes; then
       REPLACE_FDOPENDIR=1
-      AC_LIBOBJ([fdopendir])
     fi
   fi
 ])

diff --git a/modules/fdopendir b/modules/fdopendir
index 0612b74d689035754ce0ef48eb9f75a85b241a4c..a1c25193db1296fbcc8d146f17fa9fa8237b7be6 100644 (file)
--- a/modules/fdopendir
+++ b/modules/fdopendir
@@ -10,13 +10,19 @@ m4/fdopendir.m4
 Depends-on:
 dirent
 extensions
-errno           [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
-fchdir          [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
-openat-die      [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
-save-cwd        [test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1]
+errno           [test $HAVE_FDOPENDIR = 0]
+fchdir          [test $HAVE_FDOPENDIR = 0]
+openat-die      [test $HAVE_FDOPENDIR = 0]
+save-cwd        [test $HAVE_FDOPENDIR = 0]
 
 configure.ac:
 gl_FUNC_FDOPENDIR
+if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then
+  AC_LIBOBJ([fdopendir])
+fi
+if test $HAVE_FDOPENDIR = 0; then
+  AC_LIBOBJ([openat-proc])
+fi
 gl_DIRENT_MODULE_INDICATOR([fdopendir])
 gl_MODULE_INDICATOR([fdopendir])