Improve CURL_CHECK_DEF

This commit is contained in:
Yang Tse 2008-08-09 17:26:24 +00:00
parent 63818f8488
commit 4594187732
2 changed files with 9 additions and 7 deletions

View File

@ -117,7 +117,7 @@ CURL_DEF_TOKEN $1
echo "DEBUG: $tmp_exp" >&6 echo "DEBUG: $tmp_exp" >&6
if test "$tmp_exp" = "$1"; then if test -z "$tmp_exp" || test "$tmp_exp" = "$1"; then
tmp_exp="" tmp_exp=""
echo "DEBUG: $tmp_exp" >&6 echo "DEBUG: $tmp_exp" >&6
fi fi

View File

@ -52,7 +52,9 @@ dnl -------------------------------------------------
dnl Use the C preprocessor to find out if the given object-style symbol 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 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 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], [ AC_DEFUN([CURL_CHECK_DEF], [
AS_VAR_PUSHDEF([ac_HaveDef], [curl_cv_have_def_$1])dnl AS_VAR_PUSHDEF([ac_HaveDef], [curl_cv_have_def_$1])dnl
@ -76,17 +78,17 @@ CURL_DEF_TOKEN $1
tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \
"$GREP" CURL_DEF_TOKEN 2>/dev/null | \ "$GREP" CURL_DEF_TOKEN 2>/dev/null | \
"$SED" 's/.*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 if test -z "$tmp_exp" || test "$tmp_exp" = "$1"; then
tmp_exp="" tmp_exp=""
fi fi
]) ])
if test -z "$tmp_exp"; then if test -z "$tmp_exp"; then
AS_VAR_SET([ac_HaveDef], [no]) AS_VAR_SET(ac_HaveDef, no)
ifelse($3,,[AC_MSG_RESULT([no])]) ifelse($3,,[AC_MSG_RESULT([no])])
else else
AS_VAR_SET([ac_HaveDef], [yes]) AS_VAR_SET(ac_HaveDef, yes)
AS_VAR_SET([ac_Def], [$tmp_exp]) AS_VAR_SET(ac_Def, $tmp_exp)
ifelse($3,,[AC_MSG_RESULT([$tmp_exp])]) ifelse($3,,[AC_MSG_RESULT([$tmp_exp])])
fi fi
AS_VAR_POPDEF([ac_Def])dnl AS_VAR_POPDEF([ac_Def])dnl