Further fixes to configuration system; don't put configure in CVS.

Makefile

@@ -19,9 +19,9 @@ all:      MCONFIG $(patsubst %, %.build, $(SUB))
 
 install:  MCONFIG $(patsubst %, %.install, $(SUB))
 
-clean:    MCONFIG $(patsubst %, %.clean, $(SUB))
+clean:    $(patsubst %, %.clean, $(SUB))
 
-spotless: MCONFIG $(patsubst %, %.spotless, $(SUB))
+spotless: $(patsubst %, %.spotless, $(SUB))
 	rm -f MCONFIG config.cache config.log config.h *~ \#*
 	find . -type f \( -name \*.orig -o -name \*.rej \) | xargs -r rm -f
 

aclocal.m4

@@ -55,6 +55,33 @@ AC_DEFUN(PA_MSGHDR_MSG_CONTROL,
         AC_MSG_RESULT([no])
 ])])
 
+dnl ------------------------------------------------------------------------
+dnl  PA_STRUCT_IN_PKTINFO
+dnl
+dnl Look for definition of struct in_pktinfo.  Some versions of glibc
+dnl lack struct in_pktinfo; if so we need to include the definition
+dnl ourselves -- but we only want to do that if absolutely necessary!
+dnl ------------------------------------------------------------------------
+AC_DEFUN(PA_STRUCT_IN_PKTINFO,
+[AC_MSG_CHECKING([for definition of struct in_pktinfo])
+ AC_TRY_COMPILE(
+[
+#include <sys/types.h>
+#include <sys/socket.h>
+],
+[
+	struct in_pktinfo pktinfo;
+	int foo = sizeof(struct in_pktinfo);
+	void *quux = (void *)(&pktinfo.ipi_addr);
+],
+[
+        AC_DEFINE(HAVE_STRUCT_IN_PKTINFO)
+        AC_MSG_RESULT([yes])
+],
+[
+        AC_MSG_RESULT([no])
+])])
+
 dnl --------------------------------------------------------------------------
 dnl PA_HAVE_TCPWRAPPERS
 dnl

config.h.in

@@ -19,3 +19,4 @@
 #undef HAVE_MSGHDR_MSG_CONTROL
 #undef HAVE_RECVMSG
 #undef HAVE_TCPWRAPPERS
+#undef HAVE_STRUCT_IN_PKTINFO

configure.in

@@ -10,6 +10,7 @@ AC_C_INLINE
 
 AC_CHECK_FUNCS(recvmsg)
 PA_MSGHDR_MSG_CONTROL
+PA_STRUCT_IN_PKTINFO
 
 PA_WITH_BOOL(tcpwrappers, 1,
 [ --without-tcpwrappers	Disable tcpwrapper permissions checking],

tftp/Makefile

@@ -1,7 +1,7 @@
 all: tftp
 
-include ../MCONFIG
+-include ../MCONFIG
-include ../MRULES
+-include ../MRULES
 
 OBJS = tftp.o main.o tftpsubs.o