Avoid relocwrapper link errors due to gnulib replacement functions.

(cherry picked from commit 63d392e0dac335b021e73a1d44b9193e27d2f40e)

diff --git a/ChangeLog b/ChangeLog
index 7bd1a34..70ef197 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-28  Bruno Haible  <bruno@clisp.org>
 
+       Avoid relocwrapper link errors due to gnulib replacement functions.
+       * lib/canonicalize-lgpl.c [IN_RELOCWRAPPER]: Use the system's getcwd
+       function.
+       Reported by Ben Pfaff <blp@cs.stanford.edu>.
+
+2010-08-28  Bruno Haible  <bruno@clisp.org>
+
        sys_socket, netdb: Ensure socklen_t gets defined.
        * modules/sys_socket (Depends-on): Add socklen.
        * modules/netdb (Depends-on): Likewise.

diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index c2164e0..3cf2d76 100644 (file)
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -51,6 +51,12 @@
 # include "pathmax.h"
 # include "malloca.h"
 # if HAVE_GETCWD
+#  if IN_RELOCWRAPPER
+    /* When building the relocatable program wrapper, use the system's getcwd
+       function, not the gnulib override, otherwise we would get a link error.
+     */
+#   undef getcwd
+#  endif
 #  ifdef VMS
     /* We want the directory in Unix syntax, not in VMS syntax.  */
 #   define __getcwd(buf, max) getcwd (buf, max, 0)