From ddfa33be79f28e0cc3e9f40ae1ae8e464cc3de5a Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 7 Aug 2008 16:07:26 +0000 Subject: [PATCH] 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. --- CHANGES | 5 +++++ acinclude.m4 | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index e56030e..1c148aa 100644 --- 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 34d0ba1..61669a5 100644 --- 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 -- 2.7.4