X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=configure;h=632c74afff96c96218522059ef611accc8a6eca0;hb=b82ffa68a6436ce3f4c4b480bc9c12ac284b0d99;hp=2d20f0999cb7261013be833fa5c475bca3cf4e51;hpb=ea76157909ba9919cd0eb7535a7cb91c4c3fcb77;p=opendoas.git

diff --git a/configure b/configure
index 2d20f09..632c74a 100755
--- a/configure
+++ b/configure
@@ -72,21 +72,14 @@ for x; do
 done
 
 CONFIG_MK=config.mk
-rm -f "$CONFIG_MK"
+CONFIG_H=config.h
+rm -f "$CONFIG_MK" "$CONFIG_H"
 
-# : ${VERSION:="$(git describe --dirty --tags --long --always)"}
-: ${VERSION:="6.2"}
+cat <<! >$CONFIG_H
+#ifndef CONFIG_H
+#define CONFIG_H
 
-cat <<EOF >>$CONFIG_MK
-PREFIX   ?=	${PREFIX:="/usr"}
-EPREFIX  ?=	${EPREFIX:="${PREFIX}"}
-BINDIR   ?=	${BINDIR:="${PREFIX}/bin"}
-SHAREDIR ?=	${SHAREDIR:="${PREFIX}/share"}
-MANDIR   ?=	${MANDIR:="${SHAREDIR}/man"}
-SYSCONFDIR?=	${SYSCONFDIR:="/etc"}
-PAMDIR   ?=	${PAMDIR:="${SYSCONFDIR}/pam.d"}
-CFLAGS   +=	-DVERSION="\"${VERSION}\""
-EOF
+!
 
 if [ -z "$BUILD" ]; then
 	BUILD="$(uname -m)-unknown-$(uname -s | tr '[:upper:]' '[:lower:]')"
@@ -115,13 +108,43 @@ OS_CFLAGS="-D__${OS}__"
 
 case "$OS" in
 	linux)
-		OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=${UID_MAX} -DGID_MAX=${GID_MAX}"
-		printf 'CURDIR   :=	.\n' >>$CONFIG_MK
-		[ -z "$WITHOUT_PAM" ] && \
-			printf 'PAM_DOAS  =	pam.d__doas__linux\n' >>$CONFIG_MK
+		printf 'Setting UID_MAX\t\t\t\t%d.\n' "$UID_MAX" >&2
+		printf '#define UID_MAX %s\n' "$UID_MAX" >>$CONFIG_H
+		printf 'Setting GID_MAX\t\t\t\t%d.\n' "$GID_MAX" >&2
+		printf '#define GID_MAX %s\n' "$GID_MAX" >>$CONFIG_H
+		OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE"
+		;;
+	netbsd)
+		OS_CFLAGS="$OS_CFLAGS -D_OPENBSD_SOURCE"
+		printf 'LDFLAGS  +=	-lutil\n' >>$CONFIG_MK
+		: ${BINGRP:=wheel}
 		;;
 esac
 
+: ${PREFIX:=/usr/local}
+: ${EPREFIX:=${PREFIX}}
+: ${BINDIR:=${PREFIX}/bin}
+: ${SHAREDIR:=${PREFIX}/share}
+: ${MANDIR:=${SHAREDIR}/man}
+: ${SYSCONFDIR:=/etc}
+: ${PAMDIR:=${SYSCONFDIR}/pam.d}
+: ${BINMODE:=4755}
+: ${BINOWN:=root}
+: ${BINGRP:=root}
+
+cat <<EOF >>$CONFIG_MK
+PREFIX   ?=	${PREFIX}
+EPREFIX  ?=	${EPREFIX}
+BINDIR   ?=	${BINDIR}
+SHAREDIR ?=	${SHAREDIR}
+MANDIR   ?=	${MANDIR}
+SYSCONFDIR?=	${SYSCONFDIR}
+PAMDIR   ?=	${PAMDIR}
+BINMODE  ?=	${BINMODE}
+BINOWN  ?=	${BINOWN}
+BINGRP  ?=	${BINGRP}
+EOF
+
 [ -n "$OS_CFLAGS" ] && \
 	printf 'CFLAGS   +=	%s\n' "$OS_CFLAGS" >>$CONFIG_MK
 
