canonicalize-lgpl: Move AC_LIBOBJ invocations to module description.
authorBruno Haible <bruno@clisp.org>
Thu, 5 May 2011 23:29:37 +0000 (01:29 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 15 Jun 2011 22:05:54 +0000 (00:05 +0200)
* m4/canonicalize.m4 (gl_CANONICALIZE_LGPL): Move AC_LIBOBJ invocation
from here...
* modules/canonicalize-lgpl (configure.ac): ... to here.

ChangeLog
m4/canonicalize.m4
modules/canonicalize-lgpl

index ff755c166e9d0eb03192efbc3ece71657079faf8..94648e1c07544870a2bd6535dab1447e9d3e1118 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
index c08a786e164cdc6b0aff64758e948874e0bf08d5..ef0a8c2bc74a5781643b91cb6c7092b40297ec01 100644 (file)
@@ -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
 ])
 
index ab31beadb826bb0f99cd3af57818f22bee3abce3..7b77ac42ba6a3bb4103c97febb43407fa824c95b 100644 (file)
@@ -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])