From: Bruno Haible <bruno@clisp.org>
Date: Sun, 8 May 2011 09:41:07 +0000 (+0200)
Subject: getdomainname: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2566
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3a664e68b715e2a20d0bd8ca64cdc10c56316ab3;p=gnulib.git

getdomainname: Move AC_LIBOBJ invocations to module description.

* m4/getdomainname.m4 (gl_FUNC_GETDOMAINNAME): Move AC_LIBOBJ and
gl_PREREQ_GETDOMAINNAME invocations from here...
* modules/getdomainname (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 53ecdedd4..8c14b0ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-08  Bruno Haible  <bruno@clisp.org>
 
+	getdomainname: Move AC_LIBOBJ invocations to module description.
+	* m4/getdomainname.m4 (gl_FUNC_GETDOMAINNAME): Move AC_LIBOBJ and
+	gl_PREREQ_GETDOMAINNAME invocations from here...
+	* modules/getdomainname (configure.ac): ... to here.
+
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
 	getline: Move AC_LIBOBJ invocations to module description.
 	* m4/getline.m4 (gl_FUNC_GETLINE): Move AC_LIBOBJ and gl_PREREQ_GETLINE
 	invocations from here...
diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4
index db7d480ed..9e93fc93c 100644
--- a/m4/getdomainname.m4
+++ b/m4/getdomainname.m4
@@ -1,4 +1,4 @@
-# getdomainname.m4 serial 6
+# getdomainname.m4 serial 7
 dnl Copyright (C) 2002-2003, 2008-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,
@@ -82,11 +82,6 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME],
      || test "$gl_cv_func_getdomainname_in_libnsl" = yes; then
     REPLACE_GETDOMAINNAME=1
   fi
-
-  if test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1; then
-    AC_LIBOBJ([getdomainname])
-    gl_PREREQ_GETDOMAINNAME
-  fi
 ])
 
 # Prerequisites of lib/getdomainname.c.
diff --git a/modules/getdomainname b/modules/getdomainname
index c7f77b0ec..457de318c 100644
--- a/modules/getdomainname
+++ b/modules/getdomainname
@@ -13,6 +13,10 @@ sys_socket      [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAM
 
 configure.ac:
 gl_FUNC_GETDOMAINNAME
+if test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1; then
+  AC_LIBOBJ([getdomainname])
+  gl_PREREQ_GETDOMAINNAME
+fi
 gl_UNISTD_MODULE_INDICATOR([getdomainname])
 
 Makefile.am: