From eb6ed4f85a5bfe0a90137e673089db718001f209 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 24 Aug 2015 14:27:11 +0200 Subject: [PATCH] configure.ac: provide fallback for systems where libcheck is not installed with pkg-config --- bindings/java/Makefile.am | 5 ++++- configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 1703dbfd..ac46edaf 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -103,8 +103,11 @@ TESTS = AllJunitTests AllJunitTests: JAVAFLAGS +="-Dsrcdir=$(srcdir)" AllJunitTests: $(test_source_files:.java=.class) + echo "OBJDIR=`libtool --config | grep ^objdir | sed 's/.*=//'`" echo "#! /bin/sh" > $@ - echo "OBJDIR=`libtool --config | grep ^objdir | sed s/.*=//`" >> $@ + echo "OBJDIR=`libtool --config | grep ^objdir | sed 's/.*=//'`" >> $@ + cat $@ + echo $@ echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR BindingTests' >> $@ echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR LoginTest' >> $@ chmod +x $@ diff --git a/configure.ac b/configure.ac index aec42919..58698c3b 100644 --- a/configure.ac +++ b/configure.ac @@ -605,7 +605,11 @@ dnl Check if user disabled the tests. AC_ARG_ENABLE(tests, [ --disable-tests disable the test suite],, enable_tests="yes") if test "x$enable_tests" = xyes ; then - PKG_CHECK_MODULES(CHECK, check) + PKG_CHECK_MODULES(CHECK, check, [], [ +AC_CHECK_LIB(check, srunner_set_log, enable_tests="yes", enable_tests="no") +CHECK_CFLAGS="" +CHECK_LIBS="-lcheck" +]) AC_SUBST(CHECK_CFLAGS) AC_SUBST(CHECK_LIBS) AC_CHECK_LIB(check, srunner_set_xml, [AC_DEFINE(CHECK_IS_XML, [], [Define if check available with XML support])])