- rel 2; fix mirror segfault

[packages/lftp.git] / lftp-m4.patch

diff --git a/lftp-m4.patch b/lftp-m4.patch
index 57c7730aaa4b7a92228501b61733f444deac6947..c6f6b02a33ee74284a2358337bfc17785802865d 100644 (file)
--- a/lftp-m4.patch
+++ b/lftp-m4.patch
@@ -5,11 +5,79 @@
  AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls], [don't use GNUTLS library]),
        [with_gnutls=$withval], [with_gnutls=yes])
 -AC_ARG_WITH(openssl,
--AS_HELP_STRING([--with-openssl[[=/path]]], [use OpenSSL [at /path]])
+-AS_HELP_STRING([--with-openssl@<:@=/path@:>@], [use OpenSSL @<:@at /path@:>@])
 -AS_HELP_STRING([--without-openssl], [don't use OpenSSL (default)]),
 +AC_ARG_WITH(openssl,[
-+AS_HELP_STRING([--with-openssl=/path], [use OpenSSL at /path])
++AS_HELP_STRING([--with-openssl@<:@=/path@:>@], [use OpenSSL @<:@at /path@:>@])
 +AS_HELP_STRING([--without-openssl], [don't use OpenSSL (default)])],
        [with_openssl=$withval], [with_openssl=no])
  case "$with_openssl" in
        yes)            with_gnutls=no;;
+--- a/m4/ax_lib_expat.m4~      2016-02-20 14:57:52.000000000 +0100
++++ b/m4/ax_lib_expat.m4       2016-04-08 23:01:06.084309949 +0200
+@@ -109,7 +109,6 @@ AC_DEFUN([AX_LIB_EXPAT],
+ 
+     if test -n "$expat_prefix"; then
+         expat_include_dir="$expat_prefix/include"
+-        expat_ld_flags="-L$expat_prefix/lib"
+         expat_lib_flags="-lexpat"
+         run_expat_test="yes"
+     elif test "$expat_requested" = "yes"; then
+--- lftp-4.7.1/m4/ax_check_zlib.m4~    2016-02-20 14:57:52.000000000 +0100
++++ lftp-4.7.1/m4/ax_check_zlib.m4     2016-04-08 23:22:04.957699442 +0200
+@@ -105,7 +105,6 @@ then
+   ZLIB_OLD_LDFLAGS=$LDFLAGS
+   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+   AC_LANG_SAVE
+@@ -120,7 +119,6 @@ then
+     #
+     m4_ifblank([$1],[
+                 CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+-                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+                 LIBS="-lz $LIBS"
+                 AC_DEFINE([HAVE_LIBZ], [1],
+                           [Define to 1 if you have `z' library (-lz)])
+--- lftp-4.7.1/m4/lftp_lib_readline.m4~        2016-02-20 14:57:52.000000000 +0100
++++ lftp-4.7.1/m4/lftp_lib_readline.m4 2016-04-08 23:22:41.891914476 +0200
+@@ -107,7 +107,6 @@ AC_DEFUN([lftp_LIB_READLINE],
+       if test -f "$readline_include_dir/readline/readline.h"; then
+           readline_include_dir="$readline_include_dir/readline"
+       fi
+-        readline_ld_flags="-L$readline_prefix/lib"
+         readline_lib_flags="-lreadline"
+         run_readline_test="yes"
+     elif test "$readline_requested" = "yes"; then
+--- lftp-4.7.1/m4/ssl.m4~      2016-02-20 14:57:52.000000000 +0100
++++ lftp-4.7.1/m4/ssl.m4       2016-04-08 23:27:39.145077021 +0200
+@@ -10,7 +10,6 @@ AC_CACHE_VAL(lftp_cv_openssl,
+               old_CPPFLAGS="$CPPFLAGS"
+               LIBS="$LIBS -lssl -lcrypto"
+               if test $loc != default; then
+-                      LDFLAGS="$LDFLAGS -L$loc/lib"
+                       CPPFLAGS="$CPPFLAGS -I$loc/include"
+               fi
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
+@@ -21,7 +20,7 @@ AC_CACHE_VAL(lftp_cv_openssl,
+               if test $found_loc != "none"; then
+                       lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
+                       if test $found_loc != default; then
+-                              lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\""
++                              lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-R$found_loc/lib\""
+                               lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
+                       fi
+                       break;
+--- lftp-4.7.1/configure.ac~   2016-04-08 23:03:03.000000000 +0200
++++ lftp-4.7.1/configure.ac    2016-04-08 23:49:53.853139448 +0200
+@@ -306,7 +306,7 @@ fi
+ 
+ AX_CHECK_ZLIB([
+    AC_SUBST([ZLIB],[-lz])
+-   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"])
++   AC_SUBST([ZLIB_LDFLAGS],[""])
+    AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
+ ],[
+    AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])