author | Srinivasa Sarva <srinivasa.sarva@oracle.com> |
Mon, 04 Apr 2011 15:06:13 -0700 | |
changeset 163 | 492ba3a66c6f |
child 211 | f37f16a2a99c |
permissions | -rw-r--r-- |
163
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
1 |
--- squid-2.7.STABLE9/helpers/basic_auth/SASL/Makefile.in.orig Wed Mar 23 01:57:21 2011 |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
2 |
+++ squid-2.7.STABLE9/helpers/basic_auth/SASL/Makefile.in Wed Mar 23 01:57:54 2011 |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
3 |
@@ -216,7 +216,7 @@ |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
4 |
top_builddir = @top_builddir@ |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
5 |
top_srcdir = @top_srcdir@ |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
6 |
INCLUDES = -I$(top_srcdir)/include |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
7 |
-LDADD = -L$(top_builddir)/lib -lmiscutil $(LIBSASL) $(XTRA_LIBS) |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
8 |
+LDADD = -L$(top_builddir)/lib -lmiscutil -lsasl $(XTRA_LIBS) |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
9 |
EXTRA_DIST = squid_sasl_auth squid_sasl_auth.conf |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
10 |
all: all-am |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
11 |
|
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
12 |
--- squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig Thu Feb 24 14:16:07 2011 |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
13 |
+++ squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.in Thu Feb 24 14:16:17 2011 |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
14 |
@@ -230,7 +230,7 @@ |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
15 |
|
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
16 |
# MIT |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
17 |
KERBINC = |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
18 |
-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
19 |
+KERBLIBS =-R /usr/lib/gss -L/usr/lib/gss -lgss /usr/lib/gss/mech_krb5.so -lkrb5 -lsocket |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
20 |
all: all-am |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
21 |
|
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
22 |
.SUFFIXES: |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
23 |
|
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
24 |
--- squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.am.orig Thu Feb 24 14:15:59 2011 |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
25 |
+++ squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.am Thu Feb 24 14:16:17 2011 |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
26 |
@@ -23,5 +23,5 @@ |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
27 |
|
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
28 |
# MIT |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
29 |
KERBINC = |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
30 |
-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
31 |
+KERBLIBS =-R /usr/lib/gss -L/usr/lib/gss -lgss /usr/lib/gss/mech_krb5.so -lkrb5 -lsocket |
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
32 |
|
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
33 |
|
492ba3a66c6f
7029211 Move squid to userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
34 |