Mercurial > hg > octave-nkf > gnulib-hg

changeset 15056:56a24b726e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 16:24:11 +0200
parents a8e98ddfd3a1
children 1754adc5fd88
files ChangeLog m4/nl_langinfo.m4 modules/nl_langinfo
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
--- 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 @@
       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
 ])
--- a/modules/nl_langinfo
+++ b/modules/nl_langinfo
@@ -10,6 +10,9 @@
 
 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: