Author: Francesco Chemolli <kinkie@squid-cache.org>

Misc fixes for out of tree builds

ICMP path fixes by Francesco Chemolli <kinkie@squid-cache.org>

testheaders and cleanup amendments by Amos Jeffries.

diff --git a/.bzrignore b/.bzrignore
index 105a014dd28be1425f84c8cdc67a4bac4a6307b2..876b3c4d298238add286c835e7b53fda3952caef 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,73 +1,13 @@
-*.la
-*.lo
-*.loT
-*.patch
-*/*/*/Makefile
-*/Makefile
-*/globals.cc
-.deps
-.dirstamp
-.libs
-Makefile
-Makefile.in
 aclocal.m4
 autoconf.h.in
-autom4te*
-autom4te.cache
-cfgaux
+autom4te.cache/
+cfgaux/
+config.guess
 config.h.in
-config.log
-config.status
+config.sub
 configure
-configure.lineno
-depcomp
-doc/*.8
-doc/Programming-Guide/html
-helpers/**/*_auth
-helpers/*/*/Makefile
-helpers/*/Makefile
-helpers/basic_auth/**/Makefile
-helpers/digest_auth/**/Makefile
-helpers/external_acl/**/Makefile
-helpers/external_acl/ip_user/ip_user_check
-helpers/external_acl/session/squid_session
-helpers/external_acl/unix_group/squid_unix_group
-helpers/negotiate_auth/Makefile
-helpers/ntlm_auth/**/Makefile
-icons/*.gif
-include/autoconf.h
-include/stamp-h1
+helpers/negotiate_auth/squid_kerb_auth/depcomp
+helpers/negotiate_auth/squid_kerb_auth/missing
 install-sh
-lib/**/Makefile
-lib/**/config.h
-lib/libLtdl
-libtool
-missing
-scr/**/Makefile
-scripts/Makefile
-scripts/RunAccel
-scripts/RunCache
-snmplib/Makefile
-src/*/Makefile
-src/DiskIO/DiskDaemon/diskd
-src/cf.data
-src/cf_gen
-src/cf_gen_defines.h
-src/cf_parser.h
-src/globals.cc
-src/repl_modules.cc
-src/squid
-src/squid.conf.default
-src/string_arrays.c
-src/ufsdump
-src/unlinkd
-stamp-h.in
-stamp-h1
-tags
-test-suite/Makefile
-testHeaders
-testHeaders.c
-tmp
-tools/Makefile
-tools/cachemgr.cgi
-tools/squidclient
+ltmain.sh
+Makefile.in

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a250a9165bc70e89ab9015aaa8933d0da8214ad5..9ad8a39d8ad5383a6d238614df0f3b70fad232ae 100755 (executable)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -111,10 +111,10 @@ libsspwin32_a_SOURCES = \
 INCLUDES       = -I$(top_builddir)/include -I$(top_srcdir)/include @SQUID_CPPUNIT_INC@
 ##FIXME - set these in configure.in and reuse
 
-TESTS=$(check_PROGRAMS)
 check_PROGRAMS= \
        testHeaders \
        tests/testAll
+TESTS=$(check_PROGRAMS)
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 2b12f88c33b2b56d20fdc44ca58fddec6ac3dd03..55dd2f54955abb5d5567de05e4d52f0b5b4b2f5d 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -8,7 +8,7 @@ AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 DEFS = @DEFS@
 
-INCLUDES        = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_builddir)/lib
+INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
 $(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
 
 # TODO: get rid of this when config filename is no longer a global constant.
@@ -69,7 +69,7 @@ nodist_pinger_SOURCES = \
 pinger_LDFLAGS = $(LIBADD_DL)
 pinger_LDADD=\
        libicmp-core.la \
-       libmiscutil.a
+       $(top_builddir)/lib/libmiscutil.a
 pinger_DEPENDENCIES= \
        libicmp-core.la \
        $(top_builddir)/lib/libmiscutil.a
@@ -96,7 +96,7 @@ TESTS= $(check_PROGRAMS)
 ## Special Universal .h dependency test script
 ## aborts if error encountered
 testHeaders: $(top_srcdir)/src/icmp/*.h
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/icmp/" || exit 1
 
 ## No such file...
 testHeaders.c:
@@ -109,7 +109,6 @@ testIcmp_SOURCES=\
        Icmp.h \
        testIcmp.h \
        testIcmp.cc \
-       \
        ../tests/testMain.cc \
        ../SquidTime.h \
        ../time.cc \
@@ -120,7 +119,7 @@ testIcmp_LDADD=\
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        libicmp-core.la \
-       libmiscutil.a
+       $(top_builddir)/lib/libmiscutil.a
 testIcmp_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
        libicmp-core.la \
        $(top_builddir)/lib/libmiscutil.a

diff --git a/test-suite/testheaders.sh b/test-suite/testheaders.sh
index 5b7f5c5dc02fc62f7ae3b3821d2c33c2872dcd71..fe250e564e90d2789bebdc7eab665ff91e34e616 100755 (executable)
--- a/test-suite/testheaders.sh
+++ b/test-suite/testheaders.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # test all header files (.h) for dependancy issues.
 #