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/libtest | |
| 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/libtest')
| -rw-r--r-- | tests/libtest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/libtest/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/libtest/test.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 08edbd0c9..74d841e01 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -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" ) diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index c5b8762cf..68b446c12 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/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 diff --git a/tests/libtest/test.h b/tests/libtest/test.h index c66fd61d7..66416b42a 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -9,9 +9,9 @@ */ /* 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 - both of them in the include path), so that we get good in-depth knowledge - about the system we're building this on */ + version, but that might include "curl_config.h" from the build dir so we + need both of them in the include path), so that we get good in-depth + knowledge about the system we're building this on */ #include "setup.h" |