# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1520046664 -28800
# Node ID 0c8c2552b2f27892087bf7bac7e700b7b4f27797
# Parent  b66fc351f7e8e6dfc7da5e8e8b301b28215ab6b0# Parent  e75dab5bec7154a85af958bde27032112f6e605b
merge

diff -r e75dab5bec71 -r 0c8c2552b2f2 Makefile.in
--- a/Makefile.in	Sat Mar 03 04:06:45 2018 +0100
+++ b/Makefile.in	Sat Mar 03 11:11:04 2018 +0800
@@ -61,7 +61,7 @@
 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 -r e75dab5bec71 -r 0c8c2552b2f2 configure.ac
--- a/configure.ac	Sat Mar 03 04:06:45 2018 +0100
+++ b/configure.ac	Sat Mar 03 11:11:04 2018 +0800
@@ -15,6 +15,7 @@
 	AC_MSG_NOTICE([Source directory Mercurial base revision $hgrev])
 fi
 
+ORIGCFLAGS="$CFLAGS"
 # Checks for programs.
 AC_PROG_CC
 
@@ -35,7 +36,7 @@
 }])
 
 # 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