Commit c8d850db authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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.
parent 01ea3577

configure.ac

+12 −8
Original line number Diff line number Diff line
@@ -1254,6 +1254,7 @@ AC_HELP_STRING([--disable-ares],[Disable ares for name lookups]), 
       dnl ares so it should not be a problem.

       if test "x$enableval" = "xyes" ; then

         if test -d "$srcdir/ares"; then

            aresembedded="yes"

            AC_CONFIG_SUBDIRS(ares)

            aresinc=`cd $srcdir/ares && pwd`

            CPPFLAGS="$CPPFLAGS -I$aresinc"
@@ -1269,7 +1270,10 @@ AC_HELP_STRING([--disable-ares],[Disable ares for name lookups]), 
         LDFLAGS="$LDFLAGS -L$enableval/lib"

       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_LINK_IFELSE( [

#include <ares.h>
@@ -1289,7 +1293,7 @@ int main(void) 
          AC_MSG_RESULT(no)

          AC_MSG_ERROR([c-ares library defective or too old])

          )



       fi

       ;;

  esac ],

       AC_MSG_RESULT(no)