packages: lftp/lftp-m4.patch - merged hunks

[qboosh]

Author: qboosh                       Date: Sat Sep 11 11:47:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged hunks

---- Files affected:
packages/lftp:
   lftp-m4.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/lftp/lftp-m4.patch
diff -u packages/lftp/lftp-m4.patch:1.3 packages/lftp/lftp-m4.patch:1.4
--- packages/lftp/lftp-m4.patch:1.3	Sat Sep 12 20:01:33 2009
+++ packages/lftp/lftp-m4.patch	Sat Sep 11 13:47:30 2010
@@ -5,21 +5,11 @@
  AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls], [don't use GNUTLS library]),
        [with_gnutls=$withval], [with_gnutls=yes])
 -AC_ARG_WITH(openssl,
-+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([--without-openssl], [don't use OpenSSL (default)])],
        [with_openssl=$withval], [with_openssl=no])
  case "$with_openssl" in
  	yes)		with_gnutls=no;;
---- lftp-4.0.0/configure.ac~	2009-09-12 19:40:40.005586037 +0200
-+++ lftp-4.0.0/configure.ac	2009-09-12 19:43:06.141403565 +0200
-@@ -255,7 +255,7 @@
- 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)])],
-       [with_openssl=$withval], [with_openssl=no])
- case "$with_openssl" in
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lftp/lftp-m4.patch?r1=1.3&r2=1.4&f=u