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

diff --git a/.cvsignore b/.cvsignore
index cc3ccd07ff1c924ef5e8184c43db3f9106817058..be311e58c7262ec30d6c5212cdb39d84ae0c35dd 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,7 +5,7 @@ aclocal.m4.bak
 autom4te.cache
 compile
 config.guess
-config.h
+curl_config.h
 config.log
 config.lt
 config.status

diff --git a/Android.mk b/Android.mk
index 7ed3b09675e8ac64c2a92ef7bf74938f9e187e05..11b26398b3572e14bc15e51f06c4242094de301f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@
 # Android source tree.  Then build them with 'make curl' or just 'make libcurl'
 # from the Android root.
 #
-# Note: you must first create a config.h file by running configure in the
+# Note: you must first create a curl_config.h file by running configure in the
 # Android environment. I haven't found an easy way to do this yet. If there is
 # no easy way, a static config-android.h may need to be created and checked in
 # to the libcurl source tree.

diff --git a/CHANGES b/CHANGES
index 18bca2706a0e39855fc9ef060b4f672fea307afc..3646b07522b82ae370136152735b1fda4b441245 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Guenter Knauf (14 Jul 2009)
+- renamed generated config.h to curl_config.h to avoid any future clashes
+  with config.h from other projects.
+  
 Daniel Stenberg (9 Jul 2009)
 - Eric Wong introduced curlx_nonblock() that the curl tool now (re-)uses for
   setting a file descriptor non-blocking. Used by the functionality Eric