dup2: Move AC_LIBOBJ invocation to module description.

* m4/dup2.m4 (gl_REPLACE_DUP2): Remove macro.
(gl_FUNC_DUP2): Instead of gl_REPLACE_DUP2, just set REPLACE_DUP2 to 1.
Don't invoke AC_LIBOBJ.
* modules/dup2 (configure.ac): Invoke AC_LIBOBJ.

diff --git a/ChangeLog b/ChangeLog
index 056717e29f0acdbdd7616a87772ce6cf60c9dd3f..74c11589e68212124ebcbd7b95a3add0a0c635e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-07-25  Bruno Haible  <bruno@clisp.org>
 
 2011-07-25  Bruno Haible  <bruno@clisp.org>
 

+       dup2: Move AC_LIBOBJ invocation to module description.
+       * m4/dup2.m4 (gl_REPLACE_DUP2): Remove macro.
+       (gl_FUNC_DUP2): Instead of gl_REPLACE_DUP2, just set REPLACE_DUP2 to 1.
+       Don't invoke AC_LIBOBJ.
+       * modules/dup2 (configure.ac): Invoke AC_LIBOBJ.
+

        dup2: Remove call-in from fchdir.m4.
        * m4/dup2.m4 (gl_FUNC_DUP2): Conditionally invoke gl_TEST_FCHDIR.
        * m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke gl_REPLACE_DUP2.
        dup2: Remove call-in from fchdir.m4.
        * m4/dup2.m4 (gl_FUNC_DUP2): Conditionally invoke gl_TEST_FCHDIR.
        * m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke gl_REPLACE_DUP2.

diff --git a/m4/dup2.m4 b/m4/dup2.m4
index b4a22199e4ba10765de70f7839ea2b2dc46c242d..5c2cc9674c1f467672b3c25d9dafb0ee6ceb6514 100644 (file)
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -12,7 +12,6 @@ AC_DEFUN([gl_FUNC_DUP2],
     AC_CHECK_FUNCS_ONCE([dup2])
     if test $ac_cv_func_dup2 = no; then
       HAVE_DUP2=0
     AC_CHECK_FUNCS_ONCE([dup2])
     if test $ac_cv_func_dup2 = no; then
       HAVE_DUP2=0

-      AC_LIBOBJ([dup2])

     fi
   ], [
     AC_DEFINE([HAVE_DUP2], [1], [Define to 1 if you have the 'dup2' function.])
     fi
   ], [
     AC_DEFINE([HAVE_DUP2], [1], [Define to 1 if you have the 'dup2' function.])


@@ -60,7 +59,7 @@ AC_DEFUN([gl_FUNC_DUP2],
          esac])
       ])
     if test "$gl_cv_func_dup2_works" = no; then
          esac])
       ])
     if test "$gl_cv_func_dup2_works" = no; then

-      gl_REPLACE_DUP2
+      REPLACE_DUP2=1

     fi
   fi
   dnl Replace dup2() for supporting the gnulib-defined fchdir() function,
     fi
   fi
   dnl Replace dup2() for supporting the gnulib-defined fchdir() function,


@@ -68,17 +67,7 @@ AC_DEFUN([gl_FUNC_DUP2],
   m4_ifdef([gl_FUNC_FCHDIR], [
     gl_TEST_FCHDIR
     if test $HAVE_FCHDIR = 0; then
   m4_ifdef([gl_FUNC_FCHDIR], [
     gl_TEST_FCHDIR
     if test $HAVE_FCHDIR = 0; then

-      gl_REPLACE_DUP2
+      REPLACE_DUP2=1

     fi
   ])
 ])
     fi
   ])
 ])

-
-AC_DEFUN([gl_REPLACE_DUP2],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_CHECK_FUNCS_ONCE([dup2])
-  if test $ac_cv_func_dup2 = yes; then
-    REPLACE_DUP2=1
-  fi
-  AC_LIBOBJ([dup2])
-])

diff --git a/modules/dup2 b/modules/dup2
index 17cafd1c6a96cd679ebb4639a69b4779d8834ab9..f9a1ee3f3789507ec3125fa599e1483afb25ce91 100644 (file)
--- a/modules/dup2
+++ b/modules/dup2
@@ -11,6 +11,9 @@ dup2-obsolete
 
 configure.ac:
 gl_FUNC_DUP2
 
 configure.ac:
 gl_FUNC_DUP2

+if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
+  AC_LIBOBJ([dup2])
+fi

 gl_UNISTD_MODULE_INDICATOR([dup2])
 
 Makefile.am:
 gl_UNISTD_MODULE_INDICATOR([dup2])
 
 Makefile.am: