lftp-m4.patch

   1 --- lftp-4.0.0/configure.ac~    2009-09-12 19:39:22.434759846 +0200
   2 +++ lftp-4.0.0/configure.ac     2009-09-12 19:39:56.352256686 +0200
   3 @@ -254,9 +254,9 @@
   4
   5  AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls], [don't use GNUTLS library]),
   6        [with_gnutls=$withval], [with_gnutls=yes])
   7 -AC_ARG_WITH(openssl,
   8 -AS_HELP_STRING([--with-openssl@<:@=/path@:>@], [use OpenSSL @<:@at /path@:>@])
   9 -AS_HELP_STRING([--without-openssl], [don't use OpenSSL (default)]),
  10 +AC_ARG_WITH(openssl,[
  11 +AS_HELP_STRING([--with-openssl@<:@=/path@:>@], [use OpenSSL @<:@at /path@:>@])
  12 +AS_HELP_STRING([--without-openssl], [don't use OpenSSL (default)])],
  13        [with_openssl=$withval], [with_openssl=no])
  14  case "$with_openssl" in
  15         yes)            with_gnutls=no;;
  16 --- a/m4/ax_lib_expat.m4~       2016-02-20 14:57:52.000000000 +0100
  17 +++ b/m4/ax_lib_expat.m4        2016-04-08 23:01:06.084309949 +0200
  18 @@ -109,7 +109,6 @@ AC_DEFUN([AX_LIB_EXPAT],
  19
  20      if test -n "$expat_prefix"; then
  21          expat_include_dir="$expat_prefix/include"
  22 -        expat_ld_flags="-L$expat_prefix/lib"
  23          expat_lib_flags="-lexpat"
  24          run_expat_test="yes"
  25      elif test "$expat_requested" = "yes"; then
  26 --- lftp-4.7.1/m4/ax_check_zlib.m4~     2016-02-20 14:57:52.000000000 +0100
  27 +++ lftp-4.7.1/m4/ax_check_zlib.m4      2016-04-08 23:22:04.957699442 +0200
  28 @@ -105,7 +105,6 @@ then
  29    ZLIB_OLD_LDFLAGS=$LDFLAGS
  30    ZLIB_OLD_CPPFLAGS=$CPPFLAGS
  31    if test -n "${ZLIB_HOME}"; then
  32 -        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
  33          CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
  34    fi
  35    AC_LANG_SAVE
  36 @@ -120,7 +119,6 @@ then
  37      #
  38      m4_ifblank([$1],[
  39                  CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
  40 -                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
  41                  LIBS="-lz $LIBS"
  42                  AC_DEFINE([HAVE_LIBZ], [1],
  43                            [Define to 1 if you have `z' library (-lz)])
  44 --- lftp-4.7.1/m4/lftp_lib_readline.m4~ 2016-02-20 14:57:52.000000000 +0100
  45 +++ lftp-4.7.1/m4/lftp_lib_readline.m4  2016-04-08 23:22:41.891914476 +0200
  46 @@ -107,7 +107,6 @@ AC_DEFUN([lftp_LIB_READLINE],
  47         if test -f "$readline_include_dir/readline/readline.h"; then
  48             readline_include_dir="$readline_include_dir/readline"
  49         fi
  50 -        readline_ld_flags="-L$readline_prefix/lib"
  51          readline_lib_flags="-lreadline"
  52          run_readline_test="yes"
  53      elif test "$readline_requested" = "yes"; then
  54 --- lftp-4.7.1/m4/ssl.m4~       2016-02-20 14:57:52.000000000 +0100
  55 +++ lftp-4.7.1/m4/ssl.m4        2016-04-08 23:27:39.145077021 +0200
  56 @@ -10,7 +10,6 @@ AC_CACHE_VAL(lftp_cv_openssl,
  57                 old_CPPFLAGS="$CPPFLAGS"
  58                 LIBS="$LIBS -lssl -lcrypto"
  59                 if test $loc != default; then
  60 -                       LDFLAGS="$LDFLAGS -L$loc/lib"
  61                         CPPFLAGS="$CPPFLAGS -I$loc/include"
  62                 fi
  63                 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
  64 @@ -21,7 +20,7 @@ AC_CACHE_VAL(lftp_cv_openssl,
  65                 if test $found_loc != "none"; then
  66                         lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
  67                         if test $found_loc != default; then
  68 -                               lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\""
  69 +                               lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-R$found_loc/lib\""
  70                                 lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
  71                         fi
  72                         break;
  73 --- lftp-4.7.1/configure.ac~    2016-04-08 23:03:03.000000000 +0200
  74 +++ lftp-4.7.1/configure.ac     2016-04-08 23:49:53.853139448 +0200
  75 @@ -306,7 +306,7 @@ fi
  76
  77  AX_CHECK_ZLIB([
  78     AC_SUBST([ZLIB],[-lz])
  79 -   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"])
  80 +   AC_SUBST([ZLIB_LDFLAGS],[""])
  81     AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
  82  ],[
  83     AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])