1 --- configure 2011-05-03 05:25:31.000000000 -0700 |
1 # Internal patch: |
2 +++ configure 2012-10-08 15:14:24.436052062 -0700 |
2 # - /usr/gnu/bin must come first, before /usr/bin in S11. |
3 @@ -12018,7 +12018,7 @@ |
3 # - Sun Kerberos is incompatible with MIT Kerberos (all claim to the contrary |
|
4 # notwithstanding). |
|
5 # Not for upstream. |
|
6 --- configure 2014-09-23 06:26:33.000000000 -0700 |
|
7 +++ configure 2015-03-19 11:00:25.287751237 -0700 |
|
8 @@ -1,4 +1,4 @@ |
|
9 -#! /bin/sh |
|
10 +#!/bin/bash |
|
11 # Guess values for system-dependent variables and create Makefiles. |
|
12 # Generated by GNU Autoconf 2.69 for neon 0.30.1. |
|
13 # |
|
14 @@ -19,6 +19,11 @@ |
|
15 ## M4sh Initialization. ## |
|
16 ## -------------------- ## |
|
17 |
|
18 +## Please do not protest about this patch. It is specific to |
|
19 +## bash 4.1 on Solaris. libtool needs the GNU utilities from |
|
20 +## /usr/gnu/bin. |
|
21 +export PATH="/usr/gnu/bin:/usr/bin" |
|
22 + |
|
23 # Be more Bourne compatible |
|
24 DUALCASE=1; export DUALCASE # for MKS sh |
|
25 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : |
|
26 @@ -7122,7 +7127,7 @@ |
|
27 ;; |
|
28 esac |
|
29 |
|
30 - |
|
31 +export KRB5_CONFIG="/usr/bin/krb5-config" |
|
32 |
|
33 # Check whether --with-gssapi was given. |
|
34 if test "${with_gssapi+set}" = set; then : |
|
35 @@ -7131,7 +7136,7 @@ |
|
36 |
|
37 if test "$with_gssapi" != "no"; then |
|
38 # Extract the first word of "krb5-config", so it can be a program name with args. |
|
39 -set dummy krb5-config; ac_word=$2 |
|
40 +set dummy /usr/bin/krb5-config; ac_word=$2 |
|
41 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
42 $as_echo_n "checking for $ac_word... " >&6; } |
|
43 if ${ac_cv_path_KRB5_CONFIG+:} false; then : |
|
44 @@ -7178,8 +7183,8 @@ |
|
45 if test "x$KRB5_CONFIG" != "xnone"; then |
|
46 ne_save_CPPFLAGS=$CPPFLAGS |
|
47 ne_save_LIBS=$NEON_LIBS |
|
48 - NEON_LIBS="$NEON_LIBS `${KRB5_CONFIG} --libs gssapi`" |
|
49 - CPPFLAGS="$CPPFLAGS `${KRB5_CONFIG} --cflags gssapi`" |
|
50 + NEON_LIBS="$NEON_LIBS -lkrb5 -lgss" |
|
51 + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberos5 -I/usr/include/gssapi" |
|
52 # MIT and Heimdal put gssapi.h in different places |
|
53 for ac_header in gssapi/gssapi.h gssapi.h |
|
54 do : |
|
55 @@ -12718,7 +12723,7 @@ |
4 ;; |
56 ;; |
5 esac |
57 esac |
6 fi |
58 fi |
7 - hardcode_libdir_flag_spec='-R$libdir' |
59 - hardcode_libdir_flag_spec='-R$libdir' |
8 + hardcode_libdir_flag_spec='' |
60 + hardcode_libdir_flag_spec='' |
9 hardcode_shlibpath_var=no |
61 hardcode_shlibpath_var=no |
10 case $host_os in |
62 case $host_os in |
11 solaris2.[0-5] | solaris2.[0-5].*) ;; |
63 solaris2.[0-5] | solaris2.[0-5].*) ;; |
12 @@ -14580,6 +14580,7 @@ |
64 @@ -15333,6 +15338,7 @@ |
13 # in the --cflags output. |
65 # in the --cflags output. |
14 CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags | sed 's| -I/include||g'`" |
66 CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags | sed 's| -I/include||g'`" |
15 NEON_LIBS="$NEON_LIBS `$XML2_CONFIG --libs | sed 's|-L/usr/lib ||g'`" |
67 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'` |
68 + NEON_LIBS=`echo ${NEON_LIBS} | sed 's|-R/usr/lib ||g'` |
17 for ac_header in libxml/xmlversion.h libxml/parser.h |
69 for ac_header in libxml/xmlversion.h libxml/parser.h |