Module Name: src
Committed By: mrg
Date: Wed Aug 5 06:50:44 UTC 2015
Modified Files:
src/libexec/httpd: Makefile bozohttpd.h
Log Message:
on QNX, use nbutil.h.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/libexec/httpd/Makefile
cvs rdiff -u -r1.35 -r1.36 src/libexec/httpd/bozohttpd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.23 src/libexec/httpd/Makefile:1.24
--- src/libexec/httpd/Makefile:1.23 Thu Apr 16 02:32:33 2015
+++ src/libexec/httpd/Makefile Wed Aug 5 06:50:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/04/16 02:32:33 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2015/08/05 06:50:44 mrg Exp $
#
# $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
#
@@ -15,6 +15,10 @@
# DO_HTPASSWD /* support .htpasswd files */
# NO_LUA_SUPPORT /* don't support Lua for dynamic content */
#
+# other system specific defines:
+# HAVE_NBUTIL_H /* netbsd compat is in <nbutil.h>
+# (don't forget to also enable -lnbutil)
+#
# these are usually set via the "COPTS" variable, or some other method
# for setting CFLAGS relevant to your make, eg
# % make COPTS="-DDO_HTPASSWD"
@@ -33,6 +37,17 @@ DPADD= ${LIBCRYPT} ${LIBLUA} ${LIBM}
WARNS?= 4
+.if defined(.OS.MAKE)
+OPSYS= ${.OS.MAKE}
+.else
+OPSYS:= ${:!uname -s!:S/-//g:S/\///g}
+.endif
+
+.if ${OPSYS} == "QNX"
+CPPFLAGS+= -DHAVE_NBUTIL_H
+LDADD+= -lnbutil
+.endif
+
.include <bsd.own.mk>
.if ${MKCRYPTO} != "no"
Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.35 src/libexec/httpd/bozohttpd.h:1.36
--- src/libexec/httpd/bozohttpd.h:1.35 Sat May 2 11:35:48 2015
+++ src/libexec/httpd/bozohttpd.h Wed Aug 5 06:50:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.h,v 1.35 2015/05/02 11:35:48 mrg Exp $ */
+/* $NetBSD: bozohttpd.h,v 1.36 2015/08/05 06:50:44 mrg Exp $ */
/* $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $ */
@@ -41,6 +41,11 @@
#endif
#include <stdio.h>
+/* QNX provides a lot of NetBSD things in nbutil.h */
+#ifdef USE_NBUTIL
+#include <nbutil.h>
+#endif
+
/* lots of "const" but gets free()'ed etc at times, sigh */
/* headers */
