From 5c53c99d90c1fbcac37fb3b2dfe85d374a212b5a Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Fri, 6 May 2011 01:29:37 +0200
Subject: [PATCH 6/8] 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.
---
 ChangeLog                 |    5 +++++
 m4/canonicalize.m4        |    6 ++----
 modules/canonicalize-lgpl |    3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f61104..9b2f047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-05  Bruno Haible  <address@hidden>
 
+	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.
+
 	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 dcc6039..b1d9e95 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-# canonicalize.m4 serial 17
+# canonicalize.m4 serial 18
 
 dnl Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc.
 
@@ -29,16 +29,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 1fb23c2..6e6833c 100644
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -20,6 +20,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])
-- 
1.6.3.2