canonicalize-lgpl: Move AC_LIBOBJ invocations to module description.

* m4/canonicalize.m4 (gl_CANONICALIZE_LGPL): Move AC_LIBOBJ invocation
from here...
* modules/canonicalize-lgpl (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index ff755c1..94648e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-05  Bruno Haible  <bruno@clisp.org>
 
+       canonicalize-lgpl: Move AC_LIBOBJ invocations to module description.
+       * m4/canonicalize.m4 (gl_CANONICALIZE_LGPL): Move AC_LIBOBJ invocation
+       from here...
+       * modules/canonicalize-lgpl (configure.ac): ... to here.
+
+2011-05-05  Bruno Haible  <bruno@clisp.org>
+
        calloc-posix, calloc-gnu: Move AC_LIBOBJs to module description.
        * m4/calloc.m4 (gl_REPLACE_CALLOC): Remove macro.
        (gl_FUNC_CALLOC_GNU, gl_FUNC_CALLOC_POSIX): Instead, just set

diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index c08a786..ef0a8c2 100644 (file)
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-# canonicalize.m4 serial 21
+# canonicalize.m4 serial 22
 
 dnl Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc.
 
@@ -30,16 +30,14 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
   AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE])
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
-    AC_LIBOBJ([canonicalize-lgpl])
     if test $ac_cv_func_realpath = no; then
       HAVE_REALPATH=0
     elif test "$gl_cv_func_realpath_works" != yes; then
       REPLACE_REALPATH=1
     fi
   elif test "$gl_cv_func_realpath_works" != yes; then
-    AC_LIBOBJ([canonicalize-lgpl])
-    REPLACE_REALPATH=1
     REPLACE_CANONICALIZE_FILE_NAME=1
+    REPLACE_REALPATH=1
   fi
 ])
 

diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl
index ab31bea..7b77ac4 100644 (file)
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -21,6 +21,9 @@ sys_stat        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICA
 
 configure.ac:
 gl_CANONICALIZE_LGPL
+if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
+  AC_LIBOBJ([canonicalize-lgpl])
+fi
 gl_MODULE_INDICATOR([canonicalize-lgpl])
 gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
 gl_STDLIB_MODULE_INDICATOR([realpath])