From f671d0513ccc9cdcd7516c732c719b2f31a9578e Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Tue, 14 Jul 2009 13:25:14 +0000 Subject: renamed generated config.h to curl_config.h in order to avoid clashes when libcurl is used with other projects which also have a config.h. --- lib/.cvsignore | 2 +- lib/CMakeLists.txt | 6 +++--- lib/Makefile.am | 6 +++--- lib/Makefile.netware | 6 +++--- lib/config-mac.h | 10 +++++----- lib/config-riscos.h | 2 +- lib/config.h.cmake | 2 +- lib/makefile.dj | 8 ++++---- lib/setup.h | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/.cvsignore b/lib/.cvsignore index 03863387e..ed20ab8fc 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -9,7 +9,7 @@ DLL-Release LIB-Debug LIB-Release Makefile -config.h +curl_config.h getdate.c libcurl.dsp libcurl.vcproj diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 699b4f1c1..b2ee0ab0a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -2,15 +2,15 @@ set(LIB_NAME libcurl) configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake ${CURL_BINARY_DIR}/include/curl/curlbuild.h) -configure_file(config.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/config.h) +configure_file(curl_config.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h) transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) list(APPEND HHEADERS - ${CMAKE_CURRENT_BINARY_DIR}/config.h + ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h ${CURL_BINARY_DIR}/include/curl/curlbuild.h ) diff --git a/lib/Makefile.am b/lib/Makefile.am index 34c2b72c3..8d30d4c53 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -29,11 +29,11 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \ README.hostip README.multi_socket README.httpauth README.pipelining \ README.NSS README.curl_off_t -CMAKE_DIST = CMakeLists.txt config.h.cmake +CMAKE_DIST = CMakeLists.txt curl_config.h.cmake EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \ vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \ - config-mac.h config.h.in makefile.dj config.dos libcurl.plist \ + config-mac.h curl_config.h.in makefile.dj config.dos libcurl.plist \ libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga \ Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot \ config-win32ce.h config-os400.h setup-os400.h config-symbian.h \ @@ -52,7 +52,7 @@ LIBCURL_LIBS = @LIBCURL_LIBS@ # # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_srcdir)/include is for libcurl's external include files -# $(top_builddir)/lib is for libcurl's generated lib/config.h file +# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "private" files # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file # $(top_srcdir)/ares is for in-tree c-ares's external include files diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 6ab10bae6..34368c1c1 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -241,7 +241,7 @@ nlm: prebuild $(TARGET).nlm lib: prebuild $(TARGET).$(LIBEXT) -prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc config.h +prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc curl_config.h $(OBJDIR)/%.o: %.c # @echo Compiling $< @@ -263,7 +263,7 @@ ifdef WITH_SSL endif clean: - -$(RM) config.h + -$(RM) curl_config.h -$(RM) -r $(OBJDIR) distclean: clean @@ -373,7 +373,7 @@ ifeq ($(findstring nlmconv,$(LD)),nlmconv) @echo $(DL)output $(TARGET).nlm$(DL) >> $@ endif -config.h: Makefile.netware +curl_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/lib/config-mac.h b/lib/config-mac.h index 0547aeaa8..fb2f99df3 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -1,11 +1,11 @@ #ifndef __LIB_CONFIG_MAC_H #define __LIB_CONFIG_MAC_H -/* ================================================================ */ -/* lib/config-mac.h - Hand crafted config file for Mac OS 9 */ -/* ================================================================ */ -/* On Mac OS X you must run configure to generate config.h file */ -/* ================================================================ */ +/* =================================================================== */ +/* lib/config-mac.h - Hand crafted config file for Mac OS 9 */ +/* =================================================================== */ +/* On Mac OS X you must run configure to generate curl_config.h file */ +/* =================================================================== */ #define OS "mac" diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 95e45d6fd..912bb8aa7 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* curl_config.h.in. Generated automatically from configure.in by autoheader. */ /* Name of this package! */ #undef PACKAGE diff --git a/lib/config.h.cmake b/lib/config.h.cmake index d7f00de1c..09f435c35 100644 --- a/lib/config.h.cmake +++ b/lib/config.h.cmake @@ -1,4 +1,4 @@ -/* lib/config.h.in. Generated from configure.ac by autoheader. */ +/* lib/curl_config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the $func function. */ #cmakedefine AS_TR_CPP ${AS_TR_CPP} diff --git a/lib/makefile.dj b/lib/makefile.dj index b8d324923..594fff0fb 100644 --- a/lib/makefile.dj +++ b/lib/makefile.dj @@ -4,7 +4,7 @@ # # $Id$ -DEPEND_PREREQ = config.h +DEPEND_PREREQ = curl_config.h TOPDIR = .. include ../packages/DOS/common.dj @@ -17,18 +17,18 @@ CURL_LIB = libcurl.a # NOTE: if ../include/curl/curlbuild.h is missing, you're probably building # this from a CVS checkout and then you need to run buildconf.bat first. -all: $(OBJ_DIR) config.h $(CURL_LIB) +all: $(OBJ_DIR) curl_config.h $(CURL_LIB) $(CURL_LIB): $(OBJECTS) ar rs $@ $? -config.h: config.dos +curl_config.h: config.dos $(COPY) $^ $@ # clean generated files # genclean: - - $(DELETE) config.h + - $(DELETE) curl_config.h # clean object files and subdir # diff --git a/lib/setup.h b/lib/setup.h index 25ca451f3..43a322af5 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -38,7 +38,7 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "curl_config.h" #else /* HAVE_CONFIG_H */ -- cgit v1.2.3