summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--INSTALL6
-rw-r--r--Makefile.in5
-rw-r--r--configure.ac2
3 files changed, 8 insertions, 5 deletions
diff --git a/INSTALL b/INSTALL
index 6ccdde8..58ba328 100644
--- a/INSTALL
+++ b/INSTALL
@@ -22,7 +22,11 @@ recompiling - bad things will happen otherwise)
See MULTI for instructions on making all-in-one binaries.
-If you want to compile statically, add "STATIC=1" to the make command-line.
+If you want to compile statically use ./configure --enable-static
+
+By default Dropbear adds various build flags that improve robustness
+against programming bugs (good for security) - if these cause problems
+they can be disabled with ./configure --disable-harden
Binaries can be stripped with "make strip"
diff --git a/Makefile.in b/Makefile.in
index 0dfbe18..f9f9a46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,12 +2,11 @@
# @configure_input@
# invocation:
-# make PROGRAMS="dropbear dbclient scp" MULTI=1 STATIC=1 SCPPROGRESS=1
+# make PROGRAMS="dropbear dbclient scp" MULTI=1 SCPPROGRESS=1
#
-# to make a multiple-program statically linked binary "staticdropbearmulti".
+# to make a multiple-program binary "dropbearmulti".
# This example will include dropbear, scp, dropbearkey, dropbearconvert, and
# dbclient functionality, and includes the progress-bar functionality in scp.
-# Hopefully that seems intuitive.
ifndef PROGRAMS
PROGRAMS=dropbear dbclient dropbearkey dropbearconvert
diff --git a/configure.ac b/configure.ac
index cb22223..8be542a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
STATIC=0
AC_ARG_ENABLE(static,
- [ --enable-static Build static binaries],
+ [ --enable-static Build static binaries],
[
if test "x$enableval" = "xyes"; then
STATIC=1