From: Amos Jeffries Date: Sat, 7 Feb 2009 03:14:20 +0000 (+1300) Subject: Include compat files with full path X-Git-Tag: SQUID_3_2_0_1~1190^2~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=677de4b3a4a26b23fd4f8d63070dbcbf007a8e3d;p=thirdparty%2Fsquid.git Include compat files with full path --- diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am index a721893ff1..985ba4529a 100644 --- a/helpers/basic_auth/LDAP/Makefile.am +++ b/helpers/basic_auth/LDAP/Makefile.am @@ -19,5 +19,5 @@ LDADD = \ $(XTRA_LIBS) INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am index 5e68b0bd91..9ef0046a19 100644 --- a/helpers/basic_auth/MSNT/Makefile.am +++ b/helpers/basic_auth/MSNT/Makefile.am @@ -30,7 +30,7 @@ sysconf_DATA = \ LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -L$(top_builddir)/libsquid-compat/libsquid-compat.la INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am index f41aaa752a..97adc869f2 100644 --- a/helpers/basic_auth/NCSA/Makefile.am +++ b/helpers/basic_auth/NCSA/Makefile.am @@ -18,6 +18,6 @@ LDADD = \ $(SSLLIB) INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -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 321027c0c1..96c5fa2a53 100644 --- a/helpers/basic_auth/PAM/Makefile.am +++ b/helpers/basic_auth/PAM/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = pam_auth.8 libexec_PROGRAMS = pam_auth INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include LDADD = \ diff --git a/helpers/basic_auth/SASL/Makefile.am b/helpers/basic_auth/SASL/Makefile.am index 5a40307330..b38d8c663d 100644 --- a/helpers/basic_auth/SASL/Makefile.am +++ b/helpers/basic_auth/SASL/Makefile.am @@ -9,7 +9,7 @@ libexec_PROGRAMS = sasl_auth INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include LDADD = \ diff --git a/helpers/basic_auth/SMB/Makefile.am b/helpers/basic_auth/SMB/Makefile.am index fcb640a1bf..2486197e82 100644 --- a/helpers/basic_auth/SMB/Makefile.am +++ b/helpers/basic_auth/SMB/Makefile.am @@ -23,7 +23,7 @@ smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_H EXTRA_DIST = smb_auth.sh COPYING-2.0 INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include LDADD = \ diff --git a/helpers/basic_auth/YP/Makefile.am b/helpers/basic_auth/YP/Makefile.am index 3caad7b372..be4e2f89f0 100644 --- a/helpers/basic_auth/YP/Makefile.am +++ b/helpers/basic_auth/YP/Makefile.am @@ -9,7 +9,7 @@ libexec_PROGRAMS = yp_auth yp_auth_SOURCES = yp_auth.c nis_support.h nis_support.c INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include LDADD = \ diff --git a/helpers/basic_auth/getpwnam/Makefile.am b/helpers/basic_auth/getpwnam/Makefile.am index 3c0eff0d38..3144d86666 100644 --- a/helpers/basic_auth/getpwnam/Makefile.am +++ b/helpers/basic_auth/getpwnam/Makefile.am @@ -12,7 +12,7 @@ libexec_PROGRAMS = getpwname_auth getpwname_auth_SOURCES = getpwnam_auth.c INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src diff --git a/helpers/basic_auth/mswin_sspi/Makefile.am b/helpers/basic_auth/mswin_sspi/Makefile.am index 5bebac8bcc..f636de33ec 100644 --- a/helpers/basic_auth/mswin_sspi/Makefile.am +++ b/helpers/basic_auth/mswin_sspi/Makefile.am @@ -18,7 +18,7 @@ LDADD = \ $(XTRA_LIBS) INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/basic_auth/squid_radius_auth/Makefile.am b/helpers/basic_auth/squid_radius_auth/Makefile.am index 5e117c24cd..12fe87963e 100644 --- a/helpers/basic_auth/squid_radius_auth/Makefile.am +++ b/helpers/basic_auth/squid_radius_auth/Makefile.am @@ -16,7 +16,7 @@ squid_radius_auth_SOURCES = \ radius-util.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include LDADD = \ diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/helpers/digest_auth/eDirectory/Makefile.am index 3e780bb766..34540c697a 100644 --- a/helpers/digest_auth/eDirectory/Makefile.am +++ b/helpers/digest_auth/eDirectory/Makefile.am @@ -15,7 +15,7 @@ digest_edir_auth_SOURCES = digest_pw_auth.c \ edir_ldapext.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/digest_auth/ldap/Makefile.am b/helpers/digest_auth/ldap/Makefile.am index b28b4786ae..8147727964 100644 --- a/helpers/digest_auth/ldap/Makefile.am +++ b/helpers/digest_auth/ldap/Makefile.am @@ -13,7 +13,7 @@ digest_ldap_auth_SOURCES = digest_pw_auth.c \ ldap_backend.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/digest_auth/password/Makefile.am b/helpers/digest_auth/password/Makefile.am index dedc6737af..359aaaa86c 100644 --- a/helpers/digest_auth/password/Makefile.am +++ b/helpers/digest_auth/password/Makefile.am @@ -13,7 +13,7 @@ digest_pw_auth_SOURCES = digest_pw_auth.c \ text_backend.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/external_acl/ip_user/Makefile.am b/helpers/external_acl/ip_user/Makefile.am index b6943424d0..5b77e91753 100644 --- a/helpers/external_acl/ip_user/Makefile.am +++ b/helpers/external_acl/ip_user/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = \ # sysconf_DATA = INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/external_acl/ldap_group/Makefile.am b/helpers/external_acl/ldap_group/Makefile.am index 3c5ee69aef..321cd37c42 100644 --- a/helpers/external_acl/ldap_group/Makefile.am +++ b/helpers/external_acl/ldap_group/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST = squid_ldap_group.8 squid_ldap_group_SOURCES = squid_ldap_group.c INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/external_acl/mswin_ad_group/Makefile.am b/helpers/external_acl/mswin_ad_group/Makefile.am index 3e8a66f53f..5136298c74 100644 --- a/helpers/external_acl/mswin_ad_group/Makefile.am +++ b/helpers/external_acl/mswin_ad_group/Makefile.am @@ -12,7 +12,7 @@ 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)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include LDADD = \ diff --git a/helpers/external_acl/mswin_lm_group/Makefile.am b/helpers/external_acl/mswin_lm_group/Makefile.am index 4fce8e5ff8..a8c08e6dc5 100644 --- a/helpers/external_acl/mswin_lm_group/Makefile.am +++ b/helpers/external_acl/mswin_lm_group/Makefile.am @@ -12,7 +12,7 @@ libexec_PROGRAMS = mswin_check_lm_group mswin_check_lm_group_SOURCES = win32_check_group.c win32_check_group.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am index 4ed4e51f0e..a2a8963196 100644 --- a/helpers/external_acl/session/Makefile.am +++ b/helpers/external_acl/session/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST = squid_session.8 squid_session_SOURCES = squid_session.c INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am index 3fb066105c..d877206676 100644 --- a/helpers/external_acl/unix_group/Makefile.am +++ b/helpers/external_acl/unix_group/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST = squid_unix_group.8 squid_unix_group_SOURCES = check_group.c INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/ntlm_auth/fakeauth/Makefile.am b/helpers/ntlm_auth/fakeauth/Makefile.am index 8e03d1783d..fada603be2 100644 --- a/helpers/ntlm_auth/fakeauth/Makefile.am +++ b/helpers/ntlm_auth/fakeauth/Makefile.am @@ -10,7 +10,7 @@ libexec_PROGRAMS = fakeauth_auth fakeauth_auth_SOURCES = fakeauth_auth.c ntlm.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/ntlm_auth/mswin_sspi/Makefile.am b/helpers/ntlm_auth/mswin_sspi/Makefile.am index d0eccfd099..af790c60ae 100644 --- a/helpers/ntlm_auth/mswin_sspi/Makefile.am +++ b/helpers/ntlm_auth/mswin_sspi/Makefile.am @@ -9,7 +9,7 @@ libexec_PROGRAMS = mswin_ntlm_auth mswin_ntlm_auth_SOURCES = libntlmssp.c ntlm_auth.c ntlm.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/helpers/ntlm_auth/smb_lm/Makefile.am index 70e1f1622e..516ed7ff59 100644 --- a/helpers/ntlm_auth/smb_lm/Makefile.am +++ b/helpers/ntlm_auth/smb_lm/Makefile.am @@ -8,7 +8,7 @@ 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$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/helpers/ntlm_auth/smb_lm/smbval/Makefile.am b/helpers/ntlm_auth/smb_lm/smbval/Makefile.am index 85993914b8..bad9fc9c1d 100644 --- a/helpers/ntlm_auth/smb_lm/smbval/Makefile.am +++ b/helpers/ntlm_auth/smb_lm/smbval/Makefile.am @@ -1,7 +1,7 @@ # makefile for smblib INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/include/config.h b/include/config.h index e4b401f6f3..5d91c3db40 100644 --- a/include/config.h +++ b/include/config.h @@ -55,7 +55,7 @@ *--------------------------------------------------------------------------* ****************************************************************************/ -#include "compat.h" +#include "libsquid-compat/compat.h" #ifdef USE_POSIX_REGEX #ifndef USE_RE_SYNTAX diff --git a/src/ICAP/Makefile.am b/src/ICAP/Makefile.am index f36cdd216e..d9b716308e 100644 --- a/src/ICAP/Makefile.am +++ b/src/ICAP/Makefile.am @@ -3,7 +3,7 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ CLEANFILES = INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src diff --git a/src/Makefile.am b/src/Makefile.am index 7b8b6851a5..7845f4152e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -211,7 +211,7 @@ noinst_LIBRARIES = @DISK_LIBS@ noinst_LTLIBRARIES = libsquid.la libauth.la INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am index f4ddb9a4bb..dcb27e2b6e 100644 --- a/src/adaptation/Makefile.am +++ b/src/adaptation/Makefile.am @@ -3,7 +3,7 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ CLEANFILES = INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -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 d2725e7480..70749bc172 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -16,7 +16,7 @@ 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$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/src/eCAP/Makefile.am b/src/eCAP/Makefile.am index 98ab01eec1..e9d1da4d22 100644 --- a/src/eCAP/Makefile.am +++ b/src/eCAP/Makefile.am @@ -23,7 +23,7 @@ libeCAP_la_SOURCES = \ Registry.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 36f3e65e8d..a5b20eefd0 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -29,7 +29,7 @@ EXTRA_DIST = \ ufs/StoreFSufs.h INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am index e4e8d1e12b..c2912c5ce4 100644 --- a/src/icmp/Makefile.am +++ b/src/icmp/Makefile.am @@ -10,7 +10,7 @@ DEFS = @DEFS@ CLEANFILES = INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am index d075c3390a..f1a2ce55b8 100644 --- a/src/ip/Makefile.am +++ b/src/ip/Makefile.am @@ -10,7 +10,7 @@ DEFS = @DEFS@ CLEANFILES = INCLUDES = \ - -I$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ -I$(top_srcdir)/src \ diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am index 303036fc5a..22a6bb6e65 100644 --- a/src/repl/Makefile.am +++ b/src/repl/Makefile.am @@ -17,7 +17,7 @@ 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$(top_srcdir)/libsquid-compat \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am index 9ce219d90e..34c79d5b59 100644 --- a/test-suite/Makefile.am +++ b/test-suite/Makefile.am @@ -9,7 +9,8 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ -INCLUDES = -I$(top_srcdir)/libsquid-compat \ +INCLUDES = \ + -I$(top_srcdir) \ -I. \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \