Makefile.in:

	Add a distclean target.  We may want to distribute the configure
	script at some point instead of just configure.in and expect people
	to use autoconf; we'll have to remember to change this then.

config.c, dnsbl.c, irc.c, log.c, main.c, opercmd.c, scan.c:
	Take account of AC_HEADER_STDC check.

diff --git a/Makefile.in b/Makefile.in
index 25fe1d3413a0f3a1367091e04817400fc89ee6ea..c336b083125dacf1f044a242db374a6a1be95487 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,3 +46,7 @@ bopchecker: $(checker_obj)
 clean: 
        rm -f *.o *.da bopm bopchecker
 
+.PHONY: distclean
+distclean: clean
+       rm -f config.cache config.log config.status configure setup.h Makefile
+

diff --git a/config.c b/config.c
index 1ce84e1f1c833b01b6a306a6a155606cdd162702..8a26d43af4687a56abc3624d323f65e60b174c37 100644 (file)
--- a/config.c
+++ b/config.c
@@ -20,11 +20,14 @@ along with this program; if not, write to the Free Software
 
 */
 
+#include "setup.h"
 
-
+#ifdef STDC_HEADERS
 #include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
+#undef
+
+#include <stdio.h>
 #include <time.h>
 
 #include "config.h"

diff --git a/dnsbl.c b/dnsbl.c
index d978a3a2c6ad6fbf51c976d7101c29b62a4dc524..a8132a162e23068d8f347f59090e43bcd504f80d 100644 (file)
--- a/dnsbl.c
+++ b/dnsbl.c
@@ -20,8 +20,14 @@ along with this program; if not, write to the Free Software
 
 */
 
+#include "setup.h"
+
 #include <stdio.h>
+
+#ifdef STDC_HEADERS
 #include <stdlib.h>
+#endif
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/irc.c b/irc.c
index 90b7a93ff0f1a197a40cfd50dcdd8f9256842b83..e6046e75ebd61ecf3f2c54518630874444467133 100644 (file)
--- a/irc.c
+++ b/irc.c
@@ -20,11 +20,16 @@ along with this program; if not, write to the Free Software
 
 */
 
+#include "setup.h"
 
 #include <stdio.h>
 #include <unistd.h>
+
+#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <string.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/log.c b/log.c
index ab3600a936380503a6280622aadd97c6b9e47a99..f9e380fedba86567e7ae55e91454d9c02e467b71 100644 (file)
--- a/log.c
+++ b/log.c
@@ -20,10 +20,15 @@ along with this program; if not, write to the Free Software
 
 */
 
-#include <stdlib.h>
+#include "setup.h"
+
 #include <stdio.h>
+
+#ifdef STDC_HEADERS
+#include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#endif
 
 #include <time.h>
 

diff --git a/main.c b/main.c
index 449dcb971d612cd1036e0ed00b62507163b49b10..914f45fa09c5034cbd917a8eb1d813d17467a26b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,8 +31,11 @@ along with this program; if not, write to the Free Software
 #include <netdb.h>
 #include <signal.h>
 #include <unistd.h>
+
+#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "config.h"
 #include "extern.h"

diff --git a/opercmd.c b/opercmd.c
index 54b258b13d045d9116fcd73d3ee7268edaea56b0..1dad97806ff4d4a7044297272300604a49569e6f 100644 (file)
--- a/opercmd.c
+++ b/opercmd.c
@@ -20,8 +20,13 @@ along with this program; if not, write to the Free Software
 
 */
 
+#include "setup.h"
+
+#ifdef STDC_HEADERS
 #include <string.h>
 #include <stdlib.h>
+#endif
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <time.h>

diff --git a/scan.c b/scan.c
index a40d2a1bb9b8760eedc4f92d9b25abcf96531202..045d28c91bfd6354e0c94dbb0087a273350813e6 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -20,10 +20,16 @@ along with this program; if not, write to the Free Software
 
 */
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <unistd.h>
+
+#ifdef STDC_HEADERS
 #include <stdlib.h>
 #include <string.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>