Fix issues with automake 1.13 and later and make check

diff --git a/configure.ac b/configure.ac
index 40b2391568f7646e7421dec3d089768204223384..978ec7366d5c377d5e2fc9f616b52b4eecac3558 100644 (file)
--- 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 12f19f1352ea4879578cabbf3e4585ce5041569b..21a80c9fe850869cca5cced81704bfe9e88d983d 100644 (file)
--- 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)