moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Only check that the c-ares lib is valid if we don't use the "embedded"

Browse Source 
directory. The provided ares dir is probably up-to-date, but more importantly
it is often not built yet at the time when this configure script runs.
This commit is contained in:
Daniel Stenberg 2004-04-01 10:26:59 +00:00
parent 01ea357744
commit c8d850dbad
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -1254,6 +1254,7 @@ AC_HELP_STRING([--disable-ares],[Disable ares for name lookups]),
dnl ares so it should not be a problem. dnl ares so it should not be a problem.
if test "x$enableval" = "xyes" ; then if test "x$enableval" = "xyes" ; then
if test -d "$srcdir/ares"; then if test -d "$srcdir/ares"; then
aresembedded="yes"
AC_CONFIG_SUBDIRS(ares) AC_CONFIG_SUBDIRS(ares)
aresinc=`cd $srcdir/ares && pwd` aresinc=`cd $srcdir/ares && pwd`
CPPFLAGS="$CPPFLAGS -I$aresinc" CPPFLAGS="$CPPFLAGS -I$aresinc"
@ -1269,9 +1270,12 @@ AC_HELP_STRING([--disable-ares],[Disable ares for name lookups]),
LDFLAGS="$LDFLAGS -L$enableval/lib" LDFLAGS="$LDFLAGS -L$enableval/lib"
fi fi
dnl verify that a sufficient c-ares is here if test -z "$aresembedded"; then
AC_MSG_CHECKING([that c-ares is good and recent enough]) dnl verify that a sufficient c-ares is here if we have pointed one
AC_LINK_IFELSE( [ dnl out and don't use the "embedded" ares dir (in which case we don't
dnl check it because it might not have been built yet)
AC_MSG_CHECKING([that c-ares is good and recent enough])
AC_LINK_IFELSE( [
#include <ares.h> #include <ares.h>
/* provide a set of dummy functions in case c-ares was built with debug */ /* provide a set of dummy functions in case c-ares was built with debug */
void curl_dofree() { } void curl_dofree() { }
@ -1285,11 +1289,11 @@ int main(void)
return 0; return 0;
} }
], ],
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes),
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR([c-ares library defective or too old]) AC_MSG_ERROR([c-ares library defective or too old])
) )
fi
;; ;;
esac ], esac ],
AC_MSG_RESULT(no) AC_MSG_RESULT(no)