From f01d18e4b9c7fdfb4c106667f354033eb96fc77b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 8 Aug 2008 12:34:01 +0000 Subject: [PATCH] Reintroduce the adjustment previously done in testcurl.pl so that it copies the CVS checked out curlbuild.h.dist as curlbuild.h for any non-configure target when host system is not running buildconf.bat. All the curlbuild.h stuff was done taking in consideration that no adjustment would be needed in non-configure makefiles. As it is documented, when trying to build on non-configure capable systems or on systems which for any reason don't run the true configure script, it is required to have the proper curlbuild.h in place before calling any makefile. Due to the hardcore memory debugging stuff c-ares enabled debug builds also need the file in the proper place before attempting to build c-ares. --- tests/testcurl.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testcurl.pl b/tests/testcurl.pl index 79ff7769a..63246a8f1 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -489,7 +489,7 @@ if ($configurebuild) { elsif (($^O eq 'linux') || ($targetos =~ /netware/)) { system("cp -afr ../$CURLDIR/* ."); system("cp -af ../$CURLDIR/Makefile.dist Makefile"); - # lib/Makefile.netware now copies curlbuild.h.dist as curlbuild.h + system("cp -af ../$CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h"); system("$make -i -C lib -f Makefile.$targetos prebuild"); system("$make -i -C src -f Makefile.$targetos prebuild"); }