Skip to content
Snippets Groups Projects
Commit 2ea7975a authored by Brian Carrier's avatar Brian Carrier
Browse files

reverting change from #921 since it has been hard to get working on other platforms

parent bc8e9d6d
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,8 @@ AC_CONFIG_SRCDIR([tsk/base/tsk_base.h]) ...@@ -18,6 +18,8 @@ AC_CONFIG_SRCDIR([tsk/base/tsk_base.h])
AC_CONFIG_HEADERS([tsk/tsk_config.h]) AC_CONFIG_HEADERS([tsk/tsk_config.h])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
AM_PATH_CPPUNIT(1.12.1)
AM_CONDITIONAL([CPPUNIT],[test "x$no_cppunit" = x])
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
...@@ -29,9 +31,9 @@ AC_PROG_CPP ...@@ -29,9 +31,9 @@ AC_PROG_CPP
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PATH_PROG(PKGCONFIG,[pkg-config])
AC_PATH_PROG(PERL, perl) AC_PATH_PROG(PERL, perl)
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
dnl AC_HEADER_MAJOR dnl AC_HEADER_MAJOR
...@@ -82,9 +84,6 @@ AX_PTHREAD([ ...@@ -82,9 +84,6 @@ AX_PTHREAD([
LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"],[]) CC="$PTHREAD_CC"],[])
PKG_CHECK_MODULES([CPPUNIT],[cppunit >= 1.12.1],[ac_cv_cppunit=yes],[ac_cv_cppunit=no])
AM_CONDITIONAL([CPPUNIT],[test "x$ac_cv_cppunit" = xyes])
dnl Permit single-threaded builds dnl Permit single-threaded builds
AC_ARG_ENABLE([multithreading], AC_ARG_ENABLE([multithreading],
[AS_HELP_STRING([--disable-multithreading], [Build without multithreading support])]) [AS_HELP_STRING([--disable-multithreading], [Build without multithreading support])])
...@@ -353,7 +352,6 @@ Building: ...@@ -353,7 +352,6 @@ Building:
zlib support: $ax_zlib zlib support: $ax_zlib
Features: Features:
cppunit support: $ac_cv_cppunit
Java/JNI support: $ax_java_support Java/JNI support: $ax_java_support
Multithreading: $ax_multithread Multithreading: $ax_multithread
]); ]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment