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 | e391db0ef9f6b04c384a5ab045e5823bba825f7f (patch) | |
| tree | 32f8c7c6fea4ddf1c6d252feb7b5e7b0b2f7bc7b /m4 | |
| parent | f474f738a5a5096eaa8ca84577aa6c1e807e8e72 (diff) | |
| download | c-ares-e391db0ef9f6b04c384a5ab045e5823bba825f7f.tar.gz c-ares-e391db0ef9f6b04c384a5ab045e5823bba825f7f.tar.bz2 c-ares-e391db0ef9f6b04c384a5ab045e5823bba825f7f.zip | |
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 'm4')
| -rw-r--r-- | m4/cares-compilers.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/cares-compilers.m4 b/m4/cares-compilers.m4 index b15b110..589a21c 100644 --- a/m4/cares-compilers.m4 +++ b/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" |