------------------------------------------------------------ revno: 13015 revision-id: squid3@treenet.co.nz-20131024150912-0sue3ao2w2fqy6x7 parent: squid3@treenet.co.nz-20131024150727-sjkxqohus0nu8i7d fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3836 author: Francesco Chemolli committer: Amos Jeffries branch nick: 3.4 timestamp: Thu 2013-10-24 09:09:12 -0600 message: Bug 3836: Fix issues with automake 1.13 and later and make check ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131024150912-0sue3ao2w2fqy6x7 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: 27dc2f2de70766ea0dae2496626b38ace9af27bc # timestamp: 2013-10-24 15:12:14 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20131024150727-\ # sjkxqohus0nu8i7d # # Begin patch === modified file 'configure.ac' --- configure.ac 2013-10-23 05:11:22 +0000 +++ configure.ac 2013-10-24 15:09:12 +0000 @@ -844,13 +844,16 @@ "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") === modified file 'src/Makefile.am' --- src/Makefile.am 2013-06-20 09:56:11 +0000 +++ src/Makefile.am 2013-10-24 15:09:12 +0000 @@ -1093,8 +1093,14 @@ 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)