From: Amos Jeffries Date: Sun, 8 Feb 2009 11:52:11 +0000 (+1300) Subject: rename libsquid-compat directory to squid-compat X-Git-Tag: SQUID_3_2_0_1~1190^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b58ea6815930cfb98ac854de9754c2e46069eaf;p=thirdparty%2Fsquid.git rename libsquid-compat directory to squid-compat --- diff --git a/Makefile.am b/Makefile.am index 59a259443d..278b348b70 100644 --- 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 96b55b8bde..1a78189e9d 100644 --- 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 a7cd061526..021132d604 100644 --- 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 1e51811343..1351f619b9 100644 --- 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 6c22e9bfad..b9dfefe9c4 100644 --- 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 6ea2a0a0cc..bc9206826e 100644 --- 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 bc7898208c..5c6d91fd48 100644 --- 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 ea3e044a69..59182f471a 100644 --- 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 ff423ab42d..2e9c4018f1 100644 --- 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 e5b6293e82..4ca7098dcc 100644 --- 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 b5a0c72ed2..8ff7ba2d44 100644 --- 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 73ba22fc2b..eaaf020fee 100644 --- 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 1518e9ddd5..8d1efacff9 100644 --- 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 78ee12b314..f48fd4a76c 100644 --- 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 f2a47aa7a1..ee1d19aedb 100644 --- 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 b2fae78719..ab59c64c43 100644 --- 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 ec4c08b295..0fb9c1a692 100644 --- 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 ded06eb385..7eecdc5569 100644 --- 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 9ff52356ef..bfe22c830b 100644 --- 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 43acbb366d..f25f44255e 100644 --- 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 e0f7dcefea..c6c179924c 100644 --- 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 74b99e9d4d..50aeb0b4c1 100644 --- 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 400080c502..ecdd6927ac 100644 --- 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 70d523d3e5..a7ae89378a 100644 --- 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 5d91c3db40..aed61508fa 100644 --- 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 49a4df0ad2..c333c0e5e3 100644 --- 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 260bd4dae8..13f02fa1fe 100644 --- 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 4c478e2811..beb3e0ddce 100644 --- 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 4ad39c60b1..1af447495b 100644 --- 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