From b5377bef6eceeaf0395f4050454504bcce8bd5e8 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sat, 19 Oct 2013 17:19:45 +0200 Subject: [PATCH] Fix issues with automake 1.13 and later and make check --- configure.ac | 9 ++++++--- src/Makefile.am | 10 ++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 40b2391568..978ec7366d 100644 --- a/configure.ac +++ b/configure.ac @@ -833,13 +833,16 @@ for fs in $squid_storeio_module_candidates none; do "x$squid_disk_module_candidates_Blocking" != "xyes"; then AC_MSG_ERROR([Storage module Rock requires IpcIo or Blocking DiskIO module]) fi - STORE_TESTS="$STORE_TESTS tests/testRock$EXEEXT" + squid_do_build_rock=true ;; ufs) - STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT" + squid_do_build_ufs=true + ;; esac done - + +AM_CONDITIONAL(HAVE_FS_UFS,[test "x$squid_do_build_ufs" = "xtrue" ]) +AM_CONDITIONAL(HAVE_FS_ROCK,[test "x$squid_do_build_rock" = "xtrue" ]) dnl hack: need to define those even if not used in the build system to dnl make sure that global FS objects are linked to the squid binary. AH_TEMPLATE(HAVE_FS_UFS, "Define to 1 if ufs filesystem module is build") diff --git a/src/Makefile.am b/src/Makefile.am index 12f19f1352..21a80c9fe8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1078,8 +1078,14 @@ check_PROGRAMS+=\ tests/testSBuf \ tests/testConfigParser \ tests/testStatHist \ - tests/testVector \ - $(STORE_TESTS) + tests/testVector + +if HAVE_FS_ROCK +check_PROGRAMS += tests/testRock +endif +if HAVE_FS_UFS +check_PROGRAMS += tests/testUfs +endif ## NP: required to run the above list. check_PROGRAMS only builds the binaries... TESTS += $(check_PROGRAMS) -- 2.47.3