--- libtool-1.9f/config/ltmain.m4sh.orig	2004-10-22 19:19:33.000000000 +0200
+++ libtool-1.9f/config/ltmain.m4sh	2004-11-01 13:29:47.261017600 +0100
@@ -5649,10 +5649,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <malloc.h>
 #include <stdarg.h>
 #include <assert.h>
+#include <string.h>
 #include <sys/stat.h>
 
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
 #elif defined(MAXPATHLEN)
@@ -5693,10 +5694,12 @@
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
+/* -DDEBUG is fairly common in CFLAGS */
+#undef DEBUG
 #if defined DEBUGWRAPPER
 # define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
 #else
 # define DEBUG(format, ...)
 #endif
@@ -5750,10 +5753,11 @@
 	    cat >> $cwrappersource <<EOF
   execv("$SHELL",newargz);
 EOF
 
 	    cat >> $cwrappersource <<"EOF"
+  return 0;
 }
 
 void *
 xmalloc (size_t num)
 {
@@ -5819,11 +5823,10 @@
 find_executable (const char* wrapper)
 {
   int has_slash = 0;
   const char* p;
   const char* p_next;
-  struct stat st;
   /* static buffer for getcwd */
   char tmp[[LT_PATHMAX + 1]];
   int tmp_len;
   char* concat_name;