From: Masashi Fujita <objectx@bandit.co.jp>

        1) --enable-acltree message displayed while running configure
           seems to be reveresed (typo?).
        2) --enable-dlmalloc seems to be of no effect.
           (src/Makefile doesn't refer @LIB_MALLOC@.)
        3) Could not build squid outside of source tree.

diff --git a/configure b/configure
index 33b7bb5b173c4bd215ec3aa058ed0958ac1980d0..904cc07613f62062108ded509d871dde12e5cafc 100755 (executable)
--- a/configure
+++ b/configure
@@ -558,7 +558,7 @@ fi
 
 
 
-# From configure.in Revision: 1.95 
+# From configure.in Revision: 1.96 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -969,14 +969,14 @@ if test "${enable_acltree+set}" = set; then
   enableval="$enable_acltree"
    case "$enableval" in
   splay)
-       echo "ACL lists using BIN trees"
+       echo "ACL lists using SPLAY trees"
        cat >> confdefs.h <<\EOF
 #define USE_SPLAY_TREE 1
 EOF
 
        ;;
   yes|bin)
-       echo "ACL lists using SPLAY trees"
+       echo "ACL lists using BIN trees"
        cat >> confdefs.h <<\EOF
 #define USE_BIN_TREE 1
 EOF

diff --git a/configure.in b/configure.in
index a91a380aa54435ca70d5f47b40c005587d8cdda9..a6cf06a29cdebf989dc77647fa87532b40fd93fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.96 1998/01/31 05:00:52 wessels Exp $
+dnl  $Id: configure.in,v 1.97 1998/02/02 19:39:22 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.96 $)dnl
+AC_REVISION($Revision: 1.97 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -201,11 +201,11 @@ AC_ARG_ENABLE(acltree,
                           Use tree function to store ACL lists],
 [ case "$enableval" in
   splay)
-       echo "ACL lists using BIN trees"
+       echo "ACL lists using SPLAY trees"
        AC_DEFINE(USE_SPLAY_TREE)
        ;;
   yes|bin)
-       echo "ACL lists using SPLAY trees"
+       echo "ACL lists using BIN trees"
        AC_DEFINE(USE_BIN_TREE)
        ;;
   esac

diff --git a/icons/Makefile.in b/icons/Makefile.in
index 30f2a297eba7cf54e0f7ae25fa8b817f881c2e82..5d7ec184091ffd293e437f2f95b87901db190899 100644 (file)
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.5 1998/01/08 21:01:04 wessels Exp $
+# $Id: Makefile.in,v 1.6 1998/02/02 19:39:25 wessels Exp $
 #
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
@@ -17,7 +17,7 @@ INSTALL               = @INSTALL@
 INSTALL_FILE           = @INSTALL_DATA@
 DEFAULT_ICON_DIR        = $(sysconfdir)/icons
 
-SHARFILE       = icons.shar
+SHARFILE       = $(srcdir)/icons.shar
 ICONS          = anthony-binhex.gif \
                  anthony-bomb.gif \
                  anthony-box.gif \

diff --git a/lib/Makefile.in b/lib/Makefile.in
index dd5d9a0114fa41327d6922a94abfcf46aba10fe9..55148d4f11ba94e87c65214640c430a2b98dca62 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,7 +1,8 @@
 #
-#  $Id: Makefile.in,v 1.31 1998/01/06 00:27:50 wessels Exp $
+#  $Id: Makefile.in,v 1.32 1998/02/02 19:39:26 wessels Exp $
 #
 prefix         = @prefix@
+top_srcdir     = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
@@ -19,7 +20,7 @@ RM            = @RM@
 LIBOBJS                = @LIBOBJS@
 AR_R           = @AR_R@
 
-INCLUDE                = -I../include -I$(srcdir)/../include
+INCLUDE                = -I../include -I$(top_srcdir)/include
 UTILOBJS       = rfc1123.o \
                  rfc1738.o \
                  util.o \
@@ -45,7 +46,7 @@ CFLAGS                = $(AC_CFLAGS) $(INCLUDE)
 
 all: $(LIBS)
 
-$(UTILOBJS): ../include/version.h
+$(UTILOBJS): $(top_srcdir)/include/version.h
 
 libmiscutil.a: $(UTILOBJS)
        $(RM) -f $@

diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in
index e7fc20911a07523b5fa110563d3cb9cf8baf2c71..521598e5451b2c8f3b8cd4ccbd7d0be93475534c 100644 (file)
--- a/snmplib/Makefile.in
+++ b/snmplib/Makefile.in
@@ -8,6 +8,9 @@
 ## set to installation prefix (overridden by configure --prefix=path):
 
 prefix         = @prefix@
+top_srcdir     = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
 
 VERSION                = 3.4
 ALIB           = libsnmp.a
@@ -24,7 +27,7 @@ AR_R          = @AR_R@
 RANLIB         = @RANLIB@
 AC_CFLAGS      = @CFLAGS@
 DEFS           = -DSQUID_SNMP=1
-INCLUDE                = -I../include -I$(srcdir)/../include
+INCLUDE                = -I../include -I$(top_srcdir)/include
 MIBDEFS                = -DMIBFILEPATH=\"$(prefix)/lib\"
 CFLAGS         = $(AC_CFLAGS) $(DEFS) $(INCLUDE)
 
@@ -41,7 +44,7 @@ $(ALIB):    ${OBJS}
 ## special rule to include -DMIBFILEPATH=...:
 ##
 mib.o:         mib.c
-       $(CC) $(CFLAGS) $(MIBDEFS)      -c mib.c 
+       $(CC) $(CFLAGS) $(MIBDEFS)      -c $(srcdir)/mib.c 
 
 distclean: clean
        -rm -f Makefile

diff --git a/src/Makefile.in b/src/Makefile.in
index 9b6830d36639ac2f00f20234ccc477f6d68a418b..8d69d1fbdc103d5957baa01947440cda51eeb992 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.116 1998/01/31 05:31:52 wessels Exp $
+#  $Id: Makefile.in,v 1.117 1998/02/02 19:39:27 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -43,6 +43,7 @@ CRYPTLIB      = @CRYPTLIB@
 REGEXLIB       = @REGEXLIB@
 PTHREADLIB     = @PTHREADLIB@
 SNMPLIB                = @SNMPLIB@
+MALLOCLIB      = @LIB_MALLOC@
 AC_CFLAGS      = @CFLAGS@
 LDFLAGS                = @LDFLAGS@
 XTRA_LIBS      = @XTRA_LIBS@
@@ -52,10 +53,10 @@ RM          = @RM@
 SHELL          = /bin/sh
 
 
-INCLUDE                = -I. -I../include -I$(srcdir)/../include
+INCLUDE                = -I. -I../include -I$(top_srcdir)/include
 CFLAGS                 = $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 SQUID_LIBS     = -L../lib $(CRYPTLIB) $(REGEXLIB) @SQUID_PTHREAD_LIB@ \
-                 $(SNMPLIB) -lmiscutil $(XTRA_LIBS)
+                 $(SNMPLIB) $(MALLOCLIB) -lmiscutil $(XTRA_LIBS)
 CLIENT_LIBS    = -L../lib -lmiscutil $(XTRA_LIBS)
 DNSSERVER_LIBS = -L../lib -lmiscutil $(XTRA_LIBS)
 PINGER_LIBS    = -L../lib -lmiscutil $(XTRA_LIBS)
@@ -141,19 +142,19 @@ DEFAULTS        = \
 
 all:    squid.conf $(PROGS) $(UTILS) $(SUID_UTILS) $(CGIPROGS)
 
-$(OBJS): ../include/version.h
+$(OBJS): $(top_srcdir)/include/version.h
 
 squid: $(OBJS)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(SQUID_LIBS)
 
 globals.o: globals.c Makefile
-       $(CC) -c $< $(CFLAGS) $(DEFAULTS)
+       $(CC) -c $< $(CFLAGS) -I$(srcdir) $(DEFAULTS)
 
 globals.c: globals.h mk-globals-c.pl
-       $(PERL) mk-globals-c.pl < globals.h > $@
+       $(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@
 
 string_arrays.c: enums.h mk-string-arrays.pl
-       $(PERL) mk-string-arrays.pl < enums.h > $@
+       $(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $@
 
 client:        client.o
        $(CC) -o $@ $(LDFLAGS) $@.o $(CLIENT_LIBS)
@@ -191,7 +192,7 @@ cf.data: cf.data.pre Makefile
        s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\
        s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\
         s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\
-       s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g" < cf.data.pre >$@
+       s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g" < $(srcdir)/cf.data.pre >$@
 
 install-mkdirs:
        -@if test ! -d $(prefix); then \