diff mbox

[PATCHv2,05/10] configure: move test_cpp to its own m4 file

Message ID 1459275814-19876-6-git-send-email-anders.roxell@linaro.org
State Accepted
Commit d5a31c0ca45e869c927582cc29f0ca3b720cb4e4
Headers show

Commit Message

Anders Roxell March 29, 2016, 6:23 p.m. UTC 
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 configure.ac             | 16 +---------------
 test/m4/configure.m4     |  1 +
 test/m4/miscellaneous.m4 |  9 +++++++++
 3 files changed, 11 insertions(+), 15 deletions(-)
 create mode 100644 test/m4/miscellaneous.m4
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index cc6a38b..0a9918b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@  AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes])
 AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"])
 AM_CONDITIONAL([test_installdir], [test "$testdir" != ""])
 AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ])
+AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ])
 
 ##########################################################################
 # Setup doxygen documentation
@@ -171,21 +172,6 @@  AC_ARG_ENABLE([test-helper],
     fi])
 
 AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ])
-
-##########################################################################
-# Enable/disable test-cpp
-##########################################################################
-test_cpp=no
-AC_ARG_ENABLE([test-cpp],
-    [  --enable-test-cpp       run basic test aginast cpp],
-    [if test "x$enableval" = "xyes"; then
-        test_cpp=yes
-     else
-        test_cpp=no
-    fi])
-
-AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ])
-
 ##########################################################################
 # Set optional CUnit path
 ##########################################################################
diff --git a/test/m4/configure.m4 b/test/m4/configure.m4
index e4b7d7a..4e16b82 100644
--- a/test/m4/configure.m4
+++ b/test/m4/configure.m4
@@ -1,3 +1,4 @@ 
+m4_include([test/m4/miscellaneous.m4])
 m4_include([test/m4/performance.m4])
 
 AC_CONFIG_FILES([test/Makefile
diff --git a/test/m4/miscellaneous.m4 b/test/m4/miscellaneous.m4
new file mode 100644
index 0000000..cc881ed
--- /dev/null
+++ b/test/m4/miscellaneous.m4
@@ -0,0 +1,9 @@ 
+##########################################################################
+# Enable/disable test-cpp
+##########################################################################
+test_cpp=no
+AC_ARG_ENABLE([test-cpp],
+    [  --enable-test-cpp       run basic test aginast cpp],
+    [if test "x$enableval" = "xyes"; then
+        test_cpp=yes
+    fi])