diff options
| author | Gunter Knauf <gk@gknw.de> | 2009-07-14 13:25:14 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2009-07-14 13:25:14 +0000 |
| commit | f671d0513ccc9cdcd7516c732c719b2f31a9578e (patch) | |
| tree | e419c483393ab20caaf0e93f1d236edb08743670 /tests/server | |
| parent | 100f6b7703ff9a45340c0b27122806952f243ab8 (diff) | |
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.
Diffstat (limited to 'tests/server')
| -rw-r--r-- | tests/server/.cvsignore | 2 | ||||
| -rw-r--r-- | tests/server/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/server/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/server/.cvsignore b/tests/server/.cvsignore index 56a4e719e..c843da763 100644 --- a/tests/server/.cvsignore +++ b/tests/server/.cvsignore @@ -3,7 +3,7 @@ Makefile.in sws .deps stamp-h* -config.h +curl_config.h Makefile getpart sockfilt diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index c9b32e16f..01db82401 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -6,7 +6,7 @@ function(SETUP_EXECUTABLE 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" ) diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index c8863c265..63481a220 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -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 |