diff options
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | test/m4/configure.m4 | 1 | ||||
| -rw-r--r-- | test/m4/miscellaneous.m4 | 9 |
3 files changed, 11 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index cc6a38b7c..0a9918b81 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 e4b7d7a50..4e16b82ba 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 000000000..cc881edb7 --- /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]) |