# Internal patch:
# - /usr/gnu/bin must come first, before /usr/bin in S11.
# - Sun Kerberos is incompatible with MIT Kerberos (all claim to the contrary
# notwithstanding).
# Not for upstream.
--- configure 2014-09-23 06:26:33.000000000 -0700
+++ configure 2015-03-19 11:00:25.287751237 -0700
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for neon 0.30.1.
#
@@ -19,6 +19,11 @@
## M4sh Initialization. ##
## -------------------- ##
+## Please do not protest about this patch. It is specific to
+## bash 4.1 on Solaris. libtool needs the GNU utilities from
+## /usr/gnu/bin.
+export PATH="/usr/gnu/bin:/usr/bin"
+
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
@@ -7122,7 +7127,7 @@
;;
esac
-
+export KRB5_CONFIG="/usr/bin/krb5-config"
# Check whether --with-gssapi was given.
if test "${with_gssapi+set}" = set; then :
@@ -7131,7 +7136,7 @@
if test "$with_gssapi" != "no"; then
# Extract the first word of "krb5-config", so it can be a program name with args.
-set dummy krb5-config; ac_word=$2
+set dummy /usr/bin/krb5-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_KRB5_CONFIG+:} false; then :
@@ -7178,8 +7183,8 @@
if test "x$KRB5_CONFIG" != "xnone"; then
ne_save_CPPFLAGS=$CPPFLAGS
ne_save_LIBS=$NEON_LIBS
- NEON_LIBS="$NEON_LIBS `${KRB5_CONFIG} --libs gssapi`"
- CPPFLAGS="$CPPFLAGS `${KRB5_CONFIG} --cflags gssapi`"
+ NEON_LIBS="$NEON_LIBS -lkrb5 -lgss"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/kerberos5 -I/usr/include/gssapi"
# MIT and Heimdal put gssapi.h in different places
for ac_header in gssapi/gssapi.h gssapi.h
do :
@@ -12718,7 +12723,7 @@
;;
esac
fi
- hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_libdir_flag_spec=''
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15333,6 +15338,7 @@
# in the --cflags output.
CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags | sed 's| -I/include||g'`"
NEON_LIBS="$NEON_LIBS `$XML2_CONFIG --libs | sed 's|-L/usr/lib ||g'`"
+ NEON_LIBS=`echo ${NEON_LIBS} | sed 's|-R/usr/lib ||g'`
for ac_header in libxml/xmlversion.h libxml/parser.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`