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