Bug 3836: Fix issues with automake 1.13 and later and make check

diff --git a/configure.ac b/configure.ac
index 038e16067a1e26a09b88e56493d529c507d2b49e..8ac4aa7b2a801d3657c9d632debc7ddbd676d8b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -844,13 +844,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 7be4f7aae3183257ef426de61c010e21489dcc94..cfe1bf0ac4aea1c9d6466ab909446de34b9db1dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1093,8 +1093,14 @@ check_PROGRAMS+=\
        tests/testURL \
        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)