From 65afc576ea1888d4e51e436c2910b8823b2421a9 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 18 Jan 2006 10:00:36 +0000
Subject: [PATCH] configure no longer warns on "missing" if the current path
 contains a space

---
 CHANGES       | 12 ++++++++++++
 RELEASE-NOTES |  1 +
 acinclude.m4  | 16 ++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/CHANGES b/CHANGES
index 989bb69..19a9d07 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,18 @@
 
                                   Changelog
 
+Daniel (18 January 2006)
+- As reported in bug #1408742 (http://curl.haxx.se/bug/view.cgi?id=1408742),
+  the configure script complained about a missing "missing" script if you ran
+  configure within a path whose name included one or more spaces. This is due
+  to a flaw in automake (1.9.6 and earlier). I've now worked around it by
+  including an "overloaded" version of the AM_MISSING_HAS_RUN script that'll
+  be used instead of the one automake ships with. This kludge needs to be
+  removed once we get an automake version with this problem corrected.
+  Possibly we'll then need to convert this into a kludge depending on what
+  automake version that is used and that is gonna be painful and I don't even
+  want to think about that now...!
+
 Daniel (16 January 2006)
 - David Shaw finally removed all traces of Gopher and we are now officially
   not supporting it. It hasn't been functioning for years anyway, so this is
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c583961..6b7c45a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o configure no longer warns if the current path contains a space
  o test suite kill race condition
  o FTP_SKIP_PASV_IP and FTP_USE_EPSV when doing FTP over HTTP proxy
  o Doing a second request with FTP on the same bath path, would make libcurl
diff --git a/acinclude.m4 b/acinclude.m4
index 8aeb497..546c373 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1302,3 +1302,19 @@ else
   AC_MSG_RESULT($DLFOUNDFILE)
 fi
 ])
+
+# This is only a temporary fix. This macro is here to replace the broken one
+# delivered by the automake project (including the 1.9.6 release). As soon as
+# they ship a working version we SHOULD remove this work-around.
+
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} \"$am_aux_dir/missing\""
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
-- 
2.7.4