summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--configure.ac3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 2238bf3..479e188 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ CONVERTOBJS=dropbearconvert.o keyimport.o
SCPOBJS=scp.o progressmeter.o atomicio.o scpmisc.o compat.o
ifeq (@DROPBEAR_FUZZ@, 1)
- allobjs = $(COMMONOBJS) fuzz-common.o fuzz-wrapfd.o $(CLISVROBJS) $(CLIOBJS) $(SVROBJS)
+ allobjs = $(COMMONOBJS) fuzz-common.o fuzz-wrapfd.o $(CLISVROBJS) $(CLIOBJS) $(SVROBJS) @CRYPTLIB@
allobjs:=$(subst svr-main.o, ,$(allobjs))
allobjs:=$(subst cli-main.o, ,$(allobjs))
allobjs:=$(sort $(allobjs))
diff --git a/configure.ac b/configure.ac
index 6621120..d1b2602 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,7 @@ if test -s "`which hg`" && test -d "$srcdir/.hg"; then
AC_MSG_NOTICE([Source directory Mercurial base revision $hgrev])
fi
+ORIGCFLAGS="$CFLAGS"
# Checks for programs.
AC_PROG_CC
@@ -35,7 +36,7 @@ AC_DEFUN(DB_TRYADDCFLAGS,
}])
# set compile flags prior to other tests
-if test -z "$OLDCFLAGS" && test "$GCC" = "yes"; then
+if test -z "$ORIGCFLAGS" && test "$GCC" = "yes"; then
AC_MSG_NOTICE(No \$CFLAGS set... using "-Os -W -Wall" for GCC)
CFLAGS="-Os -W -Wall"
fi