Commit f671d051 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

renamed generated config.h to curl_config.h in order to avoid clashes when... 

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.
parent 100f6b77

buildconf

+4 −4
Original line number Diff line number Diff line
@@ -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"

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -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

diff-exclude

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ autom4te.cache 
*.patch

CVS

*.asc

config.h

curl_config.h

*.la

*.lai

libtool

docs/INTERNALS

+3 −3
Original line number Diff line number Diff line
@@ -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.

lib/.cvsignore

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ DLL-Release 
LIB-Debug

LIB-Release

Makefile

config.h

curl_config.h

getdate.c

libcurl.dsp

libcurl.vcproj