From 3626ab5ed58ef809d41bc5e3c8b5d154598b6ebc Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Thu, 24 Oct 2013 09:39:19 -0600 Subject: [PATCH] Bug 3836: Fix issues with automake 1.13 and later and make check --- configure.ac | 9 ++++++--- src/Makefile.am | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index cf0c556dbd..566fcf2cd2 100644 --- a/configure.ac +++ b/configure.ac @@ -820,13 +820,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 a33cf840fd..42438e4921 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1089,6 +1089,10 @@ check_PROGRAMS+=\ tests/testStatHist \ $(STORE_TESTS) +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.2