aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ares/.cvsignore4
-rw-r--r--ares/CHANGES4
-rw-r--r--ares/Makefile.am2
-rw-r--r--ares/Makefile.dj6
-rw-r--r--ares/Makefile.netware6
-rw-r--r--ares/configure.ac2
-rw-r--r--ares/m4/cares-compilers.m46
-rw-r--r--ares/setup.h4
8 files changed, 19 insertions, 15 deletions
diff --git a/ares/.cvsignore b/ares/.cvsignore
index d37034eff..ecfc62ec1 100644
--- a/ares/.cvsignore
+++ b/ares/.cvsignore
@@ -12,8 +12,8 @@ ares_build.h
ares_version.h.dist
autom4te.cache
config.guess
-config.h
-config.h.in
+ares_config.h
+ares_config.h.in
config.log
config.lt
config.status
diff --git a/ares/CHANGES b/ares/CHANGES
index f98105f32..e7b3b8d70 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,9 @@
Changelog for the c-ares project
+* 14 Jul 2009 (Guenter Knauf)
+- renamed generated config.h to ares_config.h to avoid any future clashes
+ with config.h from other projects.
+
* June 8 2009 (Yang Tse)
- Removed buildconf.bat from release and daily snapshot archives. This
file is only for CVS tree checkout builds.
diff --git a/ares/Makefile.am b/ares/Makefile.am
index 4c5f54623..302ac9d8e 100644
--- a/ares/Makefile.am
+++ b/ares/Makefile.am
@@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I m4
#
# $(top_builddir)/../include is for libcurl's generated curl/curlbuild.h file
# $(top_srcdir)/../include is for libcurl's external include files
-# $(top_builddir) is for c-ares's generated config.h file
+# $(top_builddir) is for c-ares's generated ares_config.h file
# $(top_srcdir) is for c-ares's lib/setup.h and other "c-ares-private" files
if CURLDEBUG
diff --git a/ares/Makefile.dj b/ares/Makefile.dj
index 9c965eafa..aa16e5c9f 100644
--- a/ares/Makefile.dj
+++ b/ares/Makefile.dj
@@ -37,13 +37,13 @@ EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a
OBJECTS = $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
-all: $(OBJ_DIR) config.h libcares.a ahost.exe adig.exe acountry.exe
+all: $(OBJ_DIR) ares_config.h libcares.a ahost.exe adig.exe acountry.exe
@echo Welcome to c-ares.
libcares.a: $(OBJECTS)
ar rs $@ $?
-config.h: config.dos
+ares_config.h: config.dos
$(COPY) $^ $@
ahost.exe: ahost.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
@@ -58,7 +58,7 @@ acountry.exe: acountry.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
# clean generated files
#
genclean:
- - $(DELETE) config.h
+ - $(DELETE) ares_config.h
# clean object files and subdir
#
diff --git a/ares/Makefile.netware b/ares/Makefile.netware
index a58528d99..4b7ebea39 100644
--- a/ares/Makefile.netware
+++ b/ares/Makefile.netware
@@ -160,7 +160,7 @@ lib: prebuild $(LTARGET)
nlm: prebuild $(TARGETS)
-prebuild: $(OBJDIR) ares_build.h $(OBJDIR)/version.inc config.h
+prebuild: $(OBJDIR) ares_build.h $(OBJDIR)/version.inc ares_config.h
install: $(INSTDIR) all
@$(CP) *.nlm $(INSTDIR)
@@ -170,7 +170,7 @@ install: $(INSTDIR) all
@$(CP) ../RELEASE-NOTES $(INSTDIR)
clean:
- -$(RM) $(LTARGET) $(TARGETS) config.h
+ -$(RM) $(LTARGET) $(TARGETS) ares_config.h
-$(RM) -r $(OBJDIR)
-$(RM) -r arpa
@@ -269,7 +269,7 @@ ifeq ($(LD),nlmconv)
@echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
endif
-config.h: Makefile.netware
+ares_config.h: Makefile.netware
@echo Creating $@
@echo $(DL)/* $@ for NetWare target.$(DL) > $@
@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
diff --git a/ares/configure.ac b/ares/configure.ac
index 6f32b9529..673f41796 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([c-ares], [-],
CARES_OVERRIDE_AUTOCONF
AC_CONFIG_SRCDIR([ares_ipv6.h])
-AM_CONFIG_HEADER([config.h ares_build.h])
+AM_CONFIG_HEADER([ares_config.h ares_build.h])
AM_MAINTAINER_MODE
CARES_CHECK_OPTION_DEBUG
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"
diff --git a/ares/setup.h b/ares/setup.h
index 794ef9a35..875062423 100644
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "ares_config.h"
#else
#ifdef WIN32
@@ -154,7 +154,7 @@
#endif /* HAVE_CONFIG_H */
/*
- * Recent autoconf versions define these symbols in config.h. We don't
+ * Recent autoconf versions define these symbols in ares_config.h. We don't
* want them (since they collide with the libcurl ones when we build
* --enable-debug) so we undef them again here.
*/