Commit b2325f6c authored by Karl Heyes's avatar Karl Heyes
Browse files

remove duplication for compiler flags, and fixup curl detection

svn path=/trunk/m4/; revision=5169
parent 0dbfe4a5
......@@ -22,11 +22,13 @@ elif test "x$CURL_CONFIG" != "x"; then
CURL_LIBS="$($CURL_CONFIG --libs)"
CURL_CFLAGS="$($CURL_CONFIG --cflags)"
else
if test "x$prefix" != "xNONE"; then
CURL_LIBS="-L$prefix/lib"
CURL_CFLAGS="-I$prefix/include"
if test "x$prefix" = "xNONE"; then
curl_prefix="/usr/local"
else
curl_prefix="$prefix"
fi
CURL_LIBS="$CURL_LIBS -lcurl"
CURL_LIBS="-L$curl_prefix/lib -lcurl"
CURL_CFLAGS="-I$curl_prefix/include"
fi
curl_ok="yes"
......@@ -58,6 +60,8 @@ if test "$curl_ok" = "yes"; then
ifelse([$1], , :, [$1])
else
AC_MSG_RESULT(no)
CURL_LIBS=""
CURL_CFLAGS=""
ifelse([$2], , :, [$2])
fi
])
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment