Name libsquid-compat and fix remaining build errors

diff --git a/Makefile.am b/Makefile.am
index e43ec44d3842cebb95048b8cff9ee78523f19ea4..59a259443dc086cd880c5c8eb797ff444457898b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
 #
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-DIST_SUBDIRS   = lib snmplib scripts src icons errors contrib doc helpers test-suite tools
-SUBDIRS                = src/compat lib @makesnmplib@ scripts src/ip src icons errors doc helpers test-suite tools
+DIST_SUBDIRS   = libsquid-compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
+SUBDIRS                = libsquid-compat lib @makesnmplib@ scripts src/ip src icons errors doc helpers test-suite tools
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 DEFAULT_PINGER         = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`

diff --git a/configure.in b/configure.in
index efbbdc35ad236a20cc8e9392138ed09579f17176..86477d6bb880ab7255e4cac6eeb8a098d31468cc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ AC_PROG_RANLIB
 
 CRYPTLIB=''
 REGEXLIB=''    # -lregex
-LIBREGEX=''    # libregex.a
+# LIBREGEX=''  # libregex.a
 
 dnl find out the exe extension for this platform. If it's not empty, use it for CGI's as well.
 AC_EXEEXT
@@ -293,15 +293,6 @@ if test -z "$PRESET_LDFLAGS"; then
     fi
 fi
 
-AC_ARG_ENABLE(gnuregex,
-  AC_HELP_STRING([--enable-gnuregex],
-                 [Compile GNUregex.  Unless you have reason to use 
-                 this option, you should not enable it.
-                 This library file is usually only required on Windows and 
-                 very old Unix boxes which do not have their own regex 
-                 library built in.]),
-[USE_GNUREGEX=$enableval])
-
 SquidInline="yes"
 
 AC_ARG_ENABLE(optimizations,
@@ -3226,6 +3217,14 @@ if test "$LINUX_TPROXY2" ; then
     fi
 fi
 
+AC_ARG_ENABLE(gnuregex,
+  AC_HELP_STRING([--enable-gnuregex],
+                 [Compile GNUregex.  Unless you have reason to use 
+                 this option, you should not enable it.
+                 This library file is usually only required on Windows and 
+                 very old Unix boxes which do not have their own regex 
+                 library built in.]),
+[USE_GNUREGEX=$enableval])
 if test -z "$USE_GNUREGEX" ; then
     case "$host" in
     *-sun-solaris2.[[0-4]])
@@ -3249,12 +3248,12 @@ fi
 fi
 AC_MSG_RESULT($USE_GNUREGEX)
 if test "$USE_GNUREGEX" = "yes"; then
-       REGEXLIB="-lregex"
-       LIBREGEX="libregex.a"
+       # override system regex with ours. Not good. But what was asked for.
+       REGEXLIB=""
        AC_DEFINE(USE_GNUREGEX,1,[Define if we should use GNU regex])
 fi
 AC_SUBST(REGEXLIB)
-AC_SUBST(LIBREGEX)
+#AC_SUBST(LIBREGEX)
 
 dnl Not cached since people are likely to tune this
 AC_MSG_CHECKING(Default FD_SETSIZE value)
@@ -3810,12 +3809,12 @@ rm -f core
 
 AC_CONFIG_FILES([\
        Makefile \
+       libsquid-compat/Makefile \
        lib/Makefile \
        scripts/Makefile \
        scripts/RunCache \
        scripts/RunAccel \
        src/Makefile \
-       src/compat/Makefile \
        src/fs/Makefile \
        src/repl/Makefile \
        src/auth/Makefile \

diff --git a/helpers/basic_auth/DB/Makefile.am b/helpers/basic_auth/DB/Makefile.am
index e334cb7dc19169096e048509318a7188234e381b..0ac34f27d7265843d23aedf6f1231f273687e896 100644 (file)
--- a/helpers/basic_auth/DB/Makefile.am
+++ b/helpers/basic_auth/DB/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.3 2007/07/19 02:54:21 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #

diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am
index 6b2bdf795712ef31c21614fe0d7a18ba1234174a..a721893ff114e246aeb4fb797c264704fb493671 100644 (file)
--- a/helpers/basic_auth/LDAP/Makefile.am
+++ b/helpers/basic_auth/LDAP/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.am,v 1.6 2005/03/19 15:24:07 serassio Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,5 +11,13 @@ man_MANS             = squid_ldap_auth.8
 EXTRA_DIST             = squid_ldap_auth.8
 squid_ldap_auth_SOURCES        = squid_ldap_auth.c
 
-LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(XTRA_LIBS)
-INCLUDES      = -I$(top_srcdir)/include
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(LIB_LDAP) \
+       $(LIB_LBER) \
+       $(XTRA_LIBS)
+
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am
index 09565e16e4528b9fc29eae4ad8226859437e9a22..5e68b0bd91a1108c58e9f038c293358b7c19d084 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/MSNT/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.10 2003/01/23 00:35:26 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -27,9 +27,12 @@ EXTRA_DIST = \
 sysconf_DATA = \
        msntauth.conf.default
 
-LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -L$(top_builddir)/libsquid-compat/libsquid-compat.la
 
-INCLUDES      = -I$(top_srcdir)/include
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src
 
 confload.o: confload.c
        $(COMPILE) -DSYSCONFDIR=\"$(sysconfdir)\" -c $(srcdir)/confload.c -o $@
@@ -41,5 +44,3 @@ install-data-local:
                echo "$(INSTALL_DATA) $(srcdir)/msntauth.conf.default $(DESTDIR)$(sysconfdir)/msntauth.conf" ; \
                $(INSTALL_DATA) $(srcdir)/msntauth.conf.default $(DESTDIR)$(sysconfdir)/msntauth.conf ; \
        fi
-
-       

diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am
index 43d736f555d2c9de6415efe0496bdb2baaa56e6f..f41aaa752a1e049c4f4850eea23b141162c01fb9 100644 (file)
--- a/helpers/basic_auth/NCSA/Makefile.am
+++ b/helpers/basic_auth/NCSA/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.6 2007/06/25 11:27:03 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -10,5 +10,14 @@ libexec_PROGRAMS     = ncsa_auth
 ncsa_auth_SOURCES      = ncsa_auth.c crypt_md5.c crypt_md5.h
 man_MANS               = ncsa_auth.8
 EXTRA_DIST             = ncsa_auth.8
-LDADD                  = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB)
-INCLUDES      = -I$(top_srcdir)/include
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS) \
+       $(SSLLIB)
+
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src

diff --git a/helpers/basic_auth/PAM/Makefile.am b/helpers/basic_auth/PAM/Makefile.am
index 1d992a9fe41d2a524caab376d11b9fce5a740d64..321027c0c133ec4f3930b597c9e9c312a50f1064 100644 (file)
--- a/helpers/basic_auth/PAM/Makefile.am
+++ b/helpers/basic_auth/PAM/Makefile.am
@@ -1,14 +1,21 @@
 #
 #  Makefile for the Squid PAM authentication helper
 #
-#  $Id: Makefile.am,v 1.7 2003/08/03 20:38:02 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
 
-INCLUDES       = -I$(top_srcdir)/include
-
 man_MANS               = pam_auth.8
 EXTRA_DIST             = pam_auth.8
 libexec_PROGRAMS       = pam_auth
-LDADD                  = -L$(top_builddir)/lib -lmiscutil -lpam $(XTRA_LIBS)
+
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       -lpam \
+       $(XTRA_LIBS)

diff --git a/helpers/basic_auth/POP3/Makefile.am b/helpers/basic_auth/POP3/Makefile.am
index 1a957a96204c179079f1f69a1e0f046d5ecb7c39..a41a18128672a492ba7265adcad2232bc68446b2 100644 (file)
--- a/helpers/basic_auth/POP3/Makefile.am
+++ b/helpers/basic_auth/POP3/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1 2006/12/09 23:28:23 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #

diff --git a/helpers/basic_auth/SASL/Makefile.am b/helpers/basic_auth/SASL/Makefile.am
index 522c9e81779d7ce24df2b5f31c98a73fa84c7d5b..5a4030733015e7423f913f7d54c388879bb68d22 100644 (file)
--- a/helpers/basic_auth/SASL/Makefile.am
+++ b/helpers/basic_auth/SASL/Makefile.am
@@ -1,13 +1,21 @@
 #
 #  Makefile for the Squid SASL authentication helper
 #
-#  $Id: Makefile.am,v 1.7 2004/12/20 16:30:15 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
 
-INCLUDES       = -I$(top_srcdir)/include
-
 libexec_PROGRAMS       = sasl_auth
-LDADD                  = -L$(top_builddir)/lib -lmiscutil $(LIBSASL) $(XTRA_LIBS)
+
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(LIBSASL) \
+       $(XTRA_LIBS)
+
 EXTRA_DIST             = squid_sasl_auth squid_sasl_auth.conf

diff --git a/helpers/basic_auth/SMB/Makefile.am b/helpers/basic_auth/SMB/Makefile.am
index 4d7f8bb58f864d20734ca3b65a6214e43f2a97c5..fcb640a1bf96728390026f073e111774ffdab9a3 100644 (file)
--- a/helpers/basic_auth/SMB/Makefile.am
+++ b/helpers/basic_auth/SMB/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.5 2003/01/23 00:35:40 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -22,6 +22,11 @@ libexec_PROGRAMS = smb_auth
 smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
 EXTRA_DIST = smb_auth.sh COPYING-2.0
 
-LDADD  = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include
 
-INCLUDES       = -I$(top_srcdir)/include
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(XTRA_LIBS)

diff --git a/helpers/basic_auth/YP/Makefile.am b/helpers/basic_auth/YP/Makefile.am
index 36bdf67934436e6c75f9c5256694ecde7c7dcd37..3caad7b3729b3b414c7f35c1d86c222f59a029f6 100644 (file)
--- a/helpers/basic_auth/YP/Makefile.am
+++ b/helpers/basic_auth/YP/Makefile.am
@@ -1,11 +1,19 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.5 2003/01/23 00:35:44 robertc Exp $
+#  $Id$
 #
 #
 
 libexec_PROGRAMS = yp_auth
 yp_auth_SOURCES        = yp_auth.c nis_support.h nis_support.c
-LDADD  = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
-INCLUDES       = -I$(top_srcdir)/include
+
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS)

diff --git a/helpers/basic_auth/getpwnam/Makefile.am b/helpers/basic_auth/getpwnam/Makefile.am
index 8bc01b64750bdf064fbe6869a46dfd74552f54bf..3c0eff0d38fa06e0420537aa90b008c39815bbe8 100644 (file)
--- a/helpers/basic_auth/getpwnam/Makefile.am
+++ b/helpers/basic_auth/getpwnam/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.3 2003/01/23 00:35:47 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,5 +11,13 @@ libexec_PROGRAMS = getpwname_auth
 
 getpwname_auth_SOURCES = getpwnam_auth.c 
 
-INCLUDES      = -I$(top_srcdir)/include
-LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS)

diff --git a/helpers/basic_auth/mswin_sspi/Makefile.am b/helpers/basic_auth/mswin_sspi/Makefile.am
index 1b60e1fc218c436f6c45bdebfc351ece736516d8..5bebac8bcc47d1665d9a9dbca855a71fa4910bb8 100644 (file)
--- a/helpers/basic_auth/mswin_sspi/Makefile.am
+++ b/helpers/basic_auth/mswin_sspi/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.2 2005/11/22 19:45:04 serassio Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,9 +11,15 @@ libexec_PROGRAMS = mswin_auth
 
 mswin_auth_SOURCES = mswin_auth.c valid.c valid.h
 
-LDADD  = -L$(top_builddir)/lib -lnetapi32 -ladvapi32 -lsspwin32 \
-          -lmiscutil $(XTRA_LIBS)
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       -lnetapi32 -ladvapi32 -lsspwin32 \
+       $(XTRA_LIBS)
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
 
 EXTRA_DIST = readme.txt

diff --git a/helpers/basic_auth/squid_radius_auth/Makefile.am b/helpers/basic_auth/squid_radius_auth/Makefile.am
index b13266f915234ee7115cc9d7b01ce03506f988ae..5e117c24cd96ba8a39a28c2a8c250cc18738e25d 100644 (file)
--- a/helpers/basic_auth/squid_radius_auth/Makefile.am
+++ b/helpers/basic_auth/squid_radius_auth/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.am,v 1.2 2007/11/20 14:34:17 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -15,5 +15,12 @@ squid_radius_auth_SOURCES = \
                        radius-util.c \
                        radius-util.h
 
-LDADD                  = -L$(top_builddir)/lib -lmiscutil $(SSLLIB) $(XTRA_LIBS)
-INCLUDES               = -I$(top_srcdir)/include
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(SSLLIB) \
+       $(XTRA_LIBS)

diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/helpers/digest_auth/eDirectory/Makefile.am
index 18174fdd2b179d8315120f356e39362f5ee24080..3e780bb76625c4cf42762a2fda3ee0b63449befb 100644 (file)
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/helpers/digest_auth/eDirectory/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1 2007/06/23 20:50:10 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -13,7 +13,18 @@ digest_edir_auth_SOURCES = digest_pw_auth.c \
        ldap_backend.h \
        edir_ldapext.c \
        edir_ldapext.h
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-               -I$(top_srcdir)/src/
 
-LDADD  = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB)
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(LIB_LDAP) \
+       $(LIB_LBER) \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS) \
+       $(SSLLIB)

diff --git a/helpers/digest_auth/ldap/Makefile.am b/helpers/digest_auth/ldap/Makefile.am
index 5c855794023485a262743e42523d7cfca087005e..b28b4786ae93186fd3928c46c9868d52d9b754a7 100644 (file)
--- a/helpers/digest_auth/ldap/Makefile.am
+++ b/helpers/digest_auth/ldap/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.2 2005/12/29 02:43:02 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,7 +11,18 @@ digest_ldap_auth_SOURCES = digest_pw_auth.c \
        digest_common.h \
        ldap_backend.c \
        ldap_backend.h
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-               -I$(top_srcdir)/src/
 
-LDADD  = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB)
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(LIB_LDAP) \
+       $(LIB_LBER) \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS) \
+       $(SSLLIB)

diff --git a/helpers/digest_auth/password/Makefile.am b/helpers/digest_auth/password/Makefile.am
index 934d2ec53e1e259432d889ea80c3035611498a55..dedc6737af1c2935c4d0d6e7259fa5964563624c 100644 (file)
--- a/helpers/digest_auth/password/Makefile.am
+++ b/helpers/digest_auth/password/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.6 2005/12/30 23:21:46 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,7 +11,16 @@ digest_pw_auth_SOURCES = digest_pw_auth.c \
        digest_common.h \
        text_backend.c \
        text_backend.h
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-               -I$(top_srcdir)/src/
 
-LDADD  = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB)
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS) \
+       $(SSLLIB)

diff --git a/helpers/external_acl/ip_user/Makefile.am b/helpers/external_acl/ip_user/Makefile.am
index 8748e8afa63bc3a0aba7386a0f165977dac8978f..b6943424d067abf1accad30b34e07c625f6e73e8 100644 (file)
--- a/helpers/external_acl/ip_user/Makefile.am
+++ b/helpers/external_acl/ip_user/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the ip_user external_acl helper by Rodrigo Campos
 #
-#  $Id: Makefile.am,v 1.4 2004/08/14 22:54:52 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -15,7 +15,6 @@ ip_user_check_SOURCES = \
        main.c \
        match.c
 
-
 EXTRA_DIST = \
        example.conf \
        example-deny_all_but.conf \
@@ -24,5 +23,13 @@ EXTRA_DIST = \
 
 # sysconf_DATA = 
 
-LDADD          = -L$(top_builddir)/lib -lmiscutil @XTRA_LIBS@
-INCLUDES       = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       @XTRA_LIBS@

diff --git a/helpers/external_acl/ldap_group/Makefile.am b/helpers/external_acl/ldap_group/Makefile.am
index 7e08f39cc53df25917f44c25e1547b24f7709c76..3c5ee69aef016064e7a4dfd514d0b3430d617335 100644 (file)
--- a/helpers/external_acl/ldap_group/Makefile.am
+++ b/helpers/external_acl/ldap_group/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.am,v 1.6 2005/03/19 15:24:07 serassio Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,5 +11,15 @@ man_MANS                     = squid_ldap_group.8
 EXTRA_DIST                     = squid_ldap_group.8
 squid_ldap_group_SOURCES       = squid_ldap_group.c
 
-LDADD          = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) @XTRA_LIBS@
-INCLUDES       = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(LIB_LDAP) \
+       $(LIB_LBER) \
+       @XTRA_LIBS@

diff --git a/helpers/external_acl/mswin_ad_group/Makefile.am b/helpers/external_acl/mswin_ad_group/Makefile.am
index 3de58974390bc6dd185c307e427bccde4d12d284..3e8a66f53f49ef1e3352db164c40b422c24eadf5 100644 (file)
--- a/helpers/external_acl/mswin_ad_group/Makefile.am
+++ b/helpers/external_acl/mswin_ad_group/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1 2008/05/17 10:23:13 serassio Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,9 +11,16 @@ libexec_PROGRAMS = mswin_check_ad_group
 
 mswin_check_ad_group_SOURCES = mswin_check_ad_group.c mswin_check_ad_group.h
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include
 
-LDADD   = -L$(top_builddir)/lib -lmiscutil -lnetapi32 -ladvapi32 \
-          -lntdll $(XTRA_LIBS)
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       -lnetapi32 \
+       -ladvapi32 \
+       -lntdll \
+       $(XTRA_LIBS)
 
 EXTRA_DIST = readme.txt

diff --git a/helpers/external_acl/mswin_lm_group/Makefile.am b/helpers/external_acl/mswin_lm_group/Makefile.am
index 54bd4099b6663232dfeceadaef476ce9db4d6994..4fce8e5ff87eb3516946215a1c180552feb9817f 100644 (file)
--- a/helpers/external_acl/mswin_lm_group/Makefile.am
+++ b/helpers/external_acl/mswin_lm_group/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1 2005/10/31 16:29:45 serassio Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,9 +11,17 @@ libexec_PROGRAMS = mswin_check_lm_group
 
 mswin_check_lm_group_SOURCES = win32_check_group.c win32_check_group.h
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
 
-LDADD   = -L$(top_builddir)/lib -lmiscutil -lnetapi32 -ladvapi32 \
-          -lntdll $(XTRA_LIBS)
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       -lnetapi32 \
+       -ladvapi32 \
+       -lntdll \
+       $(XTRA_LIBS)
 
 EXTRA_DIST = readme.txt

diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am
index a7e32727232113f39e3c993e351e07f98afc8fad..4ed4e51f0e6bd41281432308442f60335051b400 100644 (file)
--- a/helpers/external_acl/session/Makefile.am
+++ b/helpers/external_acl/session/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.am,v 1.3 2006/03/20 23:38:23 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,6 +11,12 @@ man_MANS                     = squid_session.8
 EXTRA_DIST                     = squid_session.8
 squid_session_SOURCES          = squid_session.c
 
-LDADD = $(LIB_DB) 
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
 
-INCLUDES       = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       $(LIB_DB)

diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am
index 51d0dcb8e985e9ae1b16e9d08352b1e299b6f16c..3fb066105c0b9009e9da004e3bc4e319de65eac6 100644 (file)
--- a/helpers/external_acl/unix_group/Makefile.am
+++ b/helpers/external_acl/unix_group/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.am,v 1.4 2004/08/14 22:54:53 hno Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -11,5 +11,13 @@ man_MANS                     = squid_unix_group.8
 EXTRA_DIST                     = squid_unix_group.8
 squid_unix_group_SOURCES       = check_group.c
 
-LDADD          = -L$(top_builddir)/lib -lmiscutil @XTRA_LIBS@
-INCLUDES       = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       @XTRA_LIBS@

diff --git a/helpers/external_acl/wbinfo_group/Makefile.am b/helpers/external_acl/wbinfo_group/Makefile.am
index 7637c4827c35d55a80407190a40215f5199879b8..6de527bb953bbee765bf5276f17d4198447a7a83 100644 (file)
--- a/helpers/external_acl/wbinfo_group/Makefile.am
+++ b/helpers/external_acl/wbinfo_group/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.am,v 1.2 2003/01/23 00:36:16 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #

diff --git a/helpers/ntlm_auth/fakeauth/Makefile.am b/helpers/ntlm_auth/fakeauth/Makefile.am
index bde765a187d4f4dbab5d58e042d86c128035e4d9..8e03d1783dfe75a262231ad1371db31ad38ffe24 100644 (file)
--- a/helpers/ntlm_auth/fakeauth/Makefile.am
+++ b/helpers/ntlm_auth/fakeauth/Makefile.am
@@ -1,13 +1,22 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.2 2003/01/23 00:36:34 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #
 
 libexec_PROGRAMS = fakeauth_auth
 fakeauth_auth_SOURCES  = fakeauth_auth.c ntlm.h
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-               -I$(top_srcdir)/src/
-LDADD  = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
+
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS)

diff --git a/helpers/ntlm_auth/mswin_sspi/Makefile.am b/helpers/ntlm_auth/mswin_sspi/Makefile.am
index d45340e89a96cc562065ce28896b67728e2ffbd3..d0eccfd0995e3d211465271c873a967951e53261 100644 (file)
--- a/helpers/ntlm_auth/mswin_sspi/Makefile.am
+++ b/helpers/ntlm_auth/mswin_sspi/Makefile.am
@@ -1,16 +1,25 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1 2005/10/30 21:48:22 serassio Exp $
+#  $Id$
 #
 
 libexec_PROGRAMS = mswin_ntlm_auth
 
 mswin_ntlm_auth_SOURCES = libntlmssp.c ntlm_auth.c ntlm.h
 
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
 
-LDADD          = -L$(top_builddir)/lib -lntlmauth -lsspwin32 -lnetapi32 \
-                 -ladvapi32 -lmiscutil $(XTRA_LIBS)
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil -lntlmauth \
+       -lsspwin32 \
+       -lnetapi32 \
+       -ladvapi32 \
+       $(XTRA_LIBS)
 
 EXTRA_DIST = readme.txt

diff --git a/helpers/ntlm_auth/no_check/Makefile.am b/helpers/ntlm_auth/no_check/Makefile.am
index 6ff99684444fd550cbe34ac98fde264a6ca23495..fdfc3147412abcda1c1c7bb5d396caad35556e2e 100644 (file)
--- a/helpers/ntlm_auth/no_check/Makefile.am
+++ b/helpers/ntlm_auth/no_check/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.4 2003/01/23 00:36:38 robertc Exp $
+#  $Id$
 #
 #  Uncomment and customize the following to suit your needs:
 #

diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/helpers/ntlm_auth/smb_lm/Makefile.am
index 4f63f10f1e8f3101fbb3c9bb871df259b601d44e..70e1f1622e0f43895cf9a2856be10c43e42eefc6 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/Makefile.am
+++ b/helpers/ntlm_auth/smb_lm/Makefile.am
@@ -6,7 +6,18 @@ SUBDIRS = smbval
 
 libexec_PROGRAMS = ntlm_smb_lm_auth
 ntlm_smb_lm_auth_SOURCES = libntlmssp.c ntlm_smb_lm_auth.c ntlm_smb_lm_auth.h
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-               -I$(top_srcdir)/src/ -I$(srcdir)/smbval
-LDADD          = smbval/libsmbvalid.a -L$(top_builddir)/lib -lntlmauth \
-                 -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
+
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
+       -I$(srcdir)/smbval
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lntlmauth -lmiscutil \
+       smbval/libsmbvalid.a \
+       $(CRYPTLIB) \
+       $(XTRA_LIBS)

diff --git a/helpers/ntlm_auth/smb_lm/smbval/Makefile.am b/helpers/ntlm_auth/smb_lm/smbval/Makefile.am
index d783611d79d96e45cb6cb767a82fbdaa049544aa..85993914b8babb3f3c33d20bb8cc406be24b28c0 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/smbval/Makefile.am
+++ b/helpers/ntlm_auth/smb_lm/smbval/Makefile.am
@@ -1,9 +1,13 @@
 # makefile for smblib
 
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-               -I$(top_srcdir)/src/
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
 
 noinst_LIBRARIES = libsmbvalid.a
+
 libsmbvalid_a_SOURCES = valid.c session.c rfcnb-util.c rfcnb-io.c \
        smblib-util.c smblib.c smbencrypt.c smbdes.c md4.c byteorder.h \
        rfcnb-error.h  rfcnb-util.h  smbencrypt.h     smblib.h        valid.h \

diff --git a/include/config.h b/include/config.h
index 132bb3f7a1b874930175ee30fe1e6b5d4440d73f..a050ff9e8b7b6720006ff3df8ccb73e3bd60b4b3 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -55,7 +55,7 @@
  *--------------------------------------------------------------------------*
  ****************************************************************************/
 
-#include "compat/compat.h"
+#include "compat.h"
 
 #ifdef USE_POSIX_REGEX
 #ifndef USE_RE_SYNTAX

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8ae663884c39a3b23bda2f09276aae1703d54804..79e22767bb8343fc03e643389e3d62d53b5194a4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -47,13 +47,12 @@ WIN32SRC=
 endif
 
 EXTRA_LIBRARIES = \
-       libregex.a \
        libsspwin32.a
 noinst_LIBRARIES = \
        libmiscutil.a \
        libntlmauth.a \
-       $(LIBSSPWIN32) \
-       @LIBREGEX@
+       $(LIBSSPWIN32)
+
 #
 # dirent.c, encrypt.c and getopt.c are needed for native Windows support.
 #
@@ -99,8 +98,6 @@ libmiscutil_a_LIBADD = \
        libTrie/src/TrieNode.o \
        @LIBOBJS@
 # $(top_srcdir)/include/version.h should be a dependency
-libregex_a_SOURCES = \
-       GNUregex.c
 libntlmauth_a_SOURCES = \
        ntlmauth.c
 libntlmauth_a_LIBADD = \
@@ -108,7 +105,7 @@ libntlmauth_a_LIBADD = \
 libsspwin32_a_SOURCES = \
        sspwin32.c
 
-INCLUDES       = -I$(top_builddir)/include -I$(top_srcdir)/include @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/src
+INCLUDES       = -I$(top_builddir)/include -I$(top_srcdir)/include @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/libsquid-compat
 ##FIXME - set these in configure.in and reuse
 
 check_PROGRAMS= \

diff --git a/lib/GNUregex.c b/libsquid-compat/GnuRegex.c
similarity index 99%
rename from lib/GNUregex.c
rename to libsquid-compat/GnuRegex.c
index d19f66caf066b84c5fa739a2d0537be5460114d4..5a143772e3f92f3b312b4eecfa31bea67f60826d 100644 (file)
--- a/lib/GNUregex.c
+++ b/libsquid-compat/GnuRegex.c
@@ -1,7 +1,3 @@
-/*
- * $Id: GNUregex.c,v 1.22 2007/12/14 23:11:44 amosjeffries Exp $
- */
-
 /* Extended regular expression matching and search library,
  * version 0.12.
  * (Implements POSIX draft P10003.2/D11.2, except for
@@ -34,6 +30,8 @@
 
 #include "config.h"
 
+#if USE_GNUREGEX /* only if squid needs it. Usually not */
+
 #if !HAVE_ALLOCA
 #define REGEX_MALLOC 1
 #endif
@@ -104,7 +102,7 @@ init_syntax_once(void)
 
 \f
 /* Get the interface, including the syntax bits.  */
-#include "GNUregex.h"
+#include "GnuRegex.h"
 
 /* Compile a fastmap for the compiled pattern in BUFFER; used to
  * accelerate searches.  Return 0 if successful and -2 if was an
@@ -2362,10 +2360,14 @@ typedef struct {
  * the pattern buffer.
  *
  * Returns 0 if we succeed, -2 if an internal error.   */
-
+#ifdef STDC_HEADERS
+int
+re_compile_fastmap(struct re_pattern_buffer *bufp)
+#else
 int
 re_compile_fastmap(bufp)
 struct re_pattern_buffer *bufp;
+#endif
 {
     int j, k;
     fail_stack_type fail_stack;
@@ -4401,6 +4403,7 @@ regex_t *preg;
         free(preg->translate);
     preg->translate = NULL;
 }
+#endif /* USE_GNUREGEX */
 \f
 /*
  * Local variables:

diff --git a/src/compat/GnuRegex.h b/libsquid-compat/GnuRegex.h
similarity index 100%
rename from src/compat/GnuRegex.h
rename to libsquid-compat/GnuRegex.h

diff --git a/src/compat/Makefile.am b/libsquid-compat/Makefile.am
similarity index 63%
rename from src/compat/Makefile.am
rename to libsquid-compat/Makefile.am
index 486834af803918ce4c8a8ca331b2cff693f30cec..62b680d6c4e627d8af3a6c7f0f0ef5f47391e834 100644 (file)
--- a/src/compat/Makefile.am
+++ b/libsquid-compat/Makefile.am
@@ -9,20 +9,23 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 DEFS = @DEFS@
 CLEANFILES = 
 
-INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
+INCLUDES = -I. -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
 
 # Ideally this would be 100% inline functions and macro wrappers.
 
 # Port Specific Configurations
 
-noinst_LTLIBRARIES = libcompat.la
+noinst_LTLIBRARIES = libsquid-compat.la
 
-libcompat_la_SOURCES = \
+libsquid_compat_la_SOURCES = \
        compat.h \
        osdetect.h \
        compat_shared.h \
+       gnuregex.h \
        squid_fdsetsize.h \
+       squid_stdvarargs.h \
+       squid_valgrind.h \
        \
        os/squid_aix.h \
        os/squid_freebsd.h \
@@ -37,7 +40,8 @@ libcompat_la_SOURCES = \
        os/squid_sunos.h \
        os/squid_windows.h \
        \
-       compat.cc
+       compat.cc \
+       GnuRegex.c
 
 
 check_PROGRAMS= testHeaders
@@ -45,24 +49,11 @@ TESTS= $(check_PROGRAMS)
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
-testHeaders: $(top_srcdir)/src/compat/*.h $(top_srcdir)/src/compat/os/*.h
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/compat/" || exit 1
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/compat/os/" || exit 1
+testHeaders: $(top_srcdir)/libsquid-compat/*.h $(top_srcdir)/libsquid-compat/os/*.h
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/libsquid-compat/" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/libsquid-compat/os/" || exit 1
 
 ## No such file...
 testHeaders.c:
        touch testHeaders.c
 CLEANFILES += testHeaders.c
-
-#
-#testIpAddress_SOURCES= \
-#      testIpAddress.cc \
-#      testIpAddress.h
-#nodist_testIpAddress_SOURCES= \
-#      ../tests/testMain.cc
-#testIpAddress_LDADD= \
-#      libip.la \
-#      -L$(top_builddir)/lib -lmiscutil \
-#      @SQUID_CPPUNIT_LA@ \
-#      @SQUID_CPPUNIT_LIBS@
-#testIpAddress_LDFLAGS= $(LIBADD_DL)

diff --git a/src/compat/assert.h b/libsquid-compat/assert.h
similarity index 100%
rename from src/compat/assert.h
rename to libsquid-compat/assert.h

diff --git a/src/compat/compat.cc b/libsquid-compat/compat.cc
similarity index 100%
rename from src/compat/compat.cc
rename to libsquid-compat/compat.cc

diff --git a/src/compat/compat.h b/libsquid-compat/compat.h
similarity index 95%
rename from src/compat/compat.h
rename to libsquid-compat/compat.h
index 7fe6d011fc830a0cd67de13736787eafb65f1020..d959778bf716506466d90aff3fc6621419afe0d5 100644 (file)
--- a/src/compat/compat.h
+++ b/libsquid-compat/compat.h
@@ -24,14 +24,14 @@
 /* Define the _SQUID_TYPE_ based on a guess of the OS */
 /* NP: this MUST come first within compat.h           */
 /******************************************************/
-#include "compat/osdetect.h"
+#include "osdetect.h"
 
 
 /*****************************************************/
 /* FDSETSIZE is messy and needs to be done before    */
 /* sys/types.h are defined.                          */
 /*****************************************************/
-#include "compat/squid_fdsetsize.h"
+#include "squid_fdsetsize.h"
 
 
 /*****************************************************/
@@ -68,7 +68,7 @@
 
 #include "compat_shared.h"
 #include "squid_stdvarargs.h"
-#include "compat/assert.h"
+#include "assert.h"
 
 /*****************************************************/
 /* component-specific portabilities                  */
@@ -85,7 +85,7 @@
  * Default is to use a system provided one, but the bundle
  * may be used instead with explicit configuration.
  */
-#include "compat/GnuRegex.h"
+#include "GnuRegex.h"
 
 
 #endif /* _SQUID_COMPAT_H */

diff --git a/src/compat/compat_shared.h b/libsquid-compat/compat_shared.h
similarity index 92%
rename from src/compat/compat_shared.h
rename to libsquid-compat/compat_shared.h
index ac65194eb5abc34e0bd2446c18fbb095405a2c33..a2bc9a4e9bb052eaf52502ec31bd3522c51abf48 100644 (file)
--- a/src/compat/compat_shared.h
+++ b/libsquid-compat/compat_shared.h
@@ -54,14 +54,19 @@
 
 /*
  * Filedescriptor limits in the different select loops
+ * 
+ * NP: FreeBSD 7 defines FD_SETSIZE as unsigned but Squid needs
+ *     it to be signed to compare it with signed values.
+ *     Linux and others including FreeBSD <7, define it as signed.
+ *     If this causes any issues please contact squid-dev@squid-cache.org
  */
 #if defined(USE_SELECT) || defined(USE_SELECT_WIN32)
 /* Limited by design */
-# define SQUID_MAXFD_LIMIT FD_SETSIZE
+# define SQUID_MAXFD_LIMIT    ((signed int)FD_SETSIZE)
 
 #elif defined(USE_POLL)
 /* Limited due to delay pools */
-# define SQUID_MAXFD_LIMIT FD_SETSIZE
+# define SQUID_MAXFD_LIMIT    ((signed int)FD_SETSIZE)
 
 #elif defined(USE_KQUEUE) || defined(USE_EPOLL)
 # define SQUID_FDSET_NOUSE 1

diff --git a/src/compat/os/squid_aix.h b/libsquid-compat/os/squid_aix.h
similarity index 97%
rename from src/compat/os/squid_aix.h
rename to libsquid-compat/os/squid_aix.h
index e1485b6d86086865b6ed84d3d1d729e3ed07c8a9..3286eb49a4579ea00bebdc7668657ffaae0004a6 100644 (file)
--- a/src/compat/os/squid_aix.h
+++ b/libsquid-compat/os/squid_aix.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_AIX_H

diff --git a/src/compat/os/squid_freebsd.h b/libsquid-compat/os/squid_freebsd.h
similarity index 97%
rename from src/compat/os/squid_freebsd.h
rename to libsquid-compat/os/squid_freebsd.h
index 8213539acc099a1ace0c1d5ffff29be1f3eed87e..e4fb395942f488ca602db115c71fc475259c1320 100644 (file)
--- a/src/compat/os/squid_freebsd.h
+++ b/libsquid-compat/os/squid_freebsd.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_FREEBSD_H

diff --git a/src/compat/os/squid_hpux.h b/libsquid-compat/os/squid_hpux.h
similarity index 97%
rename from src/compat/os/squid_hpux.h
rename to libsquid-compat/os/squid_hpux.h
index dce7d811e7589cd795f73cd8f67777ddd6754880..993d14d4c44a97304f174b493dcf3d1e97a6cd2c 100644 (file)
--- a/src/compat/os/squid_hpux.h
+++ b/libsquid-compat/os/squid_hpux.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_HPUX_H

diff --git a/src/compat/os/squid_linux.h b/libsquid-compat/os/squid_linux.h
similarity index 97%
rename from src/compat/os/squid_linux.h
rename to libsquid-compat/os/squid_linux.h
index b8fb3b7685af55c6d6a074e878cfb34879fd96ca..947de9870abef626151c22b8bf0e6d05be39fb7e 100644 (file)
--- a/src/compat/os/squid_linux.h
+++ b/libsquid-compat/os/squid_linux.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_LINUX_H

diff --git a/src/compat/os/squid_mswin.h b/libsquid-compat/os/squid_mswin.h
similarity index 99%
rename from src/compat/os/squid_mswin.h
rename to libsquid-compat/os/squid_mswin.h
index b3750352897177f7c868ce14d7631e9967cabd0a..fd0860c9fac32cd19d26771b538fa046ab3810cb 100644 (file)
--- a/src/compat/os/squid_mswin.h
+++ b/libsquid-compat/os/squid_mswin.h
@@ -32,7 +32,7 @@
  *
  */
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_MSWIN_H

diff --git a/src/compat/os/squid_next.h b/libsquid-compat/os/squid_next.h
similarity index 98%
rename from src/compat/os/squid_next.h
rename to libsquid-compat/os/squid_next.h
index 5f91ac4f6eeb3ace38c371a22d8f2a7206e213b4..5278f1c3756f80e6a63f91567e0d6235e6727860 100644 (file)
--- a/src/compat/os/squid_next.h
+++ b/libsquid-compat/os/squid_next.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_NEXT_H

diff --git a/src/compat/os/squid_openbsd.h b/libsquid-compat/os/squid_openbsd.h
similarity index 97%
rename from src/compat/os/squid_openbsd.h
rename to libsquid-compat/os/squid_openbsd.h
index 680f5f8dc0f8d49eeae705ebdea20eca2fb4ebd5..eae2cdf003bd0042edddce73f60e801d49fe0ded 100644 (file)
--- a/src/compat/os/squid_openbsd.h
+++ b/libsquid-compat/os/squid_openbsd.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_OPENBSD_H

diff --git a/src/compat/os/squid_qnx.h b/libsquid-compat/os/squid_qnx.h
similarity index 96%
rename from src/compat/os/squid_qnx.h
rename to libsquid-compat/os/squid_qnx.h
index d01572850db95af6d9619e9c22de87e4af5f590a..f1f49405b5f1cfa765a2e3dd02c36ab1d4a636ba 100644 (file)
--- a/src/compat/os/squid_qnx.h
+++ b/libsquid-compat/os/squid_qnx.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_QNX_H

diff --git a/src/compat/os/squid_sgi.h b/libsquid-compat/os/squid_sgi.h
similarity index 97%
rename from src/compat/os/squid_sgi.h
rename to libsquid-compat/os/squid_sgi.h
index 8222256a4a4981db4d32c863c4b3ad6c8250554a..5fc9e67ac39e850e9fa82205dd511fe9b4889d70 100644 (file)
--- a/src/compat/os/squid_sgi.h
+++ b/libsquid-compat/os/squid_sgi.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_SGI_H

diff --git a/src/compat/os/squid_solaris.h b/libsquid-compat/os/squid_solaris.h
similarity index 98%
rename from src/compat/os/squid_solaris.h
rename to libsquid-compat/os/squid_solaris.h
index 7afd978ef2664be5de0e6c58ce404c95ef926853..40ffdb7ce6ac3b32a5ec1b2f166003feaa0ec39c 100644 (file)
--- a/src/compat/os/squid_solaris.h
+++ b/libsquid-compat/os/squid_solaris.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_SOLARIS_H

diff --git a/src/compat/os/squid_sunos.h b/libsquid-compat/os/squid_sunos.h
similarity index 97%
rename from src/compat/os/squid_sunos.h
rename to libsquid-compat/os/squid_sunos.h
index c229be86d58d08f7ce19a8421105f1e0ffad20c0..25f891e5daa8d7ec74906f25fb8e8d0ac92c2b64 100644 (file)
--- a/src/compat/os/squid_sunos.h
+++ b/libsquid-compat/os/squid_sunos.h
@@ -1,5 +1,5 @@
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_SUNOS_H

diff --git a/src/compat/os/squid_windows.h b/libsquid-compat/os/squid_windows.h
similarity index 98%
rename from src/compat/os/squid_windows.h
rename to libsquid-compat/os/squid_windows.h
index a52687d4f16e7fd015a187ea984e24d68262c27f..ad11de15c7fb8aa405eb3dcdd0d86e6fb01d658a 100644 (file)
--- a/src/compat/os/squid_windows.h
+++ b/libsquid-compat/os/squid_windows.h
@@ -31,7 +31,7 @@
  *
  */
 #ifndef SQUID_CONFIG_H
-#include "squid.h"
+#include "config.h"
 #endif
 
 #ifndef SQUID_OS_WINDOWS_H

diff --git a/src/compat/osdetect.h b/libsquid-compat/osdetect.h
similarity index 100%
rename from src/compat/osdetect.h
rename to libsquid-compat/osdetect.h

diff --git a/src/compat/squid_fdsetsize.h b/libsquid-compat/squid_fdsetsize.h
similarity index 100%
rename from src/compat/squid_fdsetsize.h
rename to libsquid-compat/squid_fdsetsize.h

diff --git a/src/compat/squid_stdvarargs.h b/libsquid-compat/squid_stdvarargs.h
similarity index 100%
rename from src/compat/squid_stdvarargs.h
rename to libsquid-compat/squid_stdvarargs.h

diff --git a/src/compat/squid_valgrind.h b/libsquid-compat/squid_valgrind.h
similarity index 100%
rename from src/compat/squid_valgrind.h
rename to libsquid-compat/squid_valgrind.h

diff --git a/snmplib/Makefile.am b/snmplib/Makefile.am
index c7655f264e253b5582065a8c9df574e00a119f90..bac6f1bec56d0ec0bb9fdc47e62da3a5590d5768 100644 (file)
--- a/snmplib/Makefile.am
+++ b/snmplib/Makefile.am
@@ -10,7 +10,7 @@ libsnmp_a_SOURCES  = asn1.c parse.c snmp_vars.c \
        mib.c snmp_api_error.c   \
        snmp_msg.c \
        snmp_pdu.c  snmplib_debug.c
-INCLUDES       = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES       = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/libsquid-compat
 
 VERSION                = 3.4
 DEFS           = -DSQUID_SNMP=1

diff --git a/src/ICAP/Makefile.am b/src/ICAP/Makefile.am
index 0767983ff7d2602848339d44d90d71cf1dbdfbcf..f36cdd216ea7aa97f546acdd517e677115729b1e 100644 (file)
--- a/src/ICAP/Makefile.am
+++ b/src/ICAP/Makefile.am
@@ -3,6 +3,7 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 CLEANFILES =
 
 INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/include \
         -I$(top_srcdir)/src

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e16c4ebb2884e471806e6e9a626a336aa277d30..7b8b6851a5e90062deb3ab42e9c6af159ebc9d7f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -210,9 +210,15 @@ EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
 noinst_LIBRARIES = @DISK_LIBS@
 noinst_LTLIBRARIES = libsquid.la libauth.la
 
-INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include
-INCLUDES        += -I$(top_builddir)/lib -I$(top_srcdir)/lib
-INCLUDES       += @SQUID_CPPUNIT_INC@
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/lib/libTrie/include \
+       -I$(top_builddir)/lib \
+       -I$(top_srcdir)/lib \
+       @SQUID_CPPUNIT_INC@
 
 EXTRA_PROGRAMS = \
        DiskIO/DiskDaemon/diskd \

diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am
index 11a760b9c74937d128f58da5db325558d5ade692..f4ddb9a4bb07fc7ef645d9ab9251bdbe78aa0515 100644 (file)
--- a/src/adaptation/Makefile.am
+++ b/src/adaptation/Makefile.am
@@ -3,6 +3,7 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 CLEANFILES =
 
 INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/include \
         -I$(top_srcdir)/src

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 66ac094c857d7e5e83b07c6e405f5928c8f5e188..d2725e748043195c750c614e429385399336c46c 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -1,6 +1,6 @@
 #  Makefile for authentication modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.6 2005/10/23 11:55:38 hno Exp $
+#  $Id$
 #
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = @SQUID_CFLAGS@
@@ -15,7 +15,11 @@ libdigest_a_SOURCES  = digest/auth_digest.cc digest/auth_digest.h
 libntlm_a_SOURCES      = ntlm/auth_ntlm.cc ntlm/auth_ntlm.h
 libnegotiate_a_SOURCES = negotiate/auth_negotiate.cc negotiate/auth_negotiate.h negotiate/negotiateScheme.cc negotiate/negotiateScheme.h
 
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src
 
 check_PROGRAMS= testHeaders

diff --git a/src/eCAP/Makefile.am b/src/eCAP/Makefile.am
index d52aac9b905c09e3042e5328dc66fa8bfabcfac3..98ab01eec10a2e7a74469f48ecb47c4c949cb507 100644 (file)
--- a/src/eCAP/Makefile.am
+++ b/src/eCAP/Makefile.am
@@ -22,5 +22,9 @@ libeCAP_la_SOURCES = \
        \
        Registry.h
 
-INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
         -I$(top_srcdir)/src

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 119cf213cd98b466233b1913037d9ff7b14202de..36f3e65e8d71f77c6b13271e4d48f8d5b149257d 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,6 +1,6 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.15 2008/01/08 11:10:48 amosjeffries Exp $
+#  $Id$
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -28,7 +28,11 @@ EXTRA_DIST = \
        coss/StoreFScoss.h \
        ufs/StoreFSufs.h
 
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src
 
 check_PROGRAMS=testHeaders

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index dbdc3debd02318851ca1d3fe6d6e847fbb3d0e94..e4e8d1e12b4047c17627f45a22e4dd44c9602cc2 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -9,7 +9,13 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 DEFS = @DEFS@
 CLEANFILES = 
 
-INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/include \
+       -I$(top_builddir)/lib \
+       @SQUID_CPPUNIT_INC@
+
 $(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.

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index e36db69f4b9897d9598344359add5546e7559b4f..d075c3390ab8ce540f05c3450af01dc24b092406 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -9,7 +9,13 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 DEFS = @DEFS@
 CLEANFILES = 
 
-INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I$(top_srcdir)/include \
+       -I$(top_builddir)/lib \
+       -I$(top_srcdir)/src \
+       @SQUID_CPPUNIT_INC@ 
+
 $(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
 
 
@@ -46,6 +52,7 @@ testIpAddress_SOURCES= \
 nodist_testIpAddress_SOURCES= \
        ../tests/testMain.cc
 testIpAddress_LDADD= \
+       $(top_builddir)/libsquid-compat/libsquid-compat.la \
        libip.la \
        -L$(top_builddir)/lib -lmiscutil \
        @SQUID_CPPUNIT_LA@ \

diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am
index 1f08d0ef879d1760b6bcf4782f9415f684ff63fb..303036fc5aa38df2bda2b15614ff52d4b6575117 100644 (file)
--- a/src/repl/Makefile.am
+++ b/src/repl/Makefile.am
@@ -1,6 +1,6 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.7 2005/08/20 21:08:38 serassio Exp $
+#  $Id$
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -16,7 +16,11 @@ noinst_LIBRARIES = @REPL_LIBS@
 liblru_a_SOURCES = lru/store_repl_lru.cc
 libheap_a_SOURCES = heap/store_heap_replacement.h heap/store_heap_replacement.cc heap/store_repl_heap.cc
 
-INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
+INCLUDES = \
+       -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src
 
 check_PROGRAMS= testHeaders

diff --git a/src/squid.h b/src/squid.h
index 6c551af9fed53ed4631ae74f3aef0e1a0218c8c2..defc84096743ca9d17b03455aa5f9c1f1e42d6a5 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -186,26 +186,6 @@ using namespace Squid;
 #endif /* HAVE_POLL_H */
 #endif /* USE_POLL */
 
-/*
- * Filedescriptor limits in the different select loops
- *
- * NP: FreeBSD 7 defines FD_SETSIZE as unsigned but Squid needs
- *     it to be signed to compare it with signed values.
- *     Linux and others including FreeBSD <7, define it as signed.
- *     If this causes any issues please contact squid-dev@squid-cache.org
- */
-#if defined(USE_SELECT) || defined(USE_SELECT_WIN32)
-/* Limited by design */
-# define SQUID_MAXFD_LIMIT ((signed int)FD_SETSIZE)
-#elif defined(USE_POLL)
-/* Limited due to delay pools */
-# define SQUID_MAXFD_LIMIT ((signed int)FD_SETSIZE)
-#elif defined(USE_KQUEUE) || defined(USE_EPOLL)
-# define SQUID_FDSET_NOUSE 1
-#else
-# error Unknown select loop model!
-#endif
-
 
 /*
  * Trap unintentional use of fd_set. Must not be used outside the
@@ -219,35 +199,6 @@ using namespace Squid;
 # endif
 #endif
 
-#if defined(HAVE_STDARG_H)
-#include <stdarg.h>
-#define HAVE_STDARGS           /* let's hope that works everywhere (mj) */
-#define VA_LOCAL_DECL va_list ap;
-#define VA_START(f) va_start(ap, f)
-#define VA_SHIFT(v,t) ;                /* no-op for ANSI */
-#define VA_END va_end(ap)
-#else
-#if defined(HAVE_VARARGS_H)
-#include <varargs.h>
-#undef HAVE_STDARGS
-#define VA_LOCAL_DECL va_list ap;
-#define VA_START(f) va_start(ap)       /* f is ignored! */
-#define VA_SHIFT(v,t) v = va_arg(ap,t)
-#define VA_END va_end(ap)
-#else
-#error XX **NO VARARGS ** XX
-#endif
-#endif
-
-/* Make sure syslog goes after stdarg/varargs */
-#ifdef HAVE_SYSLOG_H
-#ifdef _SQUID_AIX_
-#define _XOPEN_EXTENDED_SOURCE
-#define _XOPEN_SOURCE_EXTENDED 1
-#endif
-#include <syslog.h>
-#endif
-
 #if HAVE_MATH_H
 #include <math.h>
 #endif
@@ -261,13 +212,6 @@ using namespace Squid;
 #define MAXPATHLEN SQUID_MAXPATHLEN
 #endif
 
-#if !HAVE_GETRUSAGE
-#if defined(_SQUID_HPUX_)
-#define HAVE_GETRUSAGE 1
-#define getrusage(a, b)  syscall(SYS_GETRUSAGE, a, b)
-#endif
-#endif
-
 #if !HAVE_STRUCT_RUSAGE
 /*
  * If we don't have getrusage() then we create a fake structure
@@ -324,20 +268,6 @@ SQUIDCEXTERN size_t getpagesize(void);
 #define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
 #endif
 
-#ifdef USE_GNUREGEX
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#include "GNUregex.h"
-#ifdef __cplusplus
-}
-
-#endif
-#elif HAVE_REGEX_H
-#include <regex.h>
-#endif
-
 #include "md5.h"
 
 #if USE_SSL

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index c089074c874c603bef438baa3127677b4757a0c4..9ce219d90ebe34aa7c5c6e4a5ea3cd9b3d0aac05 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.20 2007/01/04 20:52:57 hno Exp $
+#  $Id$
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -9,9 +9,20 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
-INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/libsquid-compat \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src
+
+LDADD = \
+       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/lib -lmiscutil \
+       $(top_builddir)/src/globals.o \
+       $(top_builddir)/src/time.o
 
 EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2 rfc1738
+
 EXTRA_DIST = testheaders.sh
 
 ESI_ALL_TESTS = \
@@ -50,7 +61,6 @@ check_PROGRAMS= debug \
                VirtualDeleteOperator
 
 
-LDADD =$(top_builddir)/src/globals.o $(top_builddir)/src/time.o -L$(top_builddir)/lib -lmiscutil
 tcp_banger2_LDADD = -L$(top_builddir)/lib -lmiscutil
 DEBUG_SOURCE = test_tools.cc
 debug_SOURCES = debug.cc $(DEBUG_SOURCE)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e898cc11c670ffc6d9625ae559ea691efabb738c..9147394ef8bbd2744fd8f233a9a1a5c813854edc 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,6 +8,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include -I$(top_srcdir)/src
+INCLUDES       += -I$(top_srcdir)/libsquid-compat
 INCLUDES       += @SQUID_CPPUNIT_INC@
 
 TESTS=$(check_PROGRAMS)