| --- misc/curl-7.19.7/configure 2009-11-04 13:26:02.000000000 +0100 |
| +++ misc/build/curl-7.19.7/configure 2015-09-04 11:58:00.331210000 +0100 |
| @@ -2735,8 +2735,8 @@ |
| |
| ac_ext=c |
| ac_cpp='$CPP $CPPFLAGS' |
| -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| |
| |
| @@ -3783,8 +3783,8 @@ |
| ac_save_CPPFLAGS="$CPPFLAGS" |
| ac_ext=c |
| ac_cpp='$CPP $CPPFLAGS' |
| -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| if test -n "$ac_tool_prefix"; then |
| # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
| @@ -4434,15 +4434,15 @@ |
| CFLAGS=$ac_save_CFLAGS |
| elif test $ac_cv_prog_cc_g = yes; then |
| if test "$GCC" = yes; then |
| - CFLAGS="-g -O2" |
| + CFLAGS="$ADDCFLAGS -g -O2" |
| else |
| - CFLAGS="-g" |
| + CFLAGS="$ADDCFLAGS -g" |
| fi |
| else |
| if test "$GCC" = yes; then |
| - CFLAGS="-O2" |
| + CFLAGS="$ADDCFLAGS -O2" |
| else |
| - CFLAGS= |
| + CFLAGS="$ADDCFLAGS" |
| fi |
| fi |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
| @@ -11276,7 +11276,7 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -11292,7 +11292,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -12151,7 +12151,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -12162,7 +12162,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -12180,7 +12180,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| --- misc/curl-7.19.7/lib/setup.h 2009-10-28 21:21:58.000000000 +0100 |
| +++ misc/build/curl-7.19.7/lib/setup.h 2009-11-18 13:30:42.375000000 +0100 |
| @@ -193,6 +193,7 @@ |
| # include <winsock2.h> |
| # ifdef HAVE_WS2TCPIP_H |
| # include <ws2tcpip.h> |
| +# include <wspiapi.h> |
| # endif |
| # else |
| # ifdef HAVE_WINSOCK_H |
| --- misc/curl-7.19.7/ltmain.sh 2009-11-04 13:25:51.000000000 +0100 |
| +++ misc/build/curl-7.19.7/ltmain.sh 2009-11-18 14:37:08.046875000 +0100 |
| @@ -6188,13 +6188,13 @@ |
| # which has an extra 1 added just for fun |
| # |
| case $version_type in |
| - darwin|linux|osf|windows|none) |
| + darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none) |
| func_arith $number_major + $number_minor |
| current=$func_arith_result |
| age="$number_minor" |
| revision="$number_revision" |
| ;; |
| - freebsd-aout|freebsd-elf|sunos) |
| + sunos) |
| current="$number_major" |
| revision="$number_minor" |
| age="0" |
| @@ -6271,8 +6271,8 @@ |
| ;; |
| |
| freebsd-elf) |
| - major=".$current" |
| - versuffix=".$current" |
| + major=.`expr $current - $age` |
| + versuffix="$major" |
| ;; |
| |
| irix | nonstopux) |
| --- misc/curl-7.19.7/lib/ssh.c 2009-10-30 23:28:56 +0100 |
| +++ misc/build/curl-7.19.7/lib/ssh.c 2009-10-31 11:33:05 +0100 |
| @@ -119,7 +119,7 @@ |
| static const char *sftp_libssh2_strerror(unsigned long err); |
| static LIBSSH2_ALLOC_FUNC(libssh2_malloc); |
| static LIBSSH2_REALLOC_FUNC(libssh2_realloc); |
| -static LIBSSH2_FREE_FUNC(libssh2_free); |
| +static LIBSSH2_FREE_FUNC(my_libssh2_free); |
| |
| static CURLcode get_pathname(const char **cpp, char **path); |
| |
| @@ -286,7 +286,7 @@ |
| return realloc(ptr, count); |
| } |
| |
| -static LIBSSH2_FREE_FUNC(libssh2_free) |
| +static LIBSSH2_FREE_FUNC(my_libssh2_free) |
| { |
| (void)abstract; /* arg not used */ |
| free(ptr); |