mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
Only check that the c-ares lib is valid if we don't use the "embedded"
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:
parent
01ea357744
commit
c8d850dbad
@ -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,7 +1270,10 @@ 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
|
||||||
|
dnl verify that a sufficient c-ares is here if we have pointed one
|
||||||
|
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_MSG_CHECKING([that c-ares is good and recent enough])
|
||||||
AC_LINK_IFELSE( [
|
AC_LINK_IFELSE( [
|
||||||
#include <ares.h>
|
#include <ares.h>
|
||||||
@ -1289,7 +1293,7 @@ int main(void)
|
|||||||
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)
|
||||||
|
Loading…
Reference in New Issue
Block a user