From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 14:24:11 +0000 (+0200)
Subject: nl_langinfo: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2470
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=ef8178c73dcb4bd7987a16ae53bd4311873f8e1a;p=gnulib.git

nl_langinfo: Move AC_LIBOBJ invocations to module description.

* m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Move AC_LIBOBJ invocations
from here...
* modules/nl_langinfo (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index d120138ce..8bda197a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	nl_langinfo: Move AC_LIBOBJ invocations to module description.
+	* m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Move AC_LIBOBJ invocations
+	from here...
+	* modules/nl_langinfo (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	nanosleep: Move AC_LIBOBJ invocations to module description.
 	* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Move AC_LIBOBJ and
 	gl_PREREQ_NANOSLEEP invocations from here...
diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index ca9d28daf..dcf1b5f15 100644
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -1,4 +1,4 @@
-# nl_langinfo.m4 serial 4
+# nl_langinfo.m4 serial 5
 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,
@@ -43,10 +43,8 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
       REPLACE_NL_LANGINFO=1
       AC_DEFINE([REPLACE_NL_LANGINFO], [1],
         [Define if nl_langinfo exists but is overridden by gnulib.])
-      AC_LIBOBJ([nl_langinfo])
     fi
   else
     HAVE_NL_LANGINFO=0
-    AC_LIBOBJ([nl_langinfo])
   fi
 ])
diff --git a/modules/nl_langinfo b/modules/nl_langinfo
index 781334525..e749cbdd5 100644
--- a/modules/nl_langinfo
+++ b/modules/nl_langinfo
@@ -10,6 +10,9 @@ langinfo
 
 configure.ac:
 gl_FUNC_NL_LANGINFO
+if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
+  AC_LIBOBJ([nl_langinfo])
+fi
 gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
 
 Makefile.am: