From 6737f5beb97181881ee652326f06bc5a30ba0653 Mon Sep 17 00:00:00 2001
From: toddouska <todd@yassl.com>
Date: Wed, 24 Oct 2012 11:53:33 -0700
Subject: [PATCH] Brian changes

---
 configure.ac                   | 15 ++++++---------
 m4/ax_harden_compiler_flags.m4 |  2 ++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 628144b64..84a4a0b39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,9 +74,7 @@ AC_CHECK_SIZEOF(long, 4)
 AC_C_BIGENDIAN
 AC_DISABLE_STATIC
 AC_DISABLE_STATIC
-AC_FUNC_MALLOC
 AC_FUNC_MKTIME
-AC_FUNC_REALLOC
 
 AC_PROG_CC
 AC_PROG_CC_C_O
@@ -97,10 +95,9 @@ DEBUG_CFLAGS="-g -DDEBUG -DDEBUG_CYASSL"
 
 # DEBUG
 AX_DEBUG
-AS_IF([ test "$ax_enable_debug" = "yes" ],[
-       AM_CFLAGS="$DEBUG_CFLAGS $AM_CFLAGS" ],[
-          AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
-          ])
+AS_IF([test "$ax_enable_debug" = "yes"],
+      [AM_CFLAGS="$DEBUG_CFLAGS $AM_CFLAGS"],
+      [AM_CFLAGS="$AM_CFLAGS -DNDEBUG"])
 
 
 # SMALL BUILD
@@ -704,9 +701,9 @@ fi])
 AX_HARDEN_CC_COMPILER_FLAGS
 
 CREATE_HEX_VERSION
-AC_SUBST(AM_CPPFLAGS)
-AC_SUBST(AM_CFLAGS)
-AC_SUBST(AM_LDFLAGS)
+AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_LDFLAGS])
 
 # FINAL
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4
index 154104cb6..5818cf24b 100644
--- a/m4/ax_harden_compiler_flags.m4
+++ b/m4/ax_harden_compiler_flags.m4
@@ -148,6 +148,7 @@
       AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],,[$ax_append_compile_cflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_cflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_cflags_extra])
+      AX_APPEND_COMPILE_FLAGS([-Wunused],,[$ax_append_compile_cflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_cflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_cflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_cflags_extra])
@@ -211,6 +212,7 @@
       AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_cxxflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_cxxflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wc++11-compat],,[$ax_append_compile_cxxflags_extra])
+      AX_APPEND_COMPILE_FLAGS([-Wunused],,[$ax_append_compile_cxxflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_cxxflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_cxxflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_cxxflags_extra])