make including config.h always depend on HAVE_CONFIG_H; replace printf() by debug()

shared/configfile.c

@@ -13,13 +13,15 @@
  *
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "shared/report.h"
 
 

shared/debug.h

@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 /* DEBUGGING

shared/getopt.c

@@ -26,7 +26,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #else
 # if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems

shared/getopt1.c

@@ -19,7 +19,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #else
 #if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems

shared/report.h

@@ -56,7 +56,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <stdarg.h>

shared/snprintf.c

@@ -218,7 +218,9 @@
  *		  the fact that this work is dual licensed.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 /* Define HAVE_SNPRINTF if your system already has snprintf and vsnprintf.
  *

shared/snprintf.h

@@ -5,7 +5,7 @@
 #define PORTABLE_SNPRINTF_VERSION_MINOR 2
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #ifdef HAVE_SNPRINTF

shared/sockets.c

@@ -1,4 +1,3 @@
-#include "config.h"
 #include <unistd.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -7,17 +6,21 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #ifndef WINSOCK2
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/inet.h>
+# include <sys/socket.h>
+# include <sys/un.h>
+# include <netinet/in.h>
+# include <netdb.h>
+# include <arpa/inet.h>
 #else
-#include <winsock2.h>
+# include <winsock2.h>
 #endif
 #include <stdarg.h>
 #include <fcntl.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "report.h"
 #include "sockets.h"