Fix link error in relocatability wrappers, due to xalloc_die().

diff --git a/ChangeLog b/ChangeLog
index 2164967baec4a5d9cf6a7af21d5a1902b2c4e550..d66c4e63dbebd2bf047076ba5b38f0515c866191 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-24  Bruno Haible  <bruno@clisp.org>
+
+       Fix link error due to xalloc_die().
+       * lib/progreloc.c: When NO_XMALLOC is defined, use areadlink instead
+       of xreadlink.
+       * lib/relocwrapper.c: Update comments.
+       * build-aux/install-reloc: Remove xreadlink.c from file list.
+       * modules/relocatable-prog-wrapper (Files): Remove xreadlink.h and
+       xreadlink.c.
+       Reported by Левашев Иван <octagram@bluebottle.com>.
+
 2007-12-24  Bruno Haible  <bruno@clisp.org>
 
        Split setenv module into setenv and unsetenv. Get rid of setenv.h.

diff --git a/build-aux/install-reloc b/build-aux/install-reloc
index 199443868af7bc95f5fe261315cbfc24222f953f..91d79ac877ebe17acf8ea3206a4c9bff322ef70a 100755 (executable)
--- a/build-aux/install-reloc
+++ b/build-aux/install-reloc
@@ -131,7 +131,6 @@ func_verbose $compile_command \
              "$srcdir"/relocwrapper.c \
              "$srcdir"/progname.c \
              "$srcdir"/progreloc.c \
-             "$srcdir"/xreadlink.c \
              "$srcdir"/areadlink.c \
              "$srcdir"/readlink.c \
              "$srcdir"/canonicalize-lgpl.c \

diff --git a/lib/progreloc.c b/lib/progreloc.c
index 7c677b02ce400088c2bd6d96f51794b4e10047e1..ac9433bf6b2804021ccfd0a4596a1ca12613d2ce 100644 (file)
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -1,5 +1,5 @@
 /* Provide relocatable programs.
-   Copyright (C) 2003-2006 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -43,10 +43,16 @@
 # include <windows.h>
 #endif
 
-#include "xreadlink.h"
 #include "canonicalize.h"
 #include "relocatable.h"
 
+#ifdef NO_XMALLOC
+# include "areadlink.h"
+# define xreadlink areadlink
+#else
+# include "xreadlink.h"
+#endif
+
 #ifdef NO_XMALLOC
 # define xmalloc malloc
 # define xstrdup strdup

diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c
index 76e35591675ed422497378b5201f33b9fb02be28..42c64cfb9a1b08020acf7b7deef0862191c6955f 100644 (file)
--- a/lib/relocwrapper.c
+++ b/lib/relocwrapper.c
@@ -19,11 +19,11 @@
    relocwrapper
     -> progname
     -> progreloc
-        -> xreadlink
-           -> areadlink
-              -> readlink
+        -> areadlink
+           -> readlink
         -> canonicalize-lgpl
            -> malloca
+           -> readlink
     -> relocatable
     -> setenv
        -> malloca

diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index 4a2faf5b467ea3f49ea5c0a35bae4c30a8537243..e944e434d35a4615928593bed6c2607a88b0990c 100644 (file)
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -8,8 +8,6 @@ lib/relocwrapper.c
 lib/progname.h
 lib/progname.c
 lib/progreloc.c
-lib/xreadlink.h
-lib/xreadlink.c
 lib/areadlink.h
 lib/areadlink.c
 lib/readlink.c