components/curl/patches/000-configure.patch
author Ben Chang <Benjamin.Chang@Oracle.COM>
Thu, 03 Sep 2015 10:37:09 -0700
branchs11u2-sru
changeset 4846 c9d26ef6cefd
parent 4799 f6da2b76c51b
permissions -rw-r--r--
21674580 Upgrade Solaris to BIND 9.6-ESV-R11-P3 21674511 problem in SERVICE/DNS-SERVER

Solaris specific changes needed for how we configure curl.

These changes need to be sent upstream, but before that can be done,
they need to be reworked. They also need to apply to configure.ac,
not configure.

--- configure.orig	2014-09-10 11:57:00.611789155 -0700
+++ configure	2014-09-10 13:24:14.999402937 -0700
@@ -2975,7 +2975,7 @@
 
 
 
-ac_config_headers="$ac_config_headers lib/curl_config.h include/curl/curlbuild.h"
+ac_config_headers="$ac_config_headers lib/curl_config.h"
 
 
 
@@ -3501,12 +3501,6 @@
 fi
 
 
-
-
-if test -f ${srcdir}/include/curl/curlbuild.h; then
-  rm -f ${srcdir}/include/curl/curlbuild.h
-fi
-
 CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h`
 
   xc_prog_cc_prev_IFS=$IFS
@@ -21192,7 +21186,7 @@
               gss_libname="gss"
               ;;
            *)
-              gss_libname="gssapi"
+              gss_libname="gss"
               ;;
            esac
 
@@ -21212,7 +21206,7 @@
         LIBS="-lgss $LIBS"
         ;;
      *)
-        LIBS="-lgssapi $LIBS"
+        LIBS="-lgss $LIBS"
         ;;
      esac
   fi
@@ -21311,7 +21305,7 @@
         if test x$cross_compiling != xyes; then
             PKGTEST="yes"
     fi
-    PREFIX_OPENSSL=/usr/local/ssl
+    PREFIX_OPENSSL="/usr"
     LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
     ;;
   off)
@@ -26982,21 +26976,14 @@
 
 
 
-curl_preprocess_callconv="\
-/* preprocess start */
-#ifdef HAVE_WINDOWS_H
-#  define FUNCALLCONV __stdcall
-#else
-#  define FUNCALLCONV
-#endif
-/* preprocess end */"
+curl_preprocess_callconv=""
 
 
         #
     #
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5
 $as_echo_n "checking for curl_socklen_t data type... " >&6; }
-  curl_typeof_curl_socklen_t="unknown"
+  curl_typeof_curl_socklen_t="socklen_t"
   for arg1 in int SOCKET; do
     for arg2 in 'struct sockaddr' void; do
       for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
@@ -40418,7 +40405,6 @@
 do
   case $ac_config_target in
     "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;;
-    "include/curl/curlbuild.h") CONFIG_HEADERS="$CONFIG_HEADERS include/curl/curlbuild.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;