=== modified file 'configure.in' --- configure.in 2009-03-13 21:54:28 +0000 +++ configure.in 2009-03-28 11:31:39 +0000 @@ -510,6 +510,12 @@ STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT" fi +AH_TEMPLATE(HAVE_FS_UFS, "Define to 1 if ufs filesystem module is build") +AH_TEMPLATE(HAVE_FS_AUFS, "Define to 1 if aufs filesystem module is build") +AH_TEMPLATE(HAVE_FS_DISKD, "Define to 1 if diskd filesystem module is build") +AH_TEMPLATE(HAVE_FS_COSS, "Define to 1 if coss filesystem module is build") + + dnl got final STORE_MODULES, build library lists dnl This list will not be needed when each fs library has its own Makefile STORE_LIBS_TO_BUILD= @@ -519,6 +525,8 @@ for fs in $STORE_MODULES; do STORE_LIBS_TO_BUILD="$STORE_LIBS_TO_BUILD lib${fs}.a" STORE_LIBS_TO_ADD="$STORE_LIBS_TO_ADD fs/lib${fs}.a" + HAVE_FS_TYPE=HAVE_FS_`echo $fs | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + AC_DEFINE_UNQUOTED($HAVE_FS_TYPE, 1) done AC_SUBST(STORE_LIBS_TO_BUILD) === added file 'src/FsReg.cc' --- src/FsReg.cc 1970-01-01 00:00:00 +0000 +++ src/FsReg.cc 2009-03-28 11:53:03 +0000 @@ -0,0 +1,28 @@ +#include "squid.h" +#if defined(HAVE_FS_UFS) || defined(HAVE_FS_AUFS) || defined(HAVE_FS_DISKD) +#include "fs/ufs/StoreFSufs.h" +#include "fs/ufs/ufscommon.h" +#endif + +#ifdef HAVE_FS_COSS +#include "fs/coss/StoreFScoss.h" +#endif + +#ifdef HAVE_FS_UFS +extern StoreFSufs UfsInstance; +static const char *ufstype = UfsInstance.type(); +#endif + +#ifdef HAVE_FS_AUFS +extern StoreFSufs AufsInstance; +static const char *aufstype = AufsInstance.type(); +#endif + +#ifdef HAVE_FS_DISKD +extern StoreFSufs DiskdInstance; +static const char *diskdtype = DiskdInstance.type(); +#endif + +#ifdef HAVE_FS_COSS +static const char *cosstype = StoreFScoss::GetInstance().type(); +#endif === modified file 'src/fs/aufs/StoreFSaufs.cc' --- src/fs/aufs/StoreFSaufs.cc 2009-01-21 03:47:47 +0000 +++ src/fs/aufs/StoreFSaufs.cc 2009-03-28 09:48:04 +0000 @@ -51,4 +51,4 @@ */ /// \ingroup AUFS -static StoreFSufs AufsInstance("DiskThreads", "aufs"); +StoreFSufs AufsInstance("DiskThreads", "aufs"); === modified file 'src/fs/diskd/StoreFSdiskd.cc' --- src/fs/diskd/StoreFSdiskd.cc 2009-01-21 03:47:47 +0000 +++ src/fs/diskd/StoreFSdiskd.cc 2009-03-28 09:48:29 +0000 @@ -49,4 +49,4 @@ */ /// \ingroup diskd -static StoreFSufs DiskdInstance("DiskDaemon", "diskd"); +StoreFSufs DiskdInstance("DiskDaemon", "diskd"); === modified file 'src/fs/ufs/StoreFSufs.cc' --- src/fs/ufs/StoreFSufs.cc 2009-01-21 03:47:47 +0000 +++ src/fs/ufs/StoreFSufs.cc 2009-03-28 09:48:18 +0000 @@ -46,5 +46,5 @@ /** \todo FIXME: break UFSSwapDir out so we don't build all the extras */ #include "fs/ufs/ufscommon.h" -static StoreFSufs UfsInstance("Blocking", "ufs"); +StoreFSufs UfsInstance("Blocking", "ufs");