From b6c2e2acf91ea09b728ee782c48c8c3a19946a4d Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Fri, 19 May 2017 15:24:38 -0600
Subject: [PATCH] require using wolfSSL memory when enabling trackmemory

---
 configure.ac | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 82b2729c9..c94008fc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1257,19 +1257,6 @@ then
 fi
 
 
-# MEMORY SIZE info
-AC_ARG_ENABLE([trackmemory],
-    [AS_HELP_STRING([--enable-trackmemory],[Enable memory use info on wolfCrypt and wolfSSL cleanup (default: disabled)])],
-    [ ENABLED_TRACKMEMORY=$enableval ],
-    [ ENABLED_TRACKMEMORY=no ]
-    )
-
-if test "$ENABLED_TRACKMEMORY" = "yes"
-then
-    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_TRACK_MEMORY"
-fi
-
-
 # MEMORY
 AC_ARG_ENABLE([memory],
     [  --enable-memory         Enable memory callbacks (default: enabled)],
@@ -1292,6 +1279,24 @@ fi
 AM_CONDITIONAL([BUILD_MEMORY], [test "x$ENABLED_MEMORY" = "xyes"])
 
 
+# MEMORY SIZE info
+AC_ARG_ENABLE([trackmemory],
+    [AS_HELP_STRING([--enable-trackmemory],[Enable memory use info on wolfCrypt and wolfSSL cleanup (default: disabled)])],
+    [ ENABLED_TRACKMEMORY=$enableval ],
+    [ ENABLED_TRACKMEMORY=no ]
+    )
+
+if test "$ENABLED_TRACKMEMORY" = "yes"
+then
+    if test "$ENABLED_MEMORY" = "yes"
+    then
+        AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_TRACK_MEMORY"
+    else
+        AC_MSG_ERROR([trackmemory requires using wolfSSL memory (--enable-memory).])
+    fi
+fi
+
+
 # RSA
 AC_ARG_ENABLE([rsa],
     [  --enable-rsa            Enable RSA (default: enabled)],