use MHD_config.h

configure.ac

@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT([libmicrohttpd], [0.3.1],[libmicrohttpd@gnunet.org])
 AM_INIT_AUTOMAKE([libmicrohttpd], [0.3.1])
-AM_CONFIG_HEADER([config.h])
+AM_CONFIG_HEADER([MHD_config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])
 

src/daemon/daemon.c

@@ -24,6 +24,7 @@
  * @author Daniel Pittman
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "internal.h"
 #include "response.h"
 #include "connection.h"
@@ -411,8 +412,10 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
         }
       return MHD_NO;
     }
+#if HAVE_MESSAGES
 #if DEBUG_CONNECT
   MHD_DLOG (daemon, "Accepted connection on socket %d\n", s);
+#endif
 #endif
   have = 0;
   if ((daemon->per_ip_connection_limit != 0) && (daemon->max_connections > 0))

src/daemon/https/lgl/asnprintf.c

@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #include "vasnprintf.h"

src/daemon/https/lgl/asprintf.c

@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #ifdef IN_LIBASPRINTF

src/daemon/https/lgl/des.c

@@ -94,7 +94,7 @@
  */
 
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "des.h"
 

src/daemon/https/lgl/gc-gnulib.c

@@ -20,7 +20,7 @@
 
 /* Note: This file is only built if GC uses internal functions. */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Get prototype. */
 #include "gc.h"

src/daemon/https/lgl/gc-libgcrypt.c

@@ -20,7 +20,7 @@
 
 /* Note: This file is only built if GC uses Libgcrypt. */
 
-#include "config.h"
+#include "MHD_config.h"
 
 /* Get prototype. */
 #include "gc.h"

src/daemon/https/lgl/gc-pbkdf2-sha1.c

@@ -18,7 +18,7 @@
 /* Written by Simon Josefsson.  The comments in this file are taken
    from RFC 2898.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "gc.h"
 

src/daemon/https/lgl/hmac-md5.c

@@ -17,7 +17,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "hmac.h"
 

src/daemon/https/lgl/hmac-sha1.c

@@ -17,7 +17,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "hmac.h"
 

src/daemon/https/lgl/md5.c

@@ -20,7 +20,7 @@
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "md5.h"
 

src/daemon/https/lgl/memmem.c

@@ -16,7 +16,7 @@
  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LIBC
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 #include <stddef.h>

src/daemon/https/lgl/memmove.c

@@ -3,7 +3,7 @@
    In the public domain.
    By David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include <stddef.h>
 

src/daemon/https/lgl/memxor.c

@@ -18,7 +18,7 @@
 /* Written by Simon Josefsson.  The interface was inspired by memxor
    in Niels Möller's Nettle. */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "memxor.h"
 

src/daemon/https/lgl/printf-args.c

@@ -21,7 +21,7 @@
      STATIC             Set to 'static' to declare the function static.  */
 
 #ifndef PRINTF_FETCHARGS
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 /* Specification.  */

src/daemon/https/lgl/printf-parse.c

@@ -29,7 +29,7 @@
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.  */
 
 #ifndef PRINTF_PARSE
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 /* Specification.  */

src/daemon/https/lgl/read-file.c

@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "read-file.h"
 

src/daemon/https/lgl/realloc.c

@@ -17,7 +17,7 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h.  */
 #ifdef realloc

src/daemon/https/lgl/rijndael-alg-fst.c

@@ -25,7 +25,7 @@
  * http://www.iaik.tu-graz.ac.at/research/krypto/AES/old/~rijmen/rijndael/rijndael-fst-3.0.zip
  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /**
  * rijndael-alg-fst.c

src/daemon/https/lgl/rijndael-api-fst.c

@@ -25,7 +25,7 @@
  * http://www.iaik.tu-graz.ac.at/research/krypto/AES/old/~rijmen/rijndael/rijndael-fst-3.0.zip
  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /**
  * rijndael-api-fst.c

src/daemon/https/lgl/sha1.c

@@ -23,7 +23,7 @@
       Robert Klep <robert@ilse.nl>  -- Expansion function fix
 */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "sha1.h"
 

src/daemon/https/lgl/snprintf.c

@@ -16,7 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #include <stdio.h>

src/daemon/https/lgl/strverscmp.c

@@ -18,7 +18,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if !_LIBC
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 #include <string.h>

src/daemon/https/lgl/time_r.c

@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include <time.h>
 

src/daemon/https/lgl/vasnprintf.c

@@ -52,7 +52,7 @@
 #endif
 
 #ifndef VASNPRINTF
-# include <config.h>
+#include "MHD_config.h"
 #endif
 #ifndef IN_LIBINTL
 # include <alloca.h>

src/daemon/https/lgl/vasprintf.c

@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #ifdef IN_LIBASPRINTF

src/daemon/https/tls/defines.h

@@ -26,7 +26,7 @@
 # define DEFINES_H
 
 #if HAVE_CONFIG_H
-# include <config.h>
+# include "MHD_config.h"
 #endif
 
 #include <stddef.h>

src/daemon/https/tls/gnutls_asn1_tab.c

@@ -1,5 +1,5 @@
 #if HAVE_CONFIG_H
-# include "config.h"
+#include "MHD_config.h"
 #endif
 
 #include <libtasn1.h>

src/daemon/https/tls/pkix_asn1_tab.c

@@ -1,5 +1,5 @@
 #if HAVE_CONFIG_H
-# include "config.h"
+#include "MHD_config.h"
 #endif
 
 #include <libtasn1.h>

src/include/platform.h

@@ -34,7 +34,7 @@
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
-#include "config.h"
+#include "MHD_config.h"
 
 #define _XOPEN_SOURCE_EXTENDED  1
 #define _OPEN_THREADS

src/testcurl/curl_version_check.c

@@ -24,7 +24,7 @@
  * @author Sagie Amir
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include "platform.h"
 #include <curl/curl.h>
 #include <microhttpd.h>

src/testcurl/daemontest_get.c

@@ -25,7 +25,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_get_chunked.c

@@ -28,7 +28,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_large_put.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_long_header.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_post.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_post_loop.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff (inspired by bug report #1296)
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_postform.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_put.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testcurl/daemontest_put_chunked.c

@@ -25,7 +25,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_get.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_get_chunked.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_large_put.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_long_header.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_post.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_postform.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_put.c

@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>

src/testzzuf/daemontest_put_chunked.c

@@ -25,7 +25,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>