remove prereq, by using a pre-generated include file (this one should now

be MI since we removed stuff that was arch-dependent). The Configure script
still rebuilds a copy of that file, and we check it for diffs.

okay millert@

3 files changed, 98 insertions, 12 deletions

diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index 46dff4bb4c5..f397f88256d 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Apache 
-# $OpenBSD: Makefile.bsd-wrapper,v 1.59 2006/04/04 11:39:27 henning Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.60 2007/02/13 00:37:24 espie Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -128,7 +128,7 @@ INSTALL_MODULES= \
 PERLPATH=	/usr/bin/perl
 
 MUNGEDFILES =	${.OBJDIR}/src/ap/Makefile \
-		${.OBJDIR}/src/include/ap_config_auto.h \
+		${.OBJDIR}/src/include/ap_config_auto.h.new \
 		${.OBJDIR}/src/lib/expat-lite/Makefile \
 		${.OBJDIR}/src/lib/Makefile \
 		${.OBJDIR}/src/main/Makefile \
@@ -622,16 +622,15 @@ ICONFILES= \
 
 .include <bsd.own.mk>
 
-all: 	prereq
+all: 	${.OBJDIR}/config.status
 	@cd ${.OBJDIR} && ${MAKE}
 
-prereq: ${.OBJDIR}/config.status 
-
 ${.OBJDIR}/config.status : ${.OBJDIR}/config.layout 
 	@cd ${.OBJDIR} && CC="${CC}" LD_SHLIB="${CC}" \
 		OPTIM="${CFLAGS} ${COPTS}" \
 		PATH="/sbin:/usr/sbin:/bin:/usr/bin" \
 			sh configure ${CONFIG_ARGS}
+	diff -u ${.CURDIR}/src/include/ap_config_auto.h ${.OBJDIR}/src/include/ap_config_auto.h.new
 
 .if !exists(${.OBJDIR}/config.layout)
 ${.OBJDIR}/config.layout: ${.CURDIR}/config.layout
@@ -639,18 +638,18 @@ ${.OBJDIR}/config.layout: ${.CURDIR}/config.layout
 .endif
 
 
-includes: prereq
+includes:
 	@-for i in ${INCFILES}; do \
 		j=`basename $$i`; \
 		echo "Installing ${DESTDIR}${HTTPD_INCLUDEDIR}/$$j"; \
 		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
-		    ${.OBJDIR}/$$i ${DESTDIR}${HTTPD_INCLUDEDIR}; \
+		    ${.CURDIR}/$$i ${DESTDIR}${HTTPD_INCLUDEDIR}; \
 	done
 	@-for i in ${XMLFILES}; do \
 		j=`basename $$i`; \
 		echo "Installing ${DESTDIR}${HTTPD_INCLUDEDIR}/xml/$$j"; \
 		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
-		    ${.OBJDIR}/$$i ${DESTDIR}${HTTPD_INCLUDEDIR}/xml; \
+		    ${.CURDIR}/$$i ${DESTDIR}${HTTPD_INCLUDEDIR}/xml; \
 	done
 
 install: maninstall
@@ -703,7 +702,7 @@ install: maninstall
 	rm -rf $$d
 
 .if ${.OBJDIR} == ${.CURDIR}
-clean: prereq cleanman
+clean: cleanman
 	@cd ${.OBJDIR} && ${MAKE} clean  && rm -f ${MUNGEDFILES}
 .else 	
 clean: cleanman
@@ -712,10 +711,13 @@ clean: cleanman
 
 cleandir: clean
 
+prereq:
+# nothing left
+
 test:
 	# Nothing here so far...
 
-depend: prereq
+depend:
 	# Nothing here so far...
 
 lint:
