diff options
| author | Gunter Knauf <gk@gknw.de> | 2009-07-14 13:38:50 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2009-07-14 13:38:50 +0000 |
| commit | 35c91f6ea939f9445e0b7905e48a32d86a066dd9 (patch) | |
| tree | c31b8aef8f0c754fa782cc0a126c8613105c4ffc /ares/m4 | |
| parent | f5f93540933db0508f7d1831d0b20c2bf6aa2594 (diff) | |
renamed generated config.h to ares_config.h in order to avoid clashes when libcurl is used with other projects which also have a config.h.
Diffstat (limited to 'ares/m4')
| -rw-r--r-- | ares/m4/cares-compilers.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4 index b15b1103f..589a21c81 100644 --- a/ares/m4/cares-compilers.m4 +++ b/ares/m4/cares-compilers.m4 @@ -1113,15 +1113,15 @@ AC_DEFUN([CARES_CHECK_CURLDEBUG], [ test ! -f "$cares_builddir/../include/curl/curlbuild.h"; then AC_MSG_WARN([curl's configure has not been run.]) supports_curldebug="no" - elif test ! -f "$cares_builddir/../lib/config.h"; then - AC_MSG_WARN([libcurl's config.h is missing.]) + elif test ! -f "$cares_builddir/../lib/curl_config.h"; then + AC_MSG_WARN([libcurl's curl_config.h is missing.]) supports_curldebug="no" elif test ! -f "$cares_builddir/../config.status"; then AC_MSG_WARN([curl's config.status is missing.]) supports_curldebug="no" fi if test "$supports_curldebug" != "no"; then - grep '^#define USE_ARES' "$cares_builddir/../lib/config.h" >/dev/null + grep '^#define USE_ARES' "$cares_builddir/../lib/curl_config.h" >/dev/null if test "$?" -ne "0"; then AC_MSG_WARN([libcurl configured without c-ares support.]) supports_curldebug="no" |