Permalink
Browse files

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.
  • Loading branch information...
1 parent 100f6b7 commit f671d0513ccc9cdcd7516c732c719b2f31a9578e @gknauf gknauf committed Jul 14, 2009
View
@@ -270,8 +270,8 @@ for fname in .deps \
autom4te.cache \
compile \
config.guess \
- config.h \
- config.h.in \
+ curl_config.h \
+ curl_config.h.in \
config.log \
config.lt \
config.status \
@@ -321,8 +321,8 @@ fi
echo "buildconf: running autoheader"
${AUTOHEADER:-autoheader} || die "The autoheader command failed"
-echo "buildconf: cp lib/config.h.in src/config.h.in"
-cp lib/config.h.in src/config.h.in
+echo "buildconf: cp lib/curl_config.h.in src/curl_config.h.in"
+cp lib/curl_config.h.in src/curl_config.h.in
echo "buildconf: running autoconf"
${AUTOCONF:-autoconf} || die "The autoconf command failed"
View
@@ -35,7 +35,7 @@ This configure script may be copied, distributed and modified under the
terms of the curl license; see COPYING for more details])
AC_CONFIG_SRCDIR([lib/urldata.h])
-AM_CONFIG_HEADER(lib/config.h src/config.h include/curl/curlbuild.h)
+AM_CONFIG_HEADER(lib/curl_config.h src/curl_config.h include/curl/curlbuild.h)
AM_MAINTAINER_MODE
CURL_CHECK_OPTION_DEBUG
View
@@ -18,7 +18,7 @@ autom4te.cache
*.patch
CVS
*.asc
-config.h
+curl_config.h
*.la
*.lai
libtool
View
@@ -103,9 +103,9 @@ Windows vs Unix
Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All
conditionals that deal with features *should* instead be in the format
'#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
- we maintain two config-win32.h files (one in lib/ and one in src/) that are
- supposed to look exactly as a config.h file would have looked like on a
- Windows machine!
+ we maintain two curl_config-win32.h files (one in lib/ and one in src/) that
+ are supposed to look exactly as a curl_config.h file would have looked like on
+ a Windows machine!
Generally speaking: always remember that this will be compiled on dozens of
operating systems. Don't walk on the edge.
View
@@ -9,7 +9,7 @@ DLL-Release
LIB-Debug
LIB-Release
Makefile
-config.h
+curl_config.h
getdate.c
libcurl.dsp
libcurl.vcproj
View
@@ -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
)
View
@@ -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
View
@@ -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) >> $@
View
@@ -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"
View
@@ -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
View
@@ -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}
View
@@ -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
#
View
@@ -38,7 +38,7 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "curl_config.h"
#else /* HAVE_CONFIG_H */
View
@@ -4830,7 +4830,7 @@ AC_DEFUN([CURL_CHECK_FUNC_STRERROR_R], [
#
if test "$tst_compi_strerror_r" = "yes" &&
test "$tst_allow_strerror_r" = "unknown"; then
- AC_MSG_WARN([cannot determine strerror_r() style: edit lib/config.h manually.])
+ AC_MSG_WARN([cannot determine strerror_r() style: edit lib/curl_config.h manually.])
fi
#
])
View
@@ -92,8 +92,8 @@ findprog()
return 0
}
-echo "maketgz: cp lib/config.h.in src/config.h.in"
-cp lib/config.h.in src/config.h.in
+echo "maketgz: cp lib/curl_config.h.in src/curl_config.h.in"
+cp lib/curl_config.h.in src/curl_config.h.in
############################################################################
#
View
@@ -66,7 +66,7 @@ Options:
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
+ autoheader touch file \`curl_config.h.in'
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -112,7 +112,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
+ test -z "$files" && files="curl_config.h"
touch_files=
for f in $files; do
case "$f" in
@@ -34,7 +34,7 @@ $! and updated it to do hardware dependant builds.
$! 29-JAN-2004, MSK, moved logical defines into defines.com
$! 6-FEB-2004, MSK, put in various SSL support bits
$! 9-MAR-2004, MSK, the config-vms.h* files are now copied to the lib and
-$! src directories as config.h.
+$! src directories as curl_config.h.
$! 15-MAR-2004, MSK, All of the curlmsg*.* files have also been moved to
$! this build directory. They will be copied to the src
$! directory before build. The .msg file will be compiled
View
@@ -7,8 +7,8 @@ LIB-Debug
LIB-Release
Makefile
Makefile.in
-config.h
-config.h.in
+curl_config.h
+curl_config.h.in
curl
hugehelp.c
stamp-h*
View
@@ -26,7 +26,7 @@ source_group("cURL header files" FILES ${CURL_HFILES})
include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h"
- ${CURL_BINARY_DIR}/lib # To be able to reach "config.h"
+ ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
)
View
@@ -29,8 +29,8 @@ AUTOMAKE_OPTIONS = foreign nostdinc
#
# $(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)/src is for curl's generated src/config.h file
+# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
+# $(top_builddir)/src is for curl's generated src/curl_config.h file
# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
# $(top_srcdir)/src is for curl's src/setup.h and "curl-private" files
@@ -54,7 +54,7 @@ CLEANFILES = hugehelp.c
NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
- Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx \
+ Makefile.riscos curl_config.h.in macos/curl.mcp.xml.sit.hqx \
macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \
macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \
Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw \
View
@@ -235,7 +235,7 @@ vpath %.c $(CURL_LIB)
all: prebuild $(TARGET).nlm
-prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h
+prebuild: $(OBJDIR) $(OBJDIR)/version.inc curl_config.h
$(OBJDIR)/%.o: %.c
# @echo Compiling $<
@@ -254,7 +254,7 @@ clean:
ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
-$(RM) hugehelp.c
endif
- -$(RM) config.h
+ -$(RM) curl_config.h
-$(RM) -r $(OBJDIR)
distclean: clean
@@ -361,7 +361,7 @@ endif
@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) >> $@
View
@@ -1,11 +1,11 @@
#ifndef __SRC_CONFIG_MAC_H
#define __SRC_CONFIG_MAC_H
-/* ================================================================ */
-/* src/config-mac.h - Hand crafted config file for Mac OS 9 */
-/* ================================================================ */
-/* On Mac OS X you must run configure to generate config.h file */
-/* ================================================================ */
+/* =================================================================== */
+/* src/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 to 1 if you want the built-in manual */
#define USE_MANUAL 1
View
@@ -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
View
@@ -5,7 +5,7 @@
# Gisle Vanem <giva@bgnett.no>
#
-DEPEND_PREREQ = config.h hugehelp.c
+DEPEND_PREREQ = curl_config.h hugehelp.c
top_srcdir = ..
TOPDIR = ..
@@ -39,13 +39,13 @@ CFLAGS += -DUSE_ENVIRONMENT
PROGRAM = curl.exe
OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
-all: $(OBJ_DIR) config.h $(PROGRAM)
+all: $(OBJ_DIR) curl_config.h $(PROGRAM)
@echo Welcome to cURL
$(PROGRAM): $(OBJECTS) ../lib/libcurl.a
$(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS)
-config.h:
+curl_config.h:
ifeq ($(IS_UNIX_SHELL),1)
@echo '#include "../lib/config.dos"' > $@
else
@@ -62,7 +62,7 @@ hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
# clean generated files
#
genclean:
- - $(DELETE) config.h
+ - $(DELETE) curl_config.h
- $(DELETE) hugehelp.c
# clean object files and subdir
View
@@ -39,7 +39,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "curl_config.h"
#else
#ifdef WIN32
@@ -6,7 +6,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test
include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h"
- ${CURL_BINARY_DIR}/lib # To be able to reach "config.h"
+ ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
)
@@ -29,7 +29,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
#
# $(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 "borrowed" 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
Oops, something went wrong.

0 comments on commit f671d05

Please sign in to comment.