Re: Broken Squid-3 on Windows: diskd helper builds even when not configured

Looks good to me.

Robert?

Regards
Henrik

sön 2003-02-02 klockan 12.18 skrev Guido Serassio:
> Hi,
>
> Building the nt branch, I have found that the diskd helper is build even
> when diskd is not configured.
> The following patch to HEAD seem to fix the problem. I don't know if this
> is the better solution.
>
> Index: configure.in
> ===================================================================
> RCS file: /cvsroot/squid/squid3/configure.in,v
> retrieving revision 1.19
> diff -u -p -r1.19 configure.in
> --- configure.in 28 Jan 2003 03:13:17 -0000 1.19
> +++ configure.in 2 Feb 2003 11:12:53 -0000
> @@ -389,6 +389,7 @@ for fs in $STORE_MODULES none; do
> case "$fs" in
> diskd)
> STORE_MODULE_SUBDIRS="$STORE_MODULE_SUBDIRS $fs"
> + STORE_PROGRAMS="$STORE_PROGRAMS diskd/diskd"
> ;;
> aufs)
> if test -z "$with_pthreads"; then
> @@ -417,6 +418,7 @@ if test -z "$UFS_FOUND"; then
> fi
>
> AC_SUBST(STORE_MODULES)
> +AC_SUBST(STORE_PROGRAMS)
> AC_SUBST(STORE_MODULE_SUBDIRS)
>
> dnl --enable-heap-replacement compability option
> Index: ./src/fs/Makefile.am
> ===================================================================
> RCS file: /cvsroot/squid/squid3/src/fs/Makefile.am,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile.am
> --- ./src/fs/Makefile.am 28 Jan 2003 03:13:09 -0000 1.4
> +++ ./src/fs/Makefile.am 2 Feb 2003 11:12:53 -0000
> @@ -20,7 +20,8 @@ libdiskd_a_SOURCES = diskd/diskd.cc disk
> diskd/store_diskd.h \
> diskd/store_io_diskd.cc
>
> -libexec_PROGRAMS = diskd/diskd
> +EXTRA_PROGRAMS = diskd/diskd
> +libexec_PROGRAMS = @STORE_PROGRAMS@
> diskd_diskd_SOURCES = diskd/diskd.cc diskd/dio.h
> diskd_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@
>
> Regards
>
> Guido
>
>
>
> -
> =======================================================
> Serassio Guido
> Via Albenga, 11/4 10134 - Torino - ITALY
> E-mail: guido.serassio@serassio.it
> WWW: http://www.serassio.it

-- 
Henrik Nordstrom <hno@squid-cache.org>
MARA Systems AB, Sweden