aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-12-11 10:19:57 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-12-11 10:19:57 +0000
commita3c09e636df4bd72f2b251e07197deb4870ffb0f (patch)
treede08f75def41f4ab563ec46b0ba3c98cafbfa6db
parenta025425d06022ba944557bbdcc97721bb892bad5 (diff)
if there is an 'ares' subdirectory when configure is run with --enable-ares
(without a given path), we run configure automatically in that subdir
-rw-r--r--configure.ac10
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 241062c23..aadf63f04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1054,9 +1054,13 @@ AC_HELP_STRING([--disable-ares],[Disable ares for name lookups]),
dnl and the includes are in $val/include. This is the default setup for
dnl ares so it should not be a problem.
if test "x$enableval" = "xyes" ; then
- aresdir=`cd $srcdir/ares && pwd`
- CPPFLAGS="$CPPFLAGS -I$aresdir"
- LDFLAGS="$LDFLAGS -L$aresdir"
+ if test -d "$srcdir/ares"; then
+ AC_CONFIG_SUBDIRS(ares)
+ aresinc=`cd $srcdir/ares && pwd`
+ CPPFLAGS="$CPPFLAGS -I$aresinc"
+ areslib=`cd ares && pwd`
+ LDFLAGS="$LDFLAGS -L$areslib"
+ fi
else
CPPFLAGS="$CPPFLAGS -I$enableval/include"
LDFLAGS="$LDFLAGS -L$enableval/lib"