fix err messages

[opendoas.git] / configure

diff --git a/configure b/configure
index 5f896c478aa58a7642a3ca7f2283f09a317c33c4..1bb827fc8e11cd5f2ef713f5ad152c9ecb10b4d4 100755 (executable)
--- a/configure
+++ b/configure
@@ -22,7 +22,6 @@ usage: configure [options]
   --target=target-alias  the machine that CC will produce code for
 
   --enable-debug         enable debugging
-  --enable-seccomp       enable seccomp
   --enable-static        prepare for static build
 
   --help, -h             display this help and exit
@@ -45,7 +44,6 @@ for x; do
        --host) HOST=$var;;
        --target) TARGET=$var;;
        --enable-debug) DEBUG=yes;;
-       --enable-seccomp) BUILD_SECCOMP=yes;;
        --enable-static) BUILD_STATIC=yes;;
        --help|-h) usage;;
        *) die "Error: unknown option $opt";;
@@ -55,7 +53,8 @@ done
 CONFIG_MK=config.mk
 rm -f "$CONFIG_MK"
 
-: ${VERSION:="$(git describe --dirty --tags --long --always)"}
+# : ${VERSION:="$(git describe --dirty --tags --long --always)"}
+: ${VERSION:="0.2"}
 
 cat <<EOF >>$CONFIG_MK
 PREFIX   ?=    ${PREFIX:="/usr"}
@@ -91,11 +90,11 @@ if [ -z "$OS" ]; then
        KERNEL=${REST%%-*}
 fi
 
-OS_FLAGS="-D__${OS}__"
+OS_CFLAGS="-D__${OS}__"
 
 case "$OS" in
        linux)
-               OS_CFLAGS+=" -D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=60000 -DGID_MAX=60000"
+               OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=60000 -DGID_MAX=60000"
                printf 'CURDIR   :=     .\n' >>$CONFIG_MK
                printf 'PAM_DOAS  =     pam.d__doas__linux\n' >>$CONFIG_MK
                ;;
@@ -266,30 +265,28 @@ check_func "bsd_auth_h" "$src" && \
        have_bsd_auth_h=1
 
 #
-# Check for pam_appl.h.
+# Check for sys/tree.h.
 #
 src='
-#include <security/pam_appl.h>
+#include <sys/tree.h>
 int main(void) {
        return 0;
 }'
-[ -z "$have_bsd_auth_h" ] && \
-       check_func "pam_appl_h" "$src" && {
-               printf 'SRCS     +=     doas_pam.c\n' >>$CONFIG_MK
-               printf 'LDFLAGS  +=     -lpam\n' >>$CONFIG_MK
-       }
+check_func "sys_tree_h" "$src"
 
 #
-# Check for login_cap.h.
+# Check for pam_appl.h.
 #
 src='
-#include <login_cap.h>
+#include <security/pam_appl.h>
 int main(void) {
        return 0;
 }'
-check_func "login_cap_h" "$src" || {
-       printf 'OPENBSD  +=     setusercontext.o\n' >>$CONFIG_MK
-}
+[ -z "$have_bsd_auth_h" ] && \
+       check_func "pam_appl_h" "$src" && {
+               printf 'SRCS     +=     pam.c\n' >>$CONFIG_MK
+               printf 'LDFLAGS  +=     -lpam\n' >>$CONFIG_MK
+       }
 
 #
 # Check for execvpe().
@@ -327,27 +324,6 @@ int main(void) {
        pledge("", NULL);
        return 0;
 }'
-check_func "pledge" "$src" && {
-       have_pledge=1
-}
-
-#
-# Check for seccomp.h
-#
-src='
-#include <linux/seccomp.h>
-#include <sys/prctl.h>
-#include <unistd.h>
-int main(void) {
-       prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, NULL);
-       return 0;
-}'
-[ -z "$have_pledge" -a -n "$BUILD_SECCOMP" ] && \
-       check_func "seccomp_h" "$src" && \
-       {
-               have_pledge=1
-               printf 'OPENBSD  +=     pledge-seccomp.o\n' >>$CONFIG_MK
-       }
-
-[ -z "$have_pledge" ] && \
+check_func "pledge" "$src" || {
        printf 'OPENBSD  +=     pledge-noop.o\n' >>$CONFIG_MK
+}