Fix CURL_CHECK_DEF so that when the expansion of the preprocessor symbol results

in a set of double-quoted strings, this macro will now return an expansion which
consists of a single double-quoted string result of concatenating all of them.

diff --git a/CHANGES b/CHANGES
index e56030e38eb3ba7e1b7920e20af0e80e5f23a0cf..1c148aad9a56d6b75bdd9b9721ad4b62a27d62eb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,11 @@ Yang Tse (7 Aug 2008)
   used to provide support for a curl_off_t data type which is not gated to
   off_t. Further details are documented inside these mentioned header files.
 
+- Fix CURL_CHECK_DEF so that when the expansion of the preprocessor symbol
+  results in a set of double-quoted strings, this macro will now return an
+  expansion which consists of a single double-quoted string as the result of
+  concatenating all of them.
+
 Yang Tse (5 Aug 2008)
 - Changes done to buildconf script. Validate that autom4te and autoconf, as
   well as aclocal and automake, versions match. Improve removal of previous

diff --git a/acinclude.m4 b/acinclude.m4
index 34d0ba1db99f8f58dd486c745315fe27bbac14d8..61669a5a493047c86a578e9fe9f9e981e232180d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -74,7 +74,9 @@ dnl -------------------------------------------------
 dnl Use the C preprocessor to find out if the given object-style symbol
 dnl is defined and get its expansion. This macro will not use default
 dnl includes even if no INCLUDES argument is given. This macro will run
-dnl silently when invoked with three arguments.
+dnl silently when invoked with three arguments. If the expansion would
+dnl result in a set of double-quoted strings the returned expansion will
+dnl actually be a single double-quoted string concatenating all them.
 
 AC_DEFUN([CURL_CHECK_DEF], [
   AS_VAR_PUSHDEF([ac_HaveDef], [curl_cv_have_def_$1])dnl
@@ -98,7 +100,7 @@ CURL_DEF_TOKEN $1
     tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \
       "$GREP" CURL_DEF_TOKEN 2>/dev/null | \
       "$SED" 's/.*CURL_DEF_TOKEN[[ ]]//' 2>/dev/null | \
-      "$SED" 'q' 2>/dev/null`
+      "$SED" 's/[["]][[ ]]*[["]]//g' 2>/dev/null`
     if test "$tmp_exp" = "$1"; then
       tmp_exp=""
     fi