Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15091:e5a3db1759c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setlocale: Move AC_LIBOBJ invocations to module description. * m4/setlocale.m4 (gl_FUNC_SETLOCALE): Move AC_LIBOBJ and gl_PREREQ_SETLOCALE invocations from here... * modules/setlocale (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 00:08:39 +0200
parents e29fbc771e57
children b62edef35094
files ChangeLog m4/setlocale.m4 modules/setlocale
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	setlocale: Move AC_LIBOBJ invocations to module description.
+	* m4/setlocale.m4 (gl_FUNC_SETLOCALE): Move AC_LIBOBJ and
+	gl_PREREQ_SETLOCALE invocations from here...
+	* modules/setlocale (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	unsetenv: Move AC_LIBOBJ invocations to module description.
 	* m4/setenv.m4 (gl_FUNC_UNSETENV): Set HAVE_UNSETENV. Move AC_LIBOBJ
 	and gl_PREREQ_UNSETENV invocations from here...
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,4 +1,4 @@
-# setlocale.m4 serial 3
+# setlocale.m4 serial 4
 dnl Copyright (C) 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,
@@ -20,10 +20,6 @@
       esac
       ;;
   esac
-  if test $REPLACE_SETLOCALE = 1; then
-    AC_LIBOBJ([setlocale])
-    gl_PREREQ_SETLOCALE
-  fi
 ])
 
 # Prerequisites of lib/setlocale.c.
--- a/modules/setlocale
+++ b/modules/setlocale
@@ -11,6 +11,10 @@
 
 configure.ac:
 gl_FUNC_SETLOCALE
+if test $REPLACE_SETLOCALE = 1; then
+  AC_LIBOBJ([setlocale])
+  gl_PREREQ_SETLOCALE
+fi
 gl_LOCALE_MODULE_INDICATOR([setlocale])
 
 Makefile.am: