diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-08-07 16:07:26 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-08-07 16:07:26 +0000 |
| commit | ddfa33be79f28e0cc3e9f40ae1ae8e464cc3de5a (patch) | |
| tree | 53bd17c3f697a5f179efe3d9ce02d6fd9e3f2eba /acinclude.m4 | |
| parent | 25c76a760e2655a6926d8a2ef6b855bfbb33a70f (diff) | |
| download | curl-ddfa33be79f28e0cc3e9f40ae1ae8e464cc3de5a.tar.gz | |
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.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 34d0ba1db..61669a5a4 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 |