summary refs log tree commit diff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure32
1 files changed, 8 insertions, 24 deletions
diff --git a/configure b/configure
index b0f818f..88bfb1a 100755
--- a/configure
+++ b/configure
@@ -1,36 +1,20 @@
 #!/bin/sh
 set -eu
 
-case "$(uname)" in
-	(FreeBSD)
-		if ! pkg info -e libressl; then
-			echo 'LibreSSL required'
-			exit 1
-		fi
-		prefix=$(pkg query '%p' libressl)
-		cat >config.mk <<-EOF
-		CFLAGS += -I${prefix}/include
-		CFLAGS += -D'OPENSSL_BIN="${prefix}/bin/openssl"'
-		LDFLAGS += -L${prefix}/lib
-		EOF
-		exit
-		;;
-esac
+exec >config.mk
 
 libs='libcrypto libtls ncursesw'
 pkg-config --print-errors $libs
 
-cat >config.mk <<EOF
+cat <<EOF
 CFLAGS += $(pkg-config --cflags $libs)
-CFLAGS += -D'OPENSSL_BIN="$(pkg-config --variable=prefix openssl)/bin/openssl"'
+CFLAGS += -D'OPENSSL_BIN="$(pkg-config --variable=exec_prefix openssl)/bin/openssl"'
 LDFLAGS += $(pkg-config --libs-only-L $libs)
 LDLIBS = $(pkg-config --libs-only-l $libs)
 EOF
 
-case "$(uname)" in
-	(Linux)
-		if ! grep -q -e '-D_GNU_SOURCE' config.mk; then
-			echo 'CFLAGS += -D_GNU_SOURCE' >> config.mk
-		fi
-		;;
-esac
+if [ "$(uname)" = 'Linux' ]; then
+	cat <<-EOF
+	CFLAGS += -D_GNU_SOURCE
+	EOF
+fi
w=1'>output: Fix fmtstr return valueHerbert Xu 2018-05-28var: Set IFS to fixed value at start timeHerbert Xu 2018-05-28parser: Save/restore here-documents in command substitutionHerbert Xu 2018-05-28jobs: Only clear gotsigchld when waiting for everythingHerbert Xu 2018-05-28mkinit: Split reset into exitreset and resetHerbert Xu 2018-05-28main: Only set savestatus in exitcmdHerbert Xu 2018-05-28exec: Return 126 on most errors in shellexecHerbert Xu 2018-05-17Release 0.5.10.2.Herbert Xu 2018-05-15parser: Fix incorrect eating of backslash newlinesHerbert Xu 2018-05-10Release 0.5.10.1.Herbert Xu 2018-05-09jobs - Do not block when waiting on SIGCHLDHerbert Xu 2018-05-03Release 0.5.10.Herbert Xu 2018-04-19eval: Variable assignments on functions are no longer persistentHerbert Xu 2018-04-19parser: Fix parameter expansion inside inner double quotesHerbert Xu 2018-04-19parser: Fix parsing of ${}Herbert Xu 2018-04-19man: correct typos, iff -> ifMartijn Dekker 2018-04-19expand: Do not quote backslashes in unquoted parameter expansionHerbert Xu 2018-04-19shell: Add subdir-objects to AM_INIT_AUTOMAKEJason Bowen 2018-04-19eval: Restore input files in evalcommandHerbert Xu 2018-04-19eval: Reap zombies after built-in commands and functionsHerbert Xu 2018-04-19redir: Fix typo in noclobber codeHerbert Xu 2018-04-19expand: Fix glibc glob(3) supportHerbert Xu 2018-04-02expand: Fix buffer overflow in expandmetaHerbert Xu 2018-04-02builtin: Move echo space/nl handling into print_escape_strHerbert Xu 2018-04-02builtin: Fix echo performance regressionHerbert Xu 2018-04-02expand: Fix ghost fields with unquoted $@/$*Herbert Xu 2018-04-02parser: Allow newlines within parameter substitutionHerbert Xu 2018-04-02expand: Fix bugs with words connected to the right of $@Herbert Xu 2018-03-25Revert "[BUILTIN] Remove unnecessary restoration of format string in printf"Herbert Xu 2018-03-22parser: Fix backquote support in here-document EOF markHerbert Xu