X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=configure;h=1c5d9899bda3981acab60fa5669455991c7008fd;hb=454489f79baa3ee1c56498a1c35606b43822f138;hp=f5f3f47309d78f1c7641f3aedcf62fe2f8cc4669;hpb=378157c652e44f521578b79867a76902e0a22cf6;p=opendoas.git

diff --git a/configure b/configure
index f5f3f47..1c5d989 100755
--- a/configure
+++ b/configure
@@ -116,7 +116,11 @@ case "$OS" in
 		;;
 	netbsd)
 		OS_CFLAGS="$OS_CFLAGS -D_OPENBSD_SOURCE"
-		printf 'LDFLAGS  +=	-lutil\n' >>$CONFIG_MK
+		printf 'LDLIBS +=	-lutil\n' >>$CONFIG_MK
+		: ${BINGRP:=wheel}
+		;;
+	freebsd)
+		printf 'LDLIBS +=	-lutil\n' >>$CONFIG_MK
 		: ${BINGRP:=wheel}
 		;;
 	darwin)
@@ -149,7 +153,7 @@ BINGRP  ?=	${BINGRP}
 EOF
 
 [ -n "$OS_CFLAGS" ] && \
-	printf 'CFLAGS   +=	%s\n' "$OS_CFLAGS" >>$CONFIG_MK
+	printf 'OS_CFLAGS   +=	%s\n' "$OS_CFLAGS" >>$CONFIG_MK
 
 [ -n "$DEBUG" ] && \
 	printf 'CFLAGS   +=	-O0 -g\n' >>$CONFIG_MK
@@ -157,8 +161,8 @@ EOF
 [ -n "$BUILD_STATIC" ] && \
 	printf 'CFLAGS   +=	-static\n' >>$CONFIG_MK
 
-# Add CPPFLAGS/CFLAGS/LDFLAGS to CC for testing features
-XCC="${CC:=cc} $CFLAGS $OS_CFLAGS $CPPFLAGS $LDFLAGS"
+# Add CPPFLAGS/CFLAGS/LDFLAGS/LDLIBS to CC for testing features
+XCC="${CC:=cc} $CFLAGS $OS_CFLAGS $CPPFLAGS $LDFLAGS $LDLIBS"
 # Make sure to disable --as-needed for CC tests.
 
 case "$OS" in
@@ -196,7 +200,7 @@ 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 'LDLIBS +=	-lpam\n' >>$CONFIG_MK
 		printf '#define USE_PAM\n' >>$CONFIG_H
 		printf 'pam\n'
 
@@ -215,7 +219,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 'LDLIBS +=	-lcrypt\n' >>$CONFIG_MK
 		printf '#define USE_SHADOW\n' >>$CONFIG_H
 		printf 'shadow\n'
 		return 0
@@ -294,9 +298,10 @@ check_func "errc" "$src" || {
 # Check for verrc().
 #
 src='
+#include <stddef.h>
 #include <err.h>
 int main(void) {
-	verrc(0, 0, "");
+	verrc(0, 0, "x", NULL);
 	return 0;
 }'
 check_func "verrc" "$src" || {
@@ -380,9 +385,47 @@ int main(void) {
 	setresuid(0, 0, 0);
 	return 0;
 }'
-check_func "setresuid" "$src" || {
+check_func "setresuid" "$src"
+have_setresuid=$?
+
+#
+# Check for setresgid().
+#
+src='
+#include <unistd.h>
+int main(void) {
+	setresgid(0, 0, 0);
+	return 0;
+}'
+check_func "setresgid" "$src"
+have_setresgid=$?
+
+if [ $have_setresuid -eq 1 -o $have_setresgid -eq 1 ]; then
 	printf 'SRCS +=	libopenbsd/bsd-setres_id.c\n' >>$CONFIG_MK
-}
+fi
+
+#
+# Check for setreuid().
+#
+src='
+#include <unistd.h>
+int main(void) {
+	setreuid(0, 0);
+	return 0;
+}'
+check_func "setreuid" "$src"
+
+
+#
+# Check for setregid().
+#
+src='
+#include <unistd.h>
+int main(void) {
+	setregid(0, 0);
+	return 0;
+}'
+check_func "setregid" "$src"
 
 #
 # Check for closefrom().
@@ -502,7 +545,7 @@ int main(void){return 0;}
 __attribute__((__unused__)) static void foo(void){return;}
 '
 check_func "__attribute__" "$src" || {
-	printf 'CFLAGS	+=	-DNO_ATTRIBUTE_ON_RETURN_TYPE=1\n' >>$CONFIG_MK
+	printf 'OS_CFLAGS	+=	-DNO_ATTRIBUTE_ON_RETURN_TYPE=1\n' >>$CONFIG_MK
 }
 
 auth=$(authmethod)