From 63d392e0dac335b021e73a1d44b9193e27d2f40e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 28 Aug 2010 11:12:58 +0200 Subject: [PATCH] Avoid relocwrapper link errors due to gnulib replacement functions. --- ChangeLog | 7 +++++++ lib/canonicalize-lgpl.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index d3f104aae0..e17c3280bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-08-28 Bruno Haible + + 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 . + 2010-08-28 Bruno Haible Prefer using AC_DEFUN_ONCE over AC_DEFUN in projects with gnulib. diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index c2164e07fe..3cf2d766e0 100644 --- 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) -- 2.30.2