- up to 4.7.3

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

diff --git a/lftp-m4.patch b/lftp-m4.patch
index 07213f33f61e94ff8956946d5eca50cb4b8b6575..c6f6b02a33ee74284a2358337bfc17785802865d 100644 (file)
--- a/lftp-m4.patch
+++ b/lftp-m4.patch
@@ -51,3 +51,33 @@
          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])