Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15086:db3551a524d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scandir: Move AC_LIBOBJ invocations to module description. * m4/scandir.m4 (gl_FUNC_SCANDIR): Move AC_LIBOBJ and gl_PREREQ_SCANDIR invocations from here... * modules/scandir (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 22:18:30 +0200
parents 0a705be282ae
children b4000fa9527e
files ChangeLog m4/scandir.m4 modules/scandir
diffstat 3 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	scandir: Move AC_LIBOBJ invocations to module description.
+	* m4/scandir.m4 (gl_FUNC_SCANDIR): Move AC_LIBOBJ and gl_PREREQ_SCANDIR
+	invocations from here...
+	* modules/scandir (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	rpmatch: Move AC_LIBOBJ invocations to module description.
 	* m4/rpmatch.m4 (gl_FUNC_RPMATCH): Call AC_CHECK_FUNCS instead of
 	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_RPMATCH invocations from
--- a/m4/scandir.m4
+++ b/m4/scandir.m4
@@ -1,4 +1,4 @@
-# scandir.m4 serial 1
+# scandir.m4 serial 2
 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,
@@ -14,8 +14,6 @@
   AC_CHECK_FUNCS([scandir])
   if test $ac_cv_func_scandir = no; then
     HAVE_SCANDIR=0
-    AC_LIBOBJ([scandir])
-    gl_PREREQ_SCANDIR
   fi
 ])
 
--- a/modules/scandir
+++ b/modules/scandir
@@ -11,6 +11,10 @@
 
 configure.ac:
 gl_FUNC_SCANDIR
+if test $HAVE_SCANDIR = 0; then
+  AC_LIBOBJ([scandir])
+  gl_PREREQ_SCANDIR
+fi
 gl_DIRENT_MODULE_INDICATOR([scandir])
 
 Makefile.am: