moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00
Code Issues Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Gunter Knauf 2009-07-14 13:25:14 +00:00
parent 100f6b7703
commit f671d0513c
33 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildconf
View File

@ -270,8 +270,8 @@ for fname in .deps \
autom4te.cache \ autom4te.cache \
compile \ compile \
config.guess \ config.guess \
config.h \ curl_config.h \
config.h.in \ curl_config.h.in \
config.log \ config.log \
config.lt \ config.lt \
config.status \ config.status \
@ -321,8 +321,8 @@ fi
echo "buildconf: running autoheader" echo "buildconf: running autoheader"
${AUTOHEADER:-autoheader} || die "The autoheader command failed" ${AUTOHEADER:-autoheader} || die "The autoheader command failed"
echo "buildconf: cp lib/config.h.in src/config.h.in" echo "buildconf: cp lib/curl_config.h.in src/curl_config.h.in"
cp lib/config.h.in src/config.h.in cp lib/curl_config.h.in src/curl_config.h.in
echo "buildconf: running autoconf" echo "buildconf: running autoconf"
${AUTOCONF:-autoconf} || die "The autoconf command failed" ${AUTOCONF:-autoconf} || die "The autoconf command failed"

2
configure.ac
View File

@ -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]) terms of the curl license; see COPYING for more details])
AC_CONFIG_SRCDIR([lib/urldata.h]) 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 AM_MAINTAINER_MODE
CURL_CHECK_OPTION_DEBUG CURL_CHECK_OPTION_DEBUG

2
diff-exclude
View File

@ -18,7 +18,7 @@ autom4te.cache
*.patch *.patch
CVS CVS
*.asc *.asc
config.h curl_config.h
*.la *.la
*.lai *.lai
libtool libtool

6
docs/INTERNALS
View File

@ -103,9 +103,9 @@ Windows vs Unix
Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All 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 conditionals that deal with features *should* instead be in the format
'#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts, '#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 we maintain two curl_config-win32.h files (one in lib/ and one in src/) that
supposed to look exactly as a config.h file would have looked like on a are supposed to look exactly as a curl_config.h file would have looked like on
Windows machine! a Windows machine!
Generally speaking: always remember that this will be compiled on dozens of Generally speaking: always remember that this will be compiled on dozens of
operating systems. Don't walk on the edge. operating systems. Don't walk on the edge.

2
lib/.cvsignore
View File

@ -9,7 +9,7 @@ DLL-Release
LIB-Debug LIB-Debug
LIB-Release LIB-Release
Makefile Makefile
config.h curl_config.h
getdate.c getdate.c
libcurl.dsp libcurl.dsp
libcurl.vcproj libcurl.vcproj

6
lib/CMakeLists.txt
View File

@ -2,15 +2,15 @@ set(LIB_NAME libcurl)
configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake
${CURL_BINARY_DIR}/include/curl/curlbuild.h) ${CURL_BINARY_DIR}/include/curl/curlbuild.h)
configure_file(config.h.cmake configure_file(curl_config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config.h) ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h)
transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
list(APPEND HHEADERS list(APPEND HHEADERS
${CMAKE_CURRENT_BINARY_DIR}/config.h ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h
${CURL_BINARY_DIR}/include/curl/curlbuild.h ${CURL_BINARY_DIR}/include/curl/curlbuild.h
) )

6
lib/Makefile.am
View File

@ -29,11 +29,11 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \
README.hostip README.multi_socket README.httpauth README.pipelining \ README.hostip README.multi_socket README.httpauth README.pipelining \
README.NSS README.curl_off_t 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) \ EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \
vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \ 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 \ libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga \
Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot \ Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot \
config-win32ce.h config-os400.h setup-os400.h config-symbian.h \ 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_builddir)/include is for libcurl's generated curl/curlbuild.h file
# $(top_srcdir)/include is for libcurl's external include files # $(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_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_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 # $(top_srcdir)/ares is for in-tree c-ares's external include files

6
lib/Makefile.netware
View File

@ -241,7 +241,7 @@ nlm: prebuild $(TARGET).nlm
lib: prebuild $(TARGET).$(LIBEXT) 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 $(OBJDIR)/%.o: %.c
# @echo Compiling $< # @echo Compiling $<
@ -263,7 +263,7 @@ ifdef WITH_SSL
endif endif
clean: clean:
-$(RM) config.h -$(RM) curl_config.h
-$(RM) -r $(OBJDIR) -$(RM) -r $(OBJDIR)
distclean: clean distclean: clean
@ -373,7 +373,7 @@ ifeq ($(findstring nlmconv,$(LD)),nlmconv)
@echo $(DL)output $(TARGET).nlm$(DL) >> $@ @echo $(DL)output $(TARGET).nlm$(DL) >> $@
endif endif
config.h: Makefile.netware curl_config.h: Makefile.netware
@echo Creating $@ @echo Creating $@
@echo $(DL)/* $@ for NetWare target.$(DL) > $@ @echo $(DL)/* $@ for NetWare target.$(DL) > $@
@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@ @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@

10
lib/config-mac.h
View File

@ -1,11 +1,11 @@
#ifndef __LIB_CONFIG_MAC_H #ifndef __LIB_CONFIG_MAC_H
#define __LIB_CONFIG_MAC_H #define __LIB_CONFIG_MAC_H
/* ================================================================ */ /* =================================================================== */
/* lib/config-mac.h - Hand crafted config file for Mac OS 9 */ /* 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 */ /* On Mac OS X you must run configure to generate curl_config.h file */
/* ================================================================ */ /* =================================================================== */
#define OS "mac" #define OS "mac"

2
lib/config-riscos.h
View File

@ -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! */ /* Name of this package! */
#undef PACKAGE #undef PACKAGE

2
lib/config.h.cmake
View File

@ -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. */ /* Define to 1 if you have the $func function. */
#cmakedefine AS_TR_CPP ${AS_TR_CPP} #cmakedefine AS_TR_CPP ${AS_TR_CPP}

8
lib/makefile.dj
View File

@ -4,7 +4,7 @@
# #
# $Id$ # $Id$
DEPEND_PREREQ = config.h DEPEND_PREREQ = curl_config.h
TOPDIR = .. TOPDIR = ..
include ../packages/DOS/common.dj 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 # 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. # 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) $(CURL_LIB): $(OBJECTS)
ar rs $@ $? ar rs $@ $?
config.h: config.dos curl_config.h: config.dos
$(COPY) $^ $@ $(COPY) $^ $@
# clean generated files # clean generated files
# #
genclean: genclean:
- $(DELETE) config.h - $(DELETE) curl_config.h
# clean object files and subdir # clean object files and subdir
# #

2
lib/setup.h
View File

@ -38,7 +38,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "curl_config.h"
#else /* HAVE_CONFIG_H */ #else /* HAVE_CONFIG_H */

2
m4/curl-functions.m4
View File

@ -4830,7 +4830,7 @@ AC_DEFUN([CURL_CHECK_FUNC_STRERROR_R], [
# #
if test "$tst_compi_strerror_r" = "yes" && if test "$tst_compi_strerror_r" = "yes" &&
test "$tst_allow_strerror_r" = "unknown"; then 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 fi
# #
]) ])

4
maketgz
View File

@ -92,8 +92,8 @@ findprog()
return 0 return 0
} }
echo "maketgz: cp lib/config.h.in src/config.h.in" echo "maketgz: cp lib/curl_config.h.in src/curl_config.h.in"
cp lib/config.h.in src/config.h.in cp lib/curl_config.h.in src/curl_config.h.in
############################################################################ ############################################################################
# #

4
missing
View File

@ -66,7 +66,7 @@ Options:
Supported PROGRAM values: Supported PROGRAM values:
aclocal touch file \`aclocal.m4' aclocal touch file \`aclocal.m4'
autoconf touch file \`configure' autoconf touch file \`configure'
autoheader touch file \`config.h.in' autoheader touch file \`curl_config.h.in'
automake touch all \`Makefile.in' files automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch] bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c 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 to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site." from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` 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= touch_files=
for f in $files; do for f in $files; do
case "$f" in case "$f" in

2
packages/vms/build_vms.com
View File

@ -34,7 +34,7 @@ $! and updated it to do hardware dependant builds.
$! 29-JAN-2004, MSK, moved logical defines into defines.com $! 29-JAN-2004, MSK, moved logical defines into defines.com
$! 6-FEB-2004, MSK, put in various SSL support bits $! 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 $! 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 $! 15-MAR-2004, MSK, All of the curlmsg*.* files have also been moved to
$! this build directory. They will be copied to the src $! this build directory. They will be copied to the src
$! directory before build. The .msg file will be compiled $! directory before build. The .msg file will be compiled

4
src/.cvsignore
View File

@ -7,8 +7,8 @@ LIB-Debug
LIB-Release LIB-Release
Makefile Makefile
Makefile.in Makefile.in
config.h curl_config.h
config.h.in curl_config.h.in
curl curl
hugehelp.c hugehelp.c
stamp-h* stamp-h*

2
src/CMakeLists.txt
View File

@ -26,7 +26,7 @@ source_group("cURL header files" FILES ${CURL_HFILES})
include_directories( include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" ${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" ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
) )

6
src/Makefile.am
View File

@ -29,8 +29,8 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# #
# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
# $(top_srcdir)/include is for libcurl's external include files # $(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_builddir)/src is for curl's generated src/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)/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 # $(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 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 \ 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/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \
macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \ macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \
Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw \ Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw \

6
src/Makefile.netware
View File

@ -235,7 +235,7 @@ vpath %.c $(CURL_LIB)
all: prebuild $(TARGET).nlm all: prebuild $(TARGET).nlm
prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h prebuild: $(OBJDIR) $(OBJDIR)/version.inc curl_config.h
$(OBJDIR)/%.o: %.c $(OBJDIR)/%.o: %.c
# @echo Compiling $< # @echo Compiling $<
@ -254,7 +254,7 @@ clean:
ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs" ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
-$(RM) hugehelp.c -$(RM) hugehelp.c
endif endif
-$(RM) config.h -$(RM) curl_config.h
-$(RM) -r $(OBJDIR) -$(RM) -r $(OBJDIR)
distclean: clean distclean: clean
@ -361,7 +361,7 @@ endif
@echo $(DL)output $(TARGET).nlm$(DL) >> $@ @echo $(DL)output $(TARGET).nlm$(DL) >> $@
endif endif
config.h: Makefile.netware curl_config.h: Makefile.netware
@echo Creating $@ @echo Creating $@
@echo $(DL)/* $@ for NetWare target.$(DL) > $@ @echo $(DL)/* $@ for NetWare target.$(DL) > $@
@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@ @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@

10
src/config-mac.h
View File

@ -1,11 +1,11 @@
#ifndef __SRC_CONFIG_MAC_H #ifndef __SRC_CONFIG_MAC_H
#define __SRC_CONFIG_MAC_H #define __SRC_CONFIG_MAC_H
/* ================================================================ */ /* =================================================================== */
/* src/config-mac.h - Hand crafted config file for Mac OS 9 */ /* 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 */ /* 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 to 1 if you want the built-in manual */
#define USE_MANUAL 1 #define USE_MANUAL 1

2
src/config-riscos.h
View File

@ -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! */ /* Name of this package! */
#undef PACKAGE #undef PACKAGE

8
src/makefile.dj
View File

@ -5,7 +5,7 @@
# Gisle Vanem <giva@bgnett.no> # Gisle Vanem <giva@bgnett.no>
# #
DEPEND_PREREQ = config.h hugehelp.c DEPEND_PREREQ = curl_config.h hugehelp.c
top_srcdir = .. top_srcdir = ..
TOPDIR = .. TOPDIR = ..
@ -39,13 +39,13 @@ CFLAGS += -DUSE_ENVIRONMENT
PROGRAM = curl.exe PROGRAM = curl.exe
OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o)) OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
all: $(OBJ_DIR) config.h $(PROGRAM) all: $(OBJ_DIR) curl_config.h $(PROGRAM)
@echo Welcome to cURL @echo Welcome to cURL
$(PROGRAM): $(OBJECTS) ../lib/libcurl.a $(PROGRAM): $(OBJECTS) ../lib/libcurl.a
$(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS) $(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS)
config.h: curl_config.h:
ifeq ($(IS_UNIX_SHELL),1) ifeq ($(IS_UNIX_SHELL),1)
@echo '#include "../lib/config.dos"' > $@ @echo '#include "../lib/config.dos"' > $@
else else
@ -62,7 +62,7 @@ hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
# clean generated files # clean generated files
# #
genclean: genclean:
- $(DELETE) config.h - $(DELETE) curl_config.h
- $(DELETE) hugehelp.c - $(DELETE) hugehelp.c
# clean object files and subdir # clean object files and subdir

2
src/setup.h
View File

@ -39,7 +39,7 @@
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "curl_config.h"
#else #else
#ifdef WIN32 #ifdef WIN32

2
tests/libtest/CMakeLists.txt
View File

@ -6,7 +6,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test
include_directories( include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" ${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" ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
) )

2
tests/libtest/Makefile.am
View File

@ -29,7 +29,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# #
# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
# $(top_srcdir)/include is for libcurl's external include files # $(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_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_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 # $(top_srcdir)/ares is for in-tree c-ares's external include files

6
tests/libtest/test.h
View File

@ -9,9 +9,9 @@
*/ */
/* Now include the setup.h file from libcurl's private libdir (the source /* Now include the setup.h file from libcurl's private libdir (the source
version, but that might include "config.h" from the build dir so we need version, but that might include "curl_config.h" from the build dir so we
both of them in the include path), so that we get good in-depth knowledge need both of them in the include path), so that we get good in-depth
about the system we're building this on */ knowledge about the system we're building this on */
#include "setup.h" #include "setup.h"

4
tests/runtests.pl
View File

@ -1614,8 +1614,8 @@ sub checksystem {
die "couldn't get curl's version"; die "couldn't get curl's version";
} }
if(-r "../lib/config.h") { if(-r "../lib/curl_config.h") {
open(CONF, "<../lib/config.h"); open(CONF, "<../lib/curl_config.h");
while(<CONF>) { while(<CONF>) {
if($_ =~ /^\#define HAVE_GETRLIMIT/) { if($_ =~ /^\#define HAVE_GETRLIMIT/) {
$has_getrlimit = 1; $has_getrlimit = 1;

2
tests/server/.cvsignore
View File

@ -3,7 +3,7 @@ Makefile.in
sws sws
.deps .deps
stamp-h* stamp-h*
config.h curl_config.h
Makefile Makefile
getpart getpart
sockfilt sockfilt

2
tests/server/CMakeLists.txt
View File

@ -6,7 +6,7 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test
include_directories( include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" ${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" ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
) )

2
tests/server/Makefile.am
View File

@ -29,7 +29,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# #
# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
# $(top_srcdir)/include is for libcurl's external include files # $(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_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_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 # $(top_srcdir)/ares is for in-tree c-ares's external include files

2
tests/testcurl.pl
View File

@ -230,7 +230,7 @@ sub mydie($){
sub get_host_triplet { sub get_host_triplet {
my $triplet; my $triplet;
my $configfile = "$pwd/$build/lib/config.h"; my $configfile = "$pwd/$build/lib/curl_config.h";
if(-f $configfile && -s $configfile && open(LIBCONFIGH, "<$configfile")) { if(-f $configfile && -s $configfile && open(LIBCONFIGH, "<$configfile")) {
while(<LIBCONFIGH>) { while(<LIBCONFIGH>) {