fix make install

[opendoas.git] / configure

diff --git a/configure b/configure
index 98699daa0dfd6dc7af9165036f5c5ddc6a800585..ea6ce797c9c50b9eb43e4d1317ca7f84f54a98de 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,45 +1,72 @@
 #!/bin/sh
 
+die() {
+       printf "$1\n" >&2
+       exit 1
+}
+
+usage() {
+       cat <<EOF
+usage: configure [options]
+
+  --prefix=PREFIX        installation prefix [/usr]
+  --exec-prefix=EPREFIX  installation prefix for executable files [PREFIX]
+  --bindir=DIR           user executables [PREFIX/bin]
+  --datadir=DIR          architecture-independent data files [PREFIX/share]
+  --mandir=DIR           manual pages [DATADIR/man]
+  --sysconfdir=DIR       directory for configuration files [/etc]
+  --pamdir=DIR           PAM directory [SYSCONFDIR/pam.d]
+
+  --build=build-alias    a cpu-vendor-opsys for the system where the application will be built
+  --host=host-alias      a cpu-vendor-opsys for the system where the application will run
+  --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
+EOF
+       exit 0
+}
+
 for x; do
        opt=${x%%=*}
        var=${x#*=}
        case "$opt" in
-       --enable-debug) DEBUG=yes;;
        --prefix) PREFIX=$var;;
        --exec-prefix) EPREFIX=$var;;
        --bindir) BINDIR=$var;;
-       --mandir) MANDIR=$var;;
        --datadir) SHAREDIR=$var;;
+       --mandir) MANDIR=$var;;
+       --sysconfdir) SYSCONFDIR=$var;;
+       --pamdir) PAMDIR=$var;;
        --build) BUILD=$var;;
        --host) HOST=$var;;
        --target) TARGET=$var;;
-       --includedir) INCLUDEDIR=$var;;
-       --sysconfdir) SYSCONFDIR=$var;;
-       --pamdir) PAMDIR=$var;;
-       --localstatedir) LOCALSTATEDIR=$var;;
-       --libdir) LIBDIR=$var;;
-       --datadir|--infodir) ;; # ignore autotools
-       --verbose) unset SILENT;;
-       --pkgconfigdir) PKGCONFIGDIR=$var;;
-       --enable-static) BUILD_STATIC=yes;;
+       --enable-debug) DEBUG=yes;;
        --enable-seccomp) BUILD_SECCOMP=yes;;
-       --help) usage;;
-       *) echo "$0: WARNING: unknown option $opt" >&2;;
+       --enable-static) BUILD_STATIC=yes;;
+       --help|-h) usage;;
+       *) die "Error: unknown option $opt";;
        esac
 done
 
 CONFIG_MK=config.mk
 rm -f "$CONFIG_MK"
 
+: ${VERSION:="$(git describe --dirty --tags --long --always)"}
+
 cat <<EOF >>$CONFIG_MK
-DESTDIR  ?=    /
+DESTDIR  ?=
 PREFIX   ?=    ${PREFIX:="/usr"}
 EPREFIX  ?=    ${EPREFIX:="${PREFIX}"}
-SHAREDIR ?=    ${SHAREDIR:="${PREFIX}/share"}
 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
@@ -76,6 +103,12 @@ esac
 [ -n "$OS_CFLAGS" ] && \
        printf 'CFLAGS   +=     %s\n' "$OS_CFLAGS" >>$CONFIG_MK
 
+[ -n "$DEBUG" ] && \
+       printf 'CFLAGS   +=     -O0 -g\n' >>$CONFIG_MK
+
+[ -n "$BUILD_STATIC" ] && \
+       printf 'CFLAGS   +=     -static\n' >>$CONFIG_MK
+
 # Add CPPFLAGS/CFLAGS/LDFLAGS to CC for testing features
 XCC="${CC:=clang} $CFLAGS $OS_CFLAGS $CPPFLAGS $LDFLAGS"
 # Make sure to disable --as-needed for CC tests.
@@ -228,9 +261,21 @@ src='
 int main(void) {
        return 0;
 }'
-check_func "bsd_auth_h" "$src" || {
-       printf 'OPENBSD  +=     auth_userokay.c\n' >>$CONFIG_MK
-}
+check_func "bsd_auth_h" "$src" && \
+       have_bsd_auth_h=1
+
+#
+# Check for pam_appl.h.
+#
+src='
+#include <security/pam_appl.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
+       }
 
 #
 # Check for login_cap.h.