--------------------- PatchSet 406 Date: 2002/12/15 19:13:30 Author: rbcollins Branch: unify-io Tag: (none) Log: always build ufs store, to include common logic Members: configure.in:1.13.4.2->1.13.4.3 Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.13.4.2 retrieving revision 1.13.4.3 diff -u -r1.13.4.2 -r1.13.4.3 --- squid3/configure.in 9 Dec 2002 09:36:31 -0000 1.13.4.2 +++ squid3/configure.in 15 Dec 2002 19:13:30 -0000 1.13.4.3 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.13.4.2 2002/12/09 09:36:31 rbcollins Exp $ +dnl $Id: configure.in,v 1.13.4.3 2002/12/15 19:13:30 rbcollins Exp $ dnl dnl dnl @@ -13,7 +13,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 3.0-DEVEL-unifyio) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.13.4.2 $)dnl +AC_REVISION($Revision: 1.13.4.3 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -362,6 +362,7 @@ dnl remove all but diskd - its the only module that needs to recurse dnl into the sub directory STORE_MODULE_SUBDIRS= +UFS_FOUND= for fs in $STORE_MODULES none; do case "$fs" in diskd) @@ -379,8 +380,20 @@ with_aio=yes fi ;; + ufs) + UFS_FOUND="true" esac done + +if test -z "$UFS_FOUND"; then + echo "adding UFS, as it contains core logic for diskd and aufs" + STORE_OBJS="$STORE_OBJS fs/libufs.a" + AC_SUBST(STORE_OBJS) + STORE_LIBS="$STORE_LIBS libufs.a" + AC_SUBST(STORE_LIBS) + STORE_MODULES="$STORE_MODULES ufs" +fi + AC_SUBST(STORE_MODULES) AC_SUBST(STORE_MODULE_SUBDIRS)