1 --- configure.orig 2012-05-29 06:47:27.467999971 -0700 |
1 Solaris specific changes needed for how we configure curl. |
2 +++ configure 2012-05-29 06:59:52.994079022 -0700 |
2 |
3 @@ -2708,7 +2708,7 @@ |
3 These changes need to be sent upstream, but before that can be done, |
|
4 they need to be reworked. They also need to apply to configure.ac, |
|
5 not configure. |
|
6 |
|
7 --- configure.orig 2014-09-10 11:57:00.611789155 -0700 |
|
8 +++ configure 2014-09-10 13:24:14.999402937 -0700 |
|
9 @@ -2975,7 +2975,7 @@ |
4 |
10 |
5 |
11 |
6 |
12 |
7 -ac_config_headers="$ac_config_headers lib/curl_config.h include/curl/curlbuild.h" |
13 -ac_config_headers="$ac_config_headers lib/curl_config.h include/curl/curlbuild.h" |
8 +ac_config_headers="$ac_config_headers lib/curl_config.h" |
14 +ac_config_headers="$ac_config_headers lib/curl_config.h" |
9 |
15 |
10 : |
16 |
11 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
17 |
12 @@ -3207,12 +3207,6 @@ |
18 @@ -3501,12 +3501,6 @@ |
13 fi |
19 fi |
14 |
20 |
15 |
21 |
16 - |
22 - |
17 - |
23 - |
18 -if test -f ${srcdir}/include/curl/curlbuild.h; then |
24 -if test -f ${srcdir}/include/curl/curlbuild.h; then |
19 - rm -f ${srcdir}/include/curl/curlbuild.h |
25 - rm -f ${srcdir}/include/curl/curlbuild.h |
20 -fi |
26 -fi |
21 - |
27 - |
22 CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h` |
28 CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h` |
23 am__api_version="1.9" |
29 |
24 ac_aux_dir= |
30 xc_prog_cc_prev_IFS=$IFS |
25 @@ -20377,15 +20371,15 @@ |
31 @@ -21192,7 +21186,7 @@ |
26 LIBS="$LIBS $gss_libs" |
32 gss_libname="gss" |
27 elif test "$GSSAPI_ROOT" != "yes"; then |
33 ;; |
28 LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" |
34 *) |
29 - LIBS="$LIBS -lgssapi" |
35 - gss_libname="gssapi" |
30 + LIBS="$LIBS -lgss" |
36 + gss_libname="gss" |
31 else |
37 ;; |
32 - LIBS="$LIBS -lgssapi" |
38 esac |
33 + LIBS="$LIBS -lgss" |
39 |
34 fi |
40 @@ -21212,7 +21206,7 @@ |
|
41 LIBS="-lgss $LIBS" |
|
42 ;; |
|
43 *) |
|
44 - LIBS="-lgssapi $LIBS" |
|
45 + LIBS="-lgss $LIBS" |
35 ;; |
46 ;; |
36 esac |
47 esac |
37 else |
|
38 LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" |
|
39 - LIBS="$LIBS -lgssapi" |
|
40 + LIBS="$LIBS -lgss" |
|
41 fi |
48 fi |
42 else |
49 @@ -21311,7 +21305,7 @@ |
43 CPPFLAGS="$save_CPPFLAGS" |
|
44 @@ -20411,7 +20405,7 @@ |
|
45 if test x$cross_compiling != xyes; then |
50 if test x$cross_compiling != xyes; then |
46 PKGTEST="yes" |
51 PKGTEST="yes" |
47 fi |
52 fi |
48 - PREFIX_OPENSSL=/usr/local/ssl |
53 - PREFIX_OPENSSL=/usr/local/ssl |
49 + PREFIX_OPENSSL="/usr" |
54 + PREFIX_OPENSSL="/usr" |
50 LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff" |
55 LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff" |
51 ;; |
56 ;; |
52 off) |
57 off) |
53 @@ -25375,20 +25369,13 @@ |
58 @@ -26982,21 +26976,14 @@ |
54 |
59 |
55 |
60 |
56 |
61 |
57 -curl_preprocess_callconv="\ |
62 -curl_preprocess_callconv="\ |
58 -/* preprocess start */ |
63 -/* preprocess start */ |
64 -/* preprocess end */" |
69 -/* preprocess end */" |
65 +curl_preprocess_callconv="" |
70 +curl_preprocess_callconv="" |
66 |
71 |
67 |
72 |
68 # |
73 # |
|
74 # |
69 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5 |
75 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5 |
70 $as_echo_n "checking for curl_socklen_t data type... " >&6; } |
76 $as_echo_n "checking for curl_socklen_t data type... " >&6; } |
71 - curl_typeof_curl_socklen_t="unknown" |
77 - curl_typeof_curl_socklen_t="unknown" |
72 + curl_typeof_curl_socklen_t="socklen_t" |
78 + curl_typeof_curl_socklen_t="socklen_t" |
73 for arg1 in int SOCKET; do |
79 for arg1 in int SOCKET; do |
74 for arg2 in 'struct sockaddr' void; do |
80 for arg2 in 'struct sockaddr' void; do |
75 for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do |
81 for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do |
76 @@ -39129,7 +39116,6 @@ |
82 @@ -40418,7 +40405,6 @@ |
77 do |
83 do |
78 case $ac_config_target in |
84 case $ac_config_target in |
79 "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;; |
85 "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;; |
80 - "include/curl/curlbuild.h") CONFIG_HEADERS="$CONFIG_HEADERS include/curl/curlbuild.h" ;; |
86 - "include/curl/curlbuild.h") CONFIG_HEADERS="$CONFIG_HEADERS include/curl/curlbuild.h" ;; |
81 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
87 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |