1 --- configure 2011-05-03 05:25:31.000000000 -0700 |
1 # Solaris Kerberos is not really 100% compatible with |
2 +++ configure 2012-10-08 15:14:24.436052062 -0700 |
2 # MIT Kerberos. This will change when MIT Kerberos integrates. |
3 @@ -12018,7 +12018,7 @@ |
3 # Patch to make libneon's ./configure understand Solaris Kerberos. |
|
4 # Not for upstream. |
|
5 --- configure 2014-09-23 06:26:33.000000000 -0700 |
|
6 +++ configure 2015-03-17 19:50:57.784317353 -0700 |
|
7 @@ -7122,7 +7122,7 @@ |
|
8 ;; |
|
9 esac |
|
10 |
|
11 - |
|
12 +export KRB5_CONFIG="/usr/bin/krb5-config" |
|
13 |
|
14 # Check whether --with-gssapi was given. |
|
15 if test "${with_gssapi+set}" = set; then : |
|
16 @@ -7131,7 +7131,7 @@ |
|
17 |
|
18 if test "$with_gssapi" != "no"; then |
|
19 # Extract the first word of "krb5-config", so it can be a program name with args. |
|
20 -set dummy krb5-config; ac_word=$2 |
|
21 +set dummy /usr/bin/krb5-config; ac_word=$2 |
|
22 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
23 $as_echo_n "checking for $ac_word... " >&6; } |
|
24 if ${ac_cv_path_KRB5_CONFIG+:} false; then : |
|
25 @@ -7178,8 +7178,8 @@ |
|
26 if test "x$KRB5_CONFIG" != "xnone"; then |
|
27 ne_save_CPPFLAGS=$CPPFLAGS |
|
28 ne_save_LIBS=$NEON_LIBS |
|
29 - NEON_LIBS="$NEON_LIBS `${KRB5_CONFIG} --libs gssapi`" |
|
30 - CPPFLAGS="$CPPFLAGS `${KRB5_CONFIG} --cflags gssapi`" |
|
31 + NEON_LIBS="$NEON_LIBS -lkrb5 -lgss" |
|
32 + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberos5 -I/usr/include/gssapi" |
|
33 # MIT and Heimdal put gssapi.h in different places |
|
34 for ac_header in gssapi/gssapi.h gssapi.h |
|
35 do : |
|
36 @@ -12718,7 +12718,7 @@ |
4 ;; |
37 ;; |
5 esac |
38 esac |
6 fi |
39 fi |
7 - hardcode_libdir_flag_spec='-R$libdir' |
40 - hardcode_libdir_flag_spec='-R$libdir' |
8 + hardcode_libdir_flag_spec='' |
41 + hardcode_libdir_flag_spec='' |
9 hardcode_shlibpath_var=no |
42 hardcode_shlibpath_var=no |
10 case $host_os in |
43 case $host_os in |
11 solaris2.[0-5] | solaris2.[0-5].*) ;; |
44 solaris2.[0-5] | solaris2.[0-5].*) ;; |
12 @@ -14580,6 +14580,7 @@ |
45 @@ -15333,6 +15333,7 @@ |
13 # in the --cflags output. |
46 # in the --cflags output. |
14 CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags | sed 's| -I/include||g'`" |
47 CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags | sed 's| -I/include||g'`" |
15 NEON_LIBS="$NEON_LIBS `$XML2_CONFIG --libs | sed 's|-L/usr/lib ||g'`" |
48 NEON_LIBS="$NEON_LIBS `$XML2_CONFIG --libs | sed 's|-L/usr/lib ||g'`" |
16 + NEON_LIBS=`echo ${NEON_LIBS} | sed 's|-R/usr/lib ||g'` |
49 + NEON_LIBS=`echo ${NEON_LIBS} | sed 's|-R/usr/lib ||g'` |
17 for ac_header in libxml/xmlversion.h libxml/parser.h |
50 for ac_header in libxml/xmlversion.h libxml/parser.h |