X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=configure;h=cc23132af55b28df8f411a9574ecfacc87dda662;hb=63a642ef530e6421f2bc3648833611f2048f7638;hp=ea6ce797c9c50b9eb43e4d1317ca7f84f54a98de;hpb=ba41f893e86153ac1788e971ce15b5e395247874;p=opendoas.git

diff --git a/configure b/configure
index ea6ce79..cc23132 100755
--- a/configure
+++ b/configure
@@ -55,10 +55,10 @@ 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
-DESTDIR  ?=
 PREFIX   ?=	${PREFIX:="/usr"}
 EPREFIX  ?=	${EPREFIX:="${PREFIX}"}
 BINDIR   ?=	${BINDIR:="${PREFIX}/bin"}
@@ -92,9 +92,11 @@ if [ -z "$OS" ]; then
 	KERNEL=${REST%%-*}
 fi
 
+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
 		;;
@@ -139,7 +141,7 @@ int main(void) {
 	return 0;
 }'
 check_func "explicit_bzero" "$src" || {
-	printf 'OPENBSD  +=	explicit_bzero.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	explicit_bzero.o\n' >>$CONFIG_MK
 }
 
 
@@ -155,7 +157,7 @@ int main(void) {
 	return 0;
 }'
 check_func "strlcat" "$src" || {
-	printf 'OPENBSD  +=	strlcat.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	strlcat.o\n' >>$CONFIG_MK
 }
 
 #
@@ -170,7 +172,7 @@ int main(void) {
 	return 0;
 }'
 check_func "strlcpy" "$src" || {
-	printf 'OPENBSD  +=	strlcpy.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	strlcpy.o\n' >>$CONFIG_MK
 }
 
 #
@@ -183,7 +185,7 @@ int main(void) {
 	return 0;
 }'
 check_func "errc" "$src" || {
-	printf 'OPENBSD  +=	errc.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	errc.o\n' >>$CONFIG_MK
 }
 
 #
@@ -196,7 +198,7 @@ int main(void) {
 	return 0;
 }'
 check_func "verrc" "$src" || {
-	printf 'OPENBSD  +=	verrc.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	verrc.o\n' >>$CONFIG_MK
 }
 
 #
@@ -209,7 +211,7 @@ int main(void) {
 	return 0;
 }'
 check_func "setprogname" "$src" || {
-	printf 'OPENBSD  +=	progname.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	progname.o\n' >>$CONFIG_MK
 }
 
 #
@@ -223,7 +225,7 @@ int main(void) {
 	return 0;
 }'
 check_func "readpassphrase" "$src" || {
-	printf 'OPENBSD  +=	readpassphrase.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	readpassphrase.o\n' >>$CONFIG_MK
 }
 
 #
@@ -237,7 +239,7 @@ int main(void) {
 	return 0;
 }'
 check_func "strtonum" "$src" || {
-	printf 'OPENBSD  +=	strtonum.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	strtonum.o\n' >>$CONFIG_MK
 }
 
 #
@@ -250,7 +252,7 @@ int main(void) {
 	return 0;
 }'
 check_func "reallocarray" "$src" || {
-	printf 'OPENBSD  +=	reallocarray.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	reallocarray.o\n' >>$CONFIG_MK
 }
 
 #
@@ -275,6 +277,7 @@ int main(void) {
 [ -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
 	}
 
 #
@@ -286,7 +289,7 @@ int main(void) {
 	return 0;
 }'
 check_func "login_cap_h" "$src" || {
-	printf 'OPENBSD  +=	setusercontext.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	setusercontext.o\n' >>$CONFIG_MK
 }
 
 #
@@ -300,7 +303,7 @@ int main(void) {
 	return 0;
 }'
 check_func "execvpe" "$src" || {
-	printf 'OPENBSD  +=	execvpe.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	execvpe.o\n' >>$CONFIG_MK
 }
 
 #
@@ -313,7 +316,7 @@ int main(void) {
 	return 0;
 }'
 check_func "setresuid" "$src" || {
-	printf 'OPENBSD  +=	setresuid.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	setresuid.o\n' >>$CONFIG_MK
 }
 
 #
@@ -344,8 +347,8 @@ int main(void) {
 	check_func "seccomp_h" "$src" && \
 	{
 		have_pledge=1
-		printf 'OPENBSD  +=	pledge-seccomp.c\n' >>$CONFIG_MK
+		printf 'OPENBSD  +=	pledge-seccomp.o\n' >>$CONFIG_MK
 	}
 
 [ -z "$have_pledge" ] && \
-	printf 'OPENBSD  +=	pledge-noop.c\n' >>$CONFIG_MK
+	printf 'OPENBSD  +=	pledge-noop.o\n' >>$CONFIG_MK