Shuffle squid-compat to compat/

diff --git a/Makefile.am b/Makefile.am
index 278b348b70130a10b662cd9dd6cc5d500cd48b80..327b61c52e2de0da68a2e58ba7e681127c4f1da1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
 #
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
-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
+DIST_SUBDIRS   = compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
+SUBDIRS                = 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/squid-compat/GnuRegex.c b/compat/GnuRegex.c
similarity index 100%
rename from squid-compat/GnuRegex.c
rename to compat/GnuRegex.c

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

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

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

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

diff --git a/squid-compat/compat.h b/compat/compat.h
similarity index 75%
rename from squid-compat/compat.h
rename to compat/compat.h
index 13f02fa1fe55bd386ad8bfaacf133cbb535716b4..7f5dff032d9cd6758a4775c2edfb522765e3043e 100644 (file)
--- a/squid-compat/compat.h
+++ b/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 squid-compat for most
+ * That means we can have a seperate 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 "squid-compat/osdetect.h"
+#include "compat/osdetect.h"
 
 
 /*****************************************************/
 /* FDSETSIZE is messy and needs to be done before    */
 /* sys/types.h are defined.                          */
 /*****************************************************/
-#include "squid-compat/fdsetsize.h"
+#include "compat/fdsetsize.h"
 
 
 /*****************************************************/
@@ -49,20 +49,20 @@
 /* OS-macro wrapping should be done inside the OS .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"
+#include "compat/os/aix.h"
+#include "compat/os/dragonfly.h"
+#include "compat/os/freebsd.h"
+#include "compat/os/hpux.h"
+#include "compat/os/linux.h"
+#include "compat/os/mswin.h"
+#include "compat/os/next.h"
+#include "compat/os/openbsd.h"
+#include "compat/os/os2.h"
+#include "compat/os/qnx.h"
+#include "compat/os/sgi.h"
+#include "compat/os/solaris.h"
+#include "compat/os/sunos.h"
+#include "compat/os/windows.h"
 
 
 /*****************************************************/
@@ -70,16 +70,16 @@
 /* components as found to be needed                  */
 /*****************************************************/
 
-#include "squid-compat/compat_shared.h"
-#include "squid-compat/stdvarargs.h"
-#include "squid-compat/assert.h"
+#include "compat/compat_shared.h"
+#include "compat/stdvarargs.h"
+#include "compat/assert.h"
 
 /*****************************************************/
 /* component-specific portabilities                  */
 /*****************************************************/
 
 /* Valgrind API macros changed between two versions squid supports */
-#include "squid-compat/valgrind.h"
+#include "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 "squid-compat/GnuRegex.h"
+#include "compat/GnuRegex.h"
 
 
 #endif /* _SQUID_COMPAT_H */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/configure.in b/configure.in
index 6e0718d0bef2f24fe89677070771615a855f9a32..e01712a7f4bb6695ff92bd2cce0f13fe25e44907 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3790,7 +3790,7 @@ rm -f core
 
 AC_CONFIG_FILES([\
        Makefile \
-       squid-compat/Makefile \
+       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 021132d604d68ee25f921242d05941cf619b649b..7a0e1f4552df52c954c957cbe717bd0f0e814ccc 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 1351f619b9e178bbb55406795afb31d808439b9c..3ae2747499db11e0697b0c9fa73934c717f2e9df 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)/squid-compat/libcompat.la
+LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -L$(top_builddir)/compat/libcompat.la
 
 INCLUDES = \
        -I$(top_srcdir) \

diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am
index b9dfefe9c4b6e48ad20142366eeef3c25cf54407..088e4136a87200724f81c59219dbbfca4f19182d 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 bc9206826e16290225d883b822a6d5c70467eaa9..cf1f823c75bcfeb91e349c0eea52104e8c35f588 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 5c6d91fd48e237fb0b268ec4a2a7304958d78d66..29aa13904a0c62dc2d4a97581e6101020d109861 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 59182f471a937abd2fca4424a377248da5a2cf4a..018df05e1260f5cbe5d5c7fc2d08919da7e3e0e2 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 2e9c4018f1f3625fbc9425ac1d3b86a7a5898d00..dc34cc39ea2acd542e652bf743f615c326b4e453 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 4ca7098dccb6359bfb1570f7fa89c8747249da76..7daa5833b95fc182f98e3516c2f3233d88eceb8c 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 8ff7ba2d44b859ed3124849ab17cb291c9895e84..31fd12afaf7a2a9a123da0080823cb1d3727e475 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 eaaf020fee1ef83eca578b4c5c9a0ecd906cc925..4dfb4e2b80d4b1dba1a67ad21de1f4405ec36928 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 8d1efacff9c1b9ee747fcbf29089f6abfc2ff895..6edcf990cd7d95afa36a13ab6e055f42afb35f74 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 f48fd4a76ce2e4bacabd6658c93fddbdc33380f3..3c52436b54b0fad68ee6767af126c0deb7c8c881 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 ee1d19aedb71a161764ec73aa0fdc77003f33da0..c4231331aec7b011ddf9d2cdf1a8d4257374fcac 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 ab59c64c43bdb77befa36a4c1e14eb873b04d629..4cf22dc045a5f2f05d2639cbfccbb73927297853 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 0fb9c1a6926c3fe40e208142097d563a3c00f896..30eb21414cc4fab1affd1c962f3cde3f4869c166 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 7eecdc556980821d7584592881744d6116f26fea..70d8895f9e850b4e407bf23a66df03ad1470b661 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 bfe22c830b7ecb432dd4a6fafaf4e74c74a116cc..67c55f0037bea8be33465c9ff0d431c5aa342c20 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 40700cbe1cefd85944a70451be2faa9e2b2e4862..b1ac089b841df9d69a8ca2090c2625a69ed90694 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/compat/libcompat.la \
        @LIB_DB@

diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am
index c6c179924cdb8dd15251a68f268bce380d692f02..fb023587b6191826415990db0ce098f61e144f35 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 50aeb0b4c131f29bd98ad9ec0ea1366d07c1f6d3..2b2fcad593f670f603477d7beb400389cf2c6c23 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 ecdd6927ac04f2524781b328d5be1b04d0f7cc21..87c61a5058f1554a1a02007c71282385613adfdc 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/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 a7ae89378a29c5a962e43b2247216cf6c7310e25..aa039e87b32930f8088ce5aeaa211f1aed32e148 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lntlmauth -lmiscutil \
        smbval/libsmbvalid.a \
        $(CRYPTLIB) \

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

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index beb3e0ddce0a2e9cef6b1a5f3dcb43ec8bbaeb1f..4961985eab4d137532aa1979d8519d2a0f541ff6 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)/squid-compat/libcompat.la \
+       $(top_builddir)/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 1af447495b851386479c8d3805c73b8560c9ce6b..47e2365d93f23f8d63be89125e84fa32bfbe56fc 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)/squid-compat/libcompat.la \
+       -L$(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(top_builddir)/src/globals.o \
        $(top_builddir)/src/time.o