diff --git a/usr.sbin/httpd/src/Configure b/usr.sbin/httpd/src/Configure
index 4200bba765d..b4d02bef2b6 100644
--- a/usr.sbin/httpd/src/Configure
+++ b/usr.sbin/httpd/src/Configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: Configure,v 1.24 2007/02/03 18:01:52 espie Exp $
+# $OpenBSD: Configure,v 1.25 2007/02/13 00:37:24 espie Exp $
 ## ====================================================================
 ## The Apache Software License, Version 1.1
 ##
@@ -998,7 +998,7 @@ echo " + setting C pre-processor to $CPP"
 ## Now check for existance of non-standard system header files
 ## and start generation of the ap_config_auto.h header
 ##
-AP_CONFIG_AUTO_H="include/ap_config_auto.h"
+AP_CONFIG_AUTO_H="include/ap_config_auto.h.new"
 echo "/*" >$AP_CONFIG_AUTO_H
 echo " *  ap_config_auto.h -- Automatically determined configuration stuff" >>$AP_CONFIG_AUTO_H
 echo " *  THIS FILE WAS AUTOMATICALLY GENERATED - DO NOT EDIT!" >>$AP_CONFIG_AUTO_H
diff --git a/usr.sbin/httpd/src/include/ap_config_auto.h b/usr.sbin/httpd/src/include/ap_config_auto.h
new file mode 100644
index 00000000000..2311bb802c8
--- /dev/null
+++ b/usr.sbin/httpd/src/include/ap_config_auto.h
@@ -0,0 +1,84 @@
+/*
+ *  ap_config_auto.h -- Automatically determined configuration stuff
+ *  THIS FILE WAS AUTOMATICALLY GENERATED - DO NOT EDIT!
+ */
+
+#ifndef AP_CONFIG_AUTO_H
+#define AP_CONFIG_AUTO_H
+
+/* check: #include <dlfcn.h> */
+#ifndef HAVE_DLFCN_H
+#define HAVE_DLFCN_H 1
+#endif
+
+/* check: #include <dl.h> */
+#ifdef HAVE_DL_H
+#undef HAVE_DL_H
+#endif
+
+/* check: #include <bstring.h> */
+#ifdef HAVE_BSTRING_H
+#undef HAVE_BSTRING_H
+#endif
+
+/* check: #include <crypt.h> */
+#ifdef HAVE_CRYPT_H
+#undef HAVE_CRYPT_H
+#endif
+
+/* check: #include <unistd.h> */
+#ifndef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
+#endif
+
+/* check: #include <sys/resource.h> */
+#ifndef HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
+#endif
+
+/* check: #include <sys/select.h> */
+#ifndef HAVE_SYS_SELECT_H
+#define HAVE_SYS_SELECT_H 1
+#endif
+
+/* check: #include <sys/processor.h> */
+#ifdef HAVE_SYS_PROCESSOR_H
+#undef HAVE_SYS_PROCESSOR_H
+#endif
+
+/* check: #include <sys/param.h> */
+#ifndef HAVE_SYS_PARAM_H
+#define HAVE_SYS_PARAM_H 1
+#endif
+
+/* determine: isinf() found in libc */ 
+#ifndef HAVE_ISINF
+#define HAVE_ISINF 1
+#endif
+
+/* determine: isnan() found in libc */ 
+#ifndef HAVE_ISNAN
+#define HAVE_ISNAN 1
+#endif
+
+/* determine: is off_t a quad */
+#ifndef AP_OFF_T_IS_QUAD
+#define AP_OFF_T_IS_QUAD 1
+#endif
+
+/* build flag: -DDEV_RANDOM=/dev/arandom */
+#ifndef DEV_RANDOM
+#define DEV_RANDOM /dev/arandom
+#endif
+
+/* build flag: -DMOD_SSL=208116 */
+#ifndef MOD_SSL
+#define MOD_SSL 208116
+#endif
+
+/* build flag: -DEAPI */
+#ifndef EAPI
+#define EAPI 1
+#endif
+
+#endif /* AP_CONFIG_AUTO_H */