@@ -143,12 +166,13 @@ check_func() {
 	$XCC "_$func.c" -o "_$func" 2>/dev/null
 	ret=$?
 	rm -f "_$func.c" "_$func"
+	upperfunc="$(printf '%s\n' "$func" | tr '[[:lower:]]' '[[:upper:]]')"
 	if [ $ret -eq 0 ]; then
 		printf 'yes.\n' >&2
-		upperfunc="$(printf '%s\n' "$func" | tr '[[:lower:]]' '[[:upper:]]')"
-		printf 'CFLAGS   +=	-DHAVE_%s\n' "$upperfunc" >>$CONFIG_MK
+		printf '#define HAVE_%s\n' "$upperfunc" >>$CONFIG_H
 		return 0
 	else
+		printf '/* #define HAVE_%s */\n' "$upperfunc" >>$CONFIG_H
 		printf 'no.\n' >&2
 		return 1
 	fi
@@ -166,8 +190,11 @@ int main(void) {
 	[ -z "$WITHOUT_PAM" ] && check_func "pam_appl_h" "$src" && {
 		printf 'SRCS     +=	pam.c\n' >>$CONFIG_MK
 		printf 'LDFLAGS  +=	-lpam\n' >>$CONFIG_MK
-		printf 'CPPFLAGS +=	-DUSE_PAM\n' >>$CONFIG_MK
+		printf '#define USE_PAM\n' >>$CONFIG_H
 		printf 'pam\n'
+
+		pam_file="pam.d__doas__${OS}"
+		[ -e "$pam_file" ] && printf 'PAM_DOAS  =	%s\n' "$pam_file" >>$CONFIG_MK
 		return 0
 	}
 
@@ -182,7 +209,7 @@ int main(void) {
 	[ -z "$WITHOUT_SHADOW" ] && check_func "shadow_h" "$src" && {
 		printf 'SRCS     +=	shadow.c\n' >>$CONFIG_MK
 		printf 'LDFLAGS  +=	-lcrypt\n' >>$CONFIG_MK
-		printf 'CPPFLAGS +=	-DUSE_SHADOW\n' >>$CONFIG_MK
+		printf '#define USE_SHADOW\n' >>$CONFIG_H
 		printf 'shadow\n'
 		return 0
 	}
@@ -192,7 +219,7 @@ int main(void) {
 
 persistmethod() {
 	[ -z "$WITHOUT_TIMESTAMP" ] && {
-		printf 'CPPFLAGS += -DUSE_TIMESTAMP\n' >>$CONFIG_MK
+		printf '#define USE_TIMESTAMP\n' >>$CONFIG_H
 		printf 'SRCS	+= timestamp.c\n' >>$CONFIG_MK
 		printf 'timestamp\n'
 		return 0
@@ -210,7 +237,7 @@ int main(void) {
 	return 0;
 }'
 check_func "explicit_bzero" "$src" || {
-	printf 'OPENBSD  +=	explicit_bzero.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/explicit_bzero.c\n' >>$CONFIG_MK
 }
 
 #
@@ -225,7 +252,7 @@ int main(void) {
 	return 0;
 }'
 check_func "strlcat" "$src" || {
-	printf 'OPENBSD  +=	strlcat.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/strlcat.c\n' >>$CONFIG_MK
 }
 
 #
@@ -240,7 +267,7 @@ int main(void) {
 	return 0;
 }'
 check_func "strlcpy" "$src" || {
-	printf 'OPENBSD  +=	strlcpy.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/strlcpy.c\n' >>$CONFIG_MK
 }
 
 #
@@ -253,7 +280,7 @@ int main(void) {
 	return 0;
 }'
 check_func "errc" "$src" || {
-	printf 'OPENBSD  +=	errc.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/errc.c\n' >>$CONFIG_MK
 }
 
 #
@@ -266,7 +293,7 @@ int main(void) {
 	return 0;
 }'
 check_func "verrc" "$src" || {
-	printf 'OPENBSD  +=	verrc.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/verrc.c\n' >>$CONFIG_MK
 }
 
 #
@@ -279,7 +306,7 @@ int main(void) {
 	return 0;
 }'
 check_func "setprogname" "$src" || {
-	printf 'OPENBSD  +=	progname.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/progname.c\n' >>$CONFIG_MK
 }
 
 #
@@ -293,7 +320,7 @@ int main(void) {
 	return 0;
 }'
 check_func "readpassphrase" "$src" || {
-	printf 'OPENBSD  +=	readpassphrase.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/readpassphrase.c\n' >>$CONFIG_MK
 }
 
 #
@@ -307,7 +334,7 @@ int main(void) {
 	return 0;
 }'
 check_func "strtonum" "$src" || {
-	printf 'OPENBSD  +=	strtonum.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/strtonum.c\n' >>$CONFIG_MK
 }
 
 #
@@ -320,7 +347,7 @@ int main(void) {
 	return 0;
 }'
 check_func "reallocarray" "$src" || {
-	printf 'OPENBSD  +=	reallocarray.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/reallocarray.c\n' >>$CONFIG_MK
 }
 
 #
@@ -344,7 +371,9 @@ int main(void) {
 	setresuid(0, 0, 0);
 	return 0;
 }'
-check_func "setresuid" "$src" || die "system has no setresuid(2): not supported"
+check_func "setresuid" "$src" || {
+	printf 'SRCS +=	libopenbsd/bsd-setres_id.c\n' >>$CONFIG_MK
+}
 
 #
 # Check for closefrom().
@@ -356,7 +385,7 @@ int main(void) {
 	return 0;
 }'
 check_func "closefrom" "$src" || {
-	printf 'OPENBSD  +=	closefrom.o\n' >>$CONFIG_MK
+	printf 'SRCS +=	libopenbsd/closefrom.c\n' >>$CONFIG_MK
 }
 
 #
@@ -370,17 +399,6 @@ int main(void) {
 }'
 check_func "sysconf" "$src"
 
-#
-# Check for /proc/$PID.
-#
-printf 'Checking for %-14s\t\t' "/proc/\$PID ..." >&2
-if test -d /proc/$$; then
-	printf 'yes.\n' >&2
-	printf 'CFLAGS   +=	-DHAVE_%s\n' "PROC_PID" >>$CONFIG_MK
-else
-	printf 'no.\n' >&2
-fi
-
 #
 # Check for dirfd().
 #
@@ -455,6 +473,17 @@ int main(void) {
 }'
 check_func "ndir_h" "$src"
 
+#
+# Check for login_cap.h.
+#
+src='
+#include <sys/types.h>
+#include <login_cap.h>
+int main(void) {
+	return 0;
+}'
+check_func "login_cap_h" "$src"
+
 #
 #
 #
@@ -481,5 +510,7 @@ if [ $? -eq 0 ]; then
 else
 	printf 'Using persist method\t\t\tnone.\n' >&2
 fi
-printf 'Setting UID_MAX\t\t\t\t%d.\n' "$UID_MAX" >&2
-printf 'Setting GID_MAX\t\t\t\t%d.\n' "$GID_MAX" >&2
+
+printf '#define DOAS_CONF "%s/doas.conf"\n' "${SYSCONFDIR}" >>$CONFIG_H
+
+printf '\n#endif /* CONFIG_H */\n' >>$CONFIG_H