Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/libneon/patches/000-configure.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 08 Apr 2015 14:38:53 -0700
changeset 4070 de7938d475ad
parent 1037 336412dc83cf
permissions -rw-r--r--
20722552 upgrade libneon to 0.30.1 20320354 problem in LIBRARY/NEON
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4070
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     1
 
# Solaris Kerberos is not really 100% compatible with
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     2
 
# MIT Kerberos. This will change when MIT Kerberos integrates.
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     3
 
# Patch to make libneon's ./configure understand Solaris Kerberos.
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     4
 
# Not for upstream.
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     5
 
--- configure	2014-09-23 06:26:33.000000000 -0700
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     6
 
+++ configure	2015-03-17 19:50:57.784317353 -0700
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     7
 
@@ -7122,7 +7122,7 @@
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     8
 
    ;;
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
     9
 
 esac
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    10
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    11
 
-
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    12
 
+export KRB5_CONFIG="/usr/bin/krb5-config"
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    13
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    14
 
 # Check whether --with-gssapi was given.
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    15
 
 if test "${with_gssapi+set}" = set; then :
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    16
 
@@ -7131,7 +7131,7 @@
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    17
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    18
 
 if test "$with_gssapi" != "no"; then
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    19
 
   # Extract the first word of "krb5-config", so it can be a program name with args.
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    20
 
-set dummy krb5-config; ac_word=$2
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    21
 
+set dummy /usr/bin/krb5-config; ac_word=$2
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    22
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    23
 
 $as_echo_n "checking for $ac_word... " >&6; }
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    24
 
 if ${ac_cv_path_KRB5_CONFIG+:} false; then :
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    25
 
@@ -7178,8 +7178,8 @@
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    26
 
 if test "x$KRB5_CONFIG" != "xnone"; then
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    27
 
    ne_save_CPPFLAGS=$CPPFLAGS
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    28
 
    ne_save_LIBS=$NEON_LIBS
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    29
 
-   NEON_LIBS="$NEON_LIBS `${KRB5_CONFIG} --libs gssapi`"
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    30
 
-   CPPFLAGS="$CPPFLAGS `${KRB5_CONFIG} --cflags gssapi`"
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    31
 
+   NEON_LIBS="$NEON_LIBS -lkrb5 -lgss"
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    32
 
+   CPPFLAGS="$CPPFLAGS -I/usr/include/kerberos5 -I/usr/include/gssapi"
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    33
 
    # MIT and Heimdal put gssapi.h in different places
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    34
 
    for ac_header in gssapi/gssapi.h gssapi.h
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    35
 
 do :
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    36
 
@@ -12718,7 +12718,7 @@
128
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
 	  ;;
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
 	esac
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
       fi
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
-      hardcode_libdir_flag_spec='-R$libdir'
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
+      hardcode_libdir_flag_spec=''
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
       hardcode_shlibpath_var=no
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    43
 
       case $host_os in
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    44
 
       solaris2.[0-5] | solaris2.[0-5].*) ;;
4070
de7938d475ad 20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1037
diff changeset 
    45
 
@@ -15333,6 +15333,7 @@
128
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    46
 
     # in the --cflags output.
07d15f3ddf16 7003241 Upgrade libneon to 0.29.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    47
 
     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 
    48
 
     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 
    49
 
+    NEON_LIBS=`echo ${NEON_LIBS} | sed 's|-R/usr/lib ||g'`
1037
336412dc83cf 7204859 Upgrade neon to 0.29.6
Stefan Teleman <stefan.teleman@oracle.com>
parents: 128
diff changeset 
    50
 
     for ac_header in libxml/xmlversion.h libxml/parser.h
336412dc83cf 7204859 Upgrade neon to 0.29.6
Stefan Teleman <stefan.teleman@oracle.com>
parents: 128
diff changeset 
    51
 
 do :
336412dc83cf 7204859 Upgrade neon to 0.29.6
Stefan Teleman <stefan.teleman@oracle.com>
parents: 128
diff changeset 
    52
 
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
upstream/oracle/userland-gate