rename libsquid-compat directory to squid-compat

diff --git a/Makefile.am b/Makefile.am
index 59a259443dc086cd880c5c8eb797ff444457898b..278b348b70130a10b662cd9dd6cc5d500cd48b80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
 #
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-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
+DIST_SUBDIRS   = squid-compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
+SUBDIRS                = squid-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 96b55b8bde6ad8581d431044f44b3a44e781ca55..1a78189e9d8ea3ca8de3fceb1d3f336cdff95840 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3810,7 +3810,7 @@ rm -f core
 
 AC_CONFIG_FILES([\
        Makefile \
-       libsquid-compat/Makefile \
+       squid-compat/Makefile \
        lib/Makefile \
        scripts/Makefile \
        scripts/RunCache \

diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am
index a7cd0615268263aff47af3f31d4a4125ea066bbd..021132d604d68ee25f921242d05941cf619b649b 100644 (file)
--- a/helpers/basic_auth/LDAP/Makefile.am
+++ b/helpers/basic_auth/LDAP/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST            = squid_ldap_auth.8
 squid_ldap_auth_SOURCES        = squid_ldap_auth.c
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am
index 1e5181134316be1b076be5964b28de9dd9017fe2..1351f619b9e178bbb55406795afb31d808439b9c 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/MSNT/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = \
 sysconf_DATA = \
        msntauth.conf.default
 
-LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -L$(top_builddir)/libsquid-compat/libcompat.la
+LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -L$(top_builddir)/squid-compat/libcompat.la
 
 INCLUDES = \
        -I$(top_srcdir) \

diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am
index 6c22e9bfad2e02fc8882f6a8e85cdddf5993e862..b9dfefe9c4b6e48ad20142366eeef3c25cf54407 100644 (file)
--- a/helpers/basic_auth/NCSA/Makefile.am
+++ b/helpers/basic_auth/NCSA/Makefile.am
@@ -11,7 +11,7 @@ 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)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \

diff --git a/helpers/basic_auth/PAM/Makefile.am b/helpers/basic_auth/PAM/Makefile.am
index 6ea2a0a0cc22547bb04fde249df3231093338aa6..bc9206826e16290225d883b822a6d5c70467eaa9 100644 (file)
--- a/helpers/basic_auth/PAM/Makefile.am
+++ b/helpers/basic_auth/PAM/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lpam \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/SASL/Makefile.am b/helpers/basic_auth/SASL/Makefile.am
index bc7898208c3216a501b46509106f20f5553887d1..5c6d91fd48e237fb0b268ec4a2a7304958d78d66 100644 (file)
--- a/helpers/basic_auth/SASL/Makefile.am
+++ b/helpers/basic_auth/SASL/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIBSASL) \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/SMB/Makefile.am b/helpers/basic_auth/SMB/Makefile.am
index ea3e044a69066ca38b8948af436ce78b1816d07f..59182f471a937abd2fca4424a377248da5a2cf4a 100644 (file)
--- a/helpers/basic_auth/SMB/Makefile.am
+++ b/helpers/basic_auth/SMB/Makefile.am
@@ -27,6 +27,6 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.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 ff423ab42d97ced02cbf69498dbc190196dfc833..2e9c4018f1f3625fbc9425ac1d3b86a7a5898d00 100644 (file)
--- a/helpers/basic_auth/YP/Makefile.am
+++ b/helpers/basic_auth/YP/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.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 e5b6293e829ae1d3be2be25e1adfb2d5f1e5954d..4ca7098dccb6359bfb1570f7fa89c8747249da76 100644 (file)
--- a/helpers/basic_auth/getpwnam/Makefile.am
+++ b/helpers/basic_auth/getpwnam/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
        -I$(top_srcdir)/src
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.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 b5a0c72ed20ea0b29947f6664bfa367b0e3d04fc..8ff7ba2d44b859ed3124849ab17cb291c9895e84 100644 (file)
--- a/helpers/basic_auth/mswin_sspi/Makefile.am
+++ b/helpers/basic_auth/mswin_sspi/Makefile.am
@@ -12,7 +12,7 @@ libexec_PROGRAMS = mswin_auth
 mswin_auth_SOURCES = mswin_auth.c valid.c valid.h
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lnetapi32 -ladvapi32 -lsspwin32 \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/squid_radius_auth/Makefile.am b/helpers/basic_auth/squid_radius_auth/Makefile.am
index 73ba22fc2b2ec0f25f6daf7cb71e59325e4beffc..eaaf020fee1ef83eca578b4c5c9a0ecd906cc925 100644 (file)
--- a/helpers/basic_auth/squid_radius_auth/Makefile.am
+++ b/helpers/basic_auth/squid_radius_auth/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.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 1518e9ddd53491380ca450508626e369703bbd28..8d1efacff9c1b9ee747fcbf29089f6abfc2ff895 100644 (file)
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/helpers/digest_auth/eDirectory/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/digest_auth/ldap/Makefile.am b/helpers/digest_auth/ldap/Makefile.am
index 78ee12b3149b9202f0f1cb0ff381c782fdf7feee..f48fd4a76ce2e4bacabd6658c93fddbdc33380f3 100644 (file)
--- a/helpers/digest_auth/ldap/Makefile.am
+++ b/helpers/digest_auth/ldap/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/digest_auth/password/Makefile.am b/helpers/digest_auth/password/Makefile.am
index f2a47aa7a1e0d474c34c5425f11fb1a256b534e7..ee1d19aedb71a161764ec73aa0fdc77003f33da0 100644 (file)
--- a/helpers/digest_auth/password/Makefile.am
+++ b/helpers/digest_auth/password/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \

diff --git a/helpers/external_acl/ip_user/Makefile.am b/helpers/external_acl/ip_user/Makefile.am
index b2fae7871956f454ff52ca963820c8cdc38e4bb9..ab59c64c43bdb77befa36a4c1e14eb873b04d629 100644 (file)
--- a/helpers/external_acl/ip_user/Makefile.am
+++ b/helpers/external_acl/ip_user/Makefile.am
@@ -30,6 +30,6 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.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 ec4c08b295c4d514d775c1f9699c2f5b8201fafb..0fb9c1a6926c3fe40e208142097d563a3c00f896 100644 (file)
--- a/helpers/external_acl/ldap_group/Makefile.am
+++ b/helpers/external_acl/ldap_group/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/external_acl/mswin_ad_group/Makefile.am b/helpers/external_acl/mswin_ad_group/Makefile.am
index ded06eb385240c40bba855debf48692318f2ae97..7eecdc556980821d7584592881744d6116f26fea 100644 (file)
--- a/helpers/external_acl/mswin_ad_group/Makefile.am
+++ b/helpers/external_acl/mswin_ad_group/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lnetapi32 \
        -ladvapi32 \

diff --git a/helpers/external_acl/mswin_lm_group/Makefile.am b/helpers/external_acl/mswin_lm_group/Makefile.am
index 9ff52356ef29d221d9ca8dd8334d0f79a275852d..bfe22c830b7ecb432dd4a6fafaf4e74c74a116cc 100644 (file)
--- a/helpers/external_acl/mswin_lm_group/Makefile.am
+++ b/helpers/external_acl/mswin_lm_group/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lnetapi32 \
        -ladvapi32 \

diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am
index 43acbb366de7d2ab1aa0694734e6e23eed7d00fa..f25f44255edbdf4f28c0b269132606335b700163 100644 (file)
--- a/helpers/external_acl/session/Makefile.am
+++ b/helpers/external_acl/session/Makefile.am
@@ -18,5 +18,5 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        $(LIB_DB)

diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am
index e0f7dcefea616c66d3922368ea315478bc9de777..c6c179924cdb8dd15251a68f268bce380d692f02 100644 (file)
--- a/helpers/external_acl/unix_group/Makefile.am
+++ b/helpers/external_acl/unix_group/Makefile.am
@@ -18,6 +18,6 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        @XTRA_LIBS@

diff --git a/helpers/ntlm_auth/fakeauth/Makefile.am b/helpers/ntlm_auth/fakeauth/Makefile.am
index 74b99e9d4d93463431688949a8bba7d02f0a21d3..50aeb0b4c131f29bd98ad9ec0ea1366d07c1f6d3 100644 (file)
--- a/helpers/ntlm_auth/fakeauth/Makefile.am
+++ b/helpers/ntlm_auth/fakeauth/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.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 400080c50253a74db968294752b7014d0cc98c18..ecdd6927ac04f2524781b328d5be1b04d0f7cc21 100644 (file)
--- a/helpers/ntlm_auth/mswin_sspi/Makefile.am
+++ b/helpers/ntlm_auth/mswin_sspi/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil -lntlmauth \
        -lsspwin32 \
        -lnetapi32 \

diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/helpers/ntlm_auth/smb_lm/Makefile.am
index 70d523d3e51dfb9253d7e3b94ab75c016a5b5dfc..a7ae89378a29c5a962e43b2247216cf6c7310e25 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/Makefile.am
+++ b/helpers/ntlm_auth/smb_lm/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
        -I$(srcdir)/smbval
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lntlmauth -lmiscutil \
        smbval/libsmbvalid.a \
        $(CRYPTLIB) \

diff --git a/include/config.h b/include/config.h
index 5d91c3db40f1bb6093eee76cb476f9a3beaf2cfd..aed61508fad439611729e8f8e30dc7b997d12969 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -55,7 +55,7 @@
  *--------------------------------------------------------------------------*
  ****************************************************************************/
 
-#include "libsquid-compat/compat.h"
+#include "squid-compat/compat.h"
 
 #ifdef USE_POSIX_REGEX
 #ifndef USE_RE_SYNTAX

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

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

diff --git a/libsquid-compat/Makefile.am b/squid-compat/Makefile.am
similarity index 87%
rename from libsquid-compat/Makefile.am
rename to squid-compat/Makefile.am
index 49a4df0ad2853e8b17de433d981a3e805eb35e7a..c333c0e5e35660b9535b107c9e18e107206187f2 100644 (file)
--- a/libsquid-compat/Makefile.am
+++ b/squid-compat/Makefile.am
@@ -55,9 +55,9 @@ TESTS= $(check_PROGRAMS)
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
-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
+testHeaders: $(top_srcdir)/squid-compat/*.h $(top_srcdir)/libsquid-compat/os/*.h
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/squid-compat/" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/squid-compat/os/" || exit 1
 
 ## No such file...
 testHeaders.c:

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

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

diff --git a/libsquid-compat/compat.h b/squid-compat/compat.h
similarity index 73%
rename from libsquid-compat/compat.h
rename to squid-compat/compat.h
index 260bd4dae886aaa3371ecaaff83827d75276e76c..13f02fa1fe55bd386ad8bfaacf133cbb535716b4 100644 (file)
--- a/libsquid-compat/compat.h
+++ b/squid-compat/compat.h
@@ -7,7 +7,7 @@
 
 /*
  * From discussions it was chosen to push compat code as far down as possible.
- * That means we can have a seperate libsquid-compat for most
+ * That means we can have a seperate squid-compat for most
  *  compatability and portability hacks and resolutions.
  * 
  * This file is meant to collate all those hacks files together and
@@ -24,14 +24,14 @@
 /* Define the _SQUID_TYPE_ based on a guess of the OS */
 /* NP: this MUST come first within compat.h           */
 /******************************************************/
-#include "libsquid-compat/osdetect.h"
+#include "squid-compat/osdetect.h"
 
 
 /*****************************************************/
 /* FDSETSIZE is messy and needs to be done before    */
 /* sys/types.h are defined.                          */
 /*****************************************************/
-#include "libsquid-compat/fdsetsize.h"
+#include "squid-compat/fdsetsize.h"
 
 
 /*****************************************************/
@@ -49,20 +49,20 @@
 /* OS-macro wrapping should be done inside the OS .h */
 /*****************************************************/
 
-#include "libsquid-compat/os/aix.h"
-#include "libsquid-compat/os/dragonfly.h"
-#include "libsquid-compat/os/freebsd.h"
-#include "libsquid-compat/os/hpux.h"
-#include "libsquid-compat/os/linux.h"
-#include "libsquid-compat/os/mswin.h"
-#include "libsquid-compat/os/next.h"
-#include "libsquid-compat/os/openbsd.h"
-#include "libsquid-compat/os/os2.h"
-#include "libsquid-compat/os/qnx.h"
-#include "libsquid-compat/os/sgi.h"
-#include "libsquid-compat/os/solaris.h"
-#include "libsquid-compat/os/sunos.h"
-#include "libsquid-compat/os/windows.h"
+#include "squid-compat/os/aix.h"
+#include "squid-compat/os/dragonfly.h"
+#include "squid-compat/os/freebsd.h"
+#include "squid-compat/os/hpux.h"
+#include "squid-compat/os/linux.h"
+#include "squid-compat/os/mswin.h"
+#include "squid-compat/os/next.h"
+#include "squid-compat/os/openbsd.h"
+#include "squid-compat/os/os2.h"
+#include "squid-compat/os/qnx.h"
+#include "squid-compat/os/sgi.h"
+#include "squid-compat/os/solaris.h"
+#include "squid-compat/os/sunos.h"
+#include "squid-compat/os/windows.h"
 
 
 /*****************************************************/
@@ -70,16 +70,16 @@
 /* components as found to be needed                  */
 /*****************************************************/
 
-#include "libsquid-compat/compat_shared.h"
-#include "libsquid-compat/stdvarargs.h"
-#include "libsquid-compat/assert.h"
+#include "squid-compat/compat_shared.h"
+#include "squid-compat/stdvarargs.h"
+#include "squid-compat/assert.h"
 
 /*****************************************************/
 /* component-specific portabilities                  */
 /*****************************************************/
 
 /* Valgrind API macros changed between two versions squid supports */
-#include "libsquid-compat/valgrind.h"
+#include "squid-compat/valgrind.h"
 
 /* Endian functions are usualy handled by the OS but not always. */
 #include "squid_endian.h"
@@ -89,7 +89,7 @@
  * Default is to use a system provided one, but the bundle
  * may be used instead with explicit configuration.
  */
-#include "libsquid-compat/GnuRegex.h"
+#include "squid-compat/GnuRegex.h"
 
 
 #endif /* _SQUID_COMPAT_H */

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

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

diff --git a/libsquid-compat/os/aix.h b/squid-compat/os/aix.h
similarity index 100%
rename from libsquid-compat/os/aix.h
rename to squid-compat/os/aix.h

diff --git a/libsquid-compat/os/dragonfly.h b/squid-compat/os/dragonfly.h
similarity index 100%
rename from libsquid-compat/os/dragonfly.h
rename to squid-compat/os/dragonfly.h

diff --git a/libsquid-compat/os/freebsd.h b/squid-compat/os/freebsd.h
similarity index 100%
rename from libsquid-compat/os/freebsd.h
rename to squid-compat/os/freebsd.h

diff --git a/libsquid-compat/os/hpux.h b/squid-compat/os/hpux.h
similarity index 100%
rename from libsquid-compat/os/hpux.h
rename to squid-compat/os/hpux.h

diff --git a/libsquid-compat/os/linux.h b/squid-compat/os/linux.h
similarity index 100%
rename from libsquid-compat/os/linux.h
rename to squid-compat/os/linux.h

diff --git a/libsquid-compat/os/mswin.h b/squid-compat/os/mswin.h
similarity index 100%
rename from libsquid-compat/os/mswin.h
rename to squid-compat/os/mswin.h

diff --git a/libsquid-compat/os/next.h b/squid-compat/os/next.h
similarity index 100%
rename from libsquid-compat/os/next.h
rename to squid-compat/os/next.h

diff --git a/libsquid-compat/os/openbsd.h b/squid-compat/os/openbsd.h
similarity index 100%
rename from libsquid-compat/os/openbsd.h
rename to squid-compat/os/openbsd.h

diff --git a/libsquid-compat/os/os2.h b/squid-compat/os/os2.h
similarity index 100%
rename from libsquid-compat/os/os2.h
rename to squid-compat/os/os2.h

diff --git a/libsquid-compat/os/qnx.h b/squid-compat/os/qnx.h
similarity index 100%
rename from libsquid-compat/os/qnx.h
rename to squid-compat/os/qnx.h

diff --git a/libsquid-compat/os/sgi.h b/squid-compat/os/sgi.h
similarity index 100%
rename from libsquid-compat/os/sgi.h
rename to squid-compat/os/sgi.h

diff --git a/libsquid-compat/os/solaris.h b/squid-compat/os/solaris.h
similarity index 100%
rename from libsquid-compat/os/solaris.h
rename to squid-compat/os/solaris.h

diff --git a/libsquid-compat/os/sunos.h b/squid-compat/os/sunos.h
similarity index 100%
rename from libsquid-compat/os/sunos.h
rename to squid-compat/os/sunos.h

diff --git a/libsquid-compat/os/windows.h b/squid-compat/os/windows.h
similarity index 100%
rename from libsquid-compat/os/windows.h
rename to squid-compat/os/windows.h

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

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

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

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index 4c478e2811908c19934af45dd99880dfb3595457..beb3e0ddce0a2e9cef6b1a5f3dcb43ec8bbaeb1f 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -52,7 +52,7 @@ testIpAddress_SOURCES= \
 nodist_testIpAddress_SOURCES= \
        ../tests/testMain.cc
 testIpAddress_LDADD= \
-       $(top_builddir)/libsquid-compat/libcompat.la \
+       $(top_builddir)/squid-compat/libcompat.la \
        libip.la \
        -L$(top_builddir)/lib -lmiscutil \
        @SQUID_CPPUNIT_LA@ \

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 4ad39c60b198a8e2207443794062bb27f0c8e6db..1af447495b851386479c8d3805c73b8560c9ce6b 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
        -I$(top_srcdir)/src
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libcompat.la \
+       -L$(top_builddir)/squid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(top_builddir)/src/globals.o \
        $(top_builddir)/src/time.o