Re: [Bug-wget] Wget tests

2016-08-16 Thread Tim Rühsen 
On Dienstag, 16. August 2016 11:23:04 CEST Dale R. Worley wrote:
> Tim Rühsen  writes:
> > We use standard automake tests (search the internet if you are interested
> > in details).
> > 
> > We have the 'legacy' tests/ directory with tests written in Perl. And the
> > 'current' testenv/ directory with tests written in Python.
> > 
> > See tests/Makefile.am resp. testenv/Makefile.am for the list of executed
> > tests.
> That points to part of the problem:  I don't have those files in the Git
> repository I downloaded from savannah.gnu.edu.  ("git clone
> git://git.savannah.gnu.org/wget.git")

Somethin went wrong... try again:

tim@debian:/tmp$ git clone git://git.savannah.gnu.org/wget.git
Klone nach 'wget' ...
remote: Counting objects: 29988, done.
remote: Compressing objects: 100% (5909/5909), done.
remote: Total 29988 (delta 23999), reused 29934 (delta 23968)
Empfange Objekte: 100% (29988/29988), 12.20 MiB | 237.00 KiB/s, Fertig. 

Löse Unterschiede auf: 100% (23999/23999), Fertig.  

Prüfe Konnektivität ... Fertig. 


tim@debian:/tmp$ cd wget

tim@debian:/tmp/wget$ ls -la
 
insgesamt 852   

drwxr-xr-x 15 tim  tim 660 Aug 16 18:34 .
drwxrwxrwt 27 root root580 Aug 16 18:33 ..
-rw-r--r--  1 tim  tim2182 Aug 16 18:34 AUTHORS
-rwxr-xr-x  1 tim  tim   31606 Aug 16 18:34 bootstrap
-rw-r--r--  1 tim  tim2040 Aug 16 18:34 bootstrap.conf
drwxr-xr-x  2 tim  tim  80 Aug 16 18:34 build-aux
-rw-r--r--  1 tim  tim 814 Aug 16 18:34 cfg.mk
-rw-r--r--  1 tim  tim   0 Aug 16 18:34 ChangeLog
-rw-r--r--  1 tim  tim  682941 Aug 16 18:34 ChangeLog-2014-12-10
-rw-r--r--  1 tim  tim   24259 Aug 16 18:34 configure.ac
drwxr-xr-x  2 tim  tim 100 Aug 16 18:34 contrib
-rw-r--r--  1 tim  tim   35147 Aug 16 18:34 COPYING
drwxr-xr-x  2 tim  tim 140 Aug 16 18:34 doc
drwxr-xr-x  8 tim  tim 260 Aug 16 18:34 .git
-rw-r--r--  1 tim  tim1434 Aug 16 18:34 .gitignore
-rw-r--r--  1 tim  tim  75 Aug 16 18:34 .gitmodules
drwxr-xr-x  2 tim  tim  40 Aug 16 18:34 gnulib
drwxr-xr-x  2 tim  tim 140 Aug 16 18:34 m4
-rw-r--r--  1 tim  tim1609 Aug 16 18:34 MAILING-LIST
-rw-r--r--  1 tim  tim2909 Aug 16 18:34 Makefile.am
drwxr-xr-x  2 tim  tim 120 Aug 16 18:34 msdos
-rw-r--r--  1 tim  tim   35669 Aug 16 18:34 NEWS
drwxr-xr-x  2 tim  tim 140 Aug 16 18:34 po
-rw-r--r--  1 tim  tim4064 Aug 16 18:34 README
-rw-r--r--  1 tim  tim   10220 Aug 16 18:34 README.checkout
drwxr-xr-x  2 tim  tim1640 Aug 16 18:34 src
drwxr-xr-x  8 tim  tim1000 Aug 16 18:34 testenv
drwxr-xr-x  3 tim  tim1940 Aug 16 18:34 tests
-rw-r--r--  1 tim  tim 959 Aug 16 18:34 .travis.yml
drwxr-xr-x  2 tim  tim 160 Aug 16 18:34 util
drwxr-xr-x  2 tim  tim 380 Aug 16 18:34 vms
-rw-r--r--  1 tim  tim  11 Aug 16 18:34 .x-sc_po_check
-rw-r--r--  1 tim  tim 133 Aug 16 18:34 .x-sc_trailing_blank

tim@debian:/tmp/wget$ ls -la */Makefile.am
-rw-r--r-- 1 tim tim 3386 Aug 16 18:34 doc/Makefile.am
-rw-r--r-- 1 tim tim 4076 Aug 16 18:34 src/Makefile.am
-rw-r--r-- 1 tim tim 3749 Aug 16 18:34 testenv/Makefile.am
-rw-r--r-- 1 tim tim 5671 Aug 16 18:34 tests/Makefile.am
-rw-r--r-- 1 tim tim 1392 Aug 16 18:34 util/Makefile.am

Regards, Tim


signature.asc
Description: This is a digitally signed message part.

Re: [Bug-wget] Wget tests

2016-08-16 Thread Dale R. Worley 
Tim Rühsen  writes:
> We use standard automake tests (search the internet if you are interested in 
> details).
>
> We have the 'legacy' tests/ directory with tests written in Perl. And the 
> 'current' testenv/ directory with tests written in Python.
>
> See tests/Makefile.am resp. testenv/Makefile.am for the list of executed 
> tests.

That points to part of the problem:  I don't have those files in the Git
repository I downloaded from savannah.gnu.edu.  ("git clone
git://git.savannah.gnu.org/wget.git")

Dale

[Bug-wget] wget: configure.ac: gnutl > openssl ordering patch and libtool support

2016-08-16 Thread Alex Damb 
 Hello,

This patch for configure.ac replaces logic of searching ssl backend: if not 
specified with --with-ssl=openssl, --with-ssl=gnutls or --with-ssl=no, then, 
first, tries to find gnutls library and, if failes, then tries to find openssl. 
In addition, it adds LT_INIT call to call libtool for specifying rpath option.  

Motivation: not defining --with-ssl=openssl and LDFLAGS="-I/opt/openssl/path 
-Wl,rpath,/opt/openssl/path" in case, when openssl or gnutls is correctly 
installed in non-standard locations, but with providing correct pkg-config files

steps:
tar xf wget-1.18.tar.xz
cd wget-1.18
patch < ../wget-1.18-configure.ac.patch
libtoolize
autoreconf
./configure ...
--- configure.ac
+++ ../configure.ac
@@ -172,6 +172,9 @@
 AM_PROG_CC_C_O
 AC_AIX
 
+AM_PROG_AR
+LT_INIT
+
 gl_EARLY
 
 dnl
@@ -340,83 +343,8 @@
   ])
 ])
 
-AS_IF([test x"$with_ssl" = xopenssl], [
-  if [test x"$with_libssl_prefix" = x]; then
-PKG_CHECK_MODULES([OPENSSL], [openssl], [
-  AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-  AC_LIBOBJ([openssl])
-  LIBS="$OPENSSL_LIBS $LIBS"
-  CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-  LIBSSL=" " # ntlm check below wants this
-  AC_CHECK_FUNCS([RAND_egd])
-  AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
-  ssl_found=yes
-])
-  fi
-  if [test x"$ssl_found" != xyes]; then
-dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
-dnl doesn't record its dependency on libdl, so we need to make sure
-dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
-dnl dlopen(), but HP-UX uses shl_load().
-AC_CHECK_LIB(dl, dlopen, [], [
-  AC_CHECK_LIB(dl, shl_load)
-])
-
-ssl_found=no
-case $host_os in
-  *mingw32* )
-dnl prefer link to openssl dlls if possible. if not then fallback on static libs. if not then error
-
-AC_CHECK_LIB(eay32, EVP_MD_CTX_init)
-if test x"$ac_cv_lib_eay32_EVP_MD_CTX_init" != xno
-then
-  AC_CHECK_LIB(ssl32, SSL_connect, [
-ssl_found=yes
-AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
-AC_LIBOBJ([openssl])
-LIBS="${LIBS} -lssl32"
-AC_DEFINE([HAVE_LIBSSL32], [1], [Define to 1 if you have the `ssl32' library (-lssl32).])
-  ],
-  AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
-
-else
-  LIBS+=' -lgdi32'
-  dnl fallback and test static libs
-fi
-dnl add zdll lib as dep for above tests?
-  ;;
-esac
-
-AS_IF([test x$ssl_found != xyes], [
-  dnl Now actually check for -lssl if it wasn't already found
-  AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-  ], [SSL_library_init ()])
-  if test x"$LIBSSL" != x
-  then
-ssl_found=yes
-AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-AC_LIBOBJ([openssl])
-LIBS="$LIBSSL $LIBS"
-AC_CHECK_FUNCS([RAND_egd])
-  elif test x"$with_ssl" != x
-  then
-AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-  fi
-])
-  fi
-], [
-  # --with-ssl is not openssl: check if it's no
-  AS_IF([test x"$with_ssl" != xno], [
-dnl default is -lgnutls
-with_ssl=gnutls
-
+AS_IF([test x"with_ssl" != xno], [
+  AS_IF([ test x"$with_ssl" = x || test x"$with_ssl" = xgnutls], [
 dnl Now actually check for -lgnutls
 if [test x"$with_libgnutls_prefix" = x]; then
   PKG_CHECK_MODULES([GNUTLS], [gnutls], [
@@ -426,6 +354,11 @@
 CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
 AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
 ssl_found=yes
+with_ssl=gnutls
+  ], [
+AS_IF([test x"$with_ssl" = xgnutls],[
+  AC_MSG_ERROR([GnuTLS requested but not found])
+])
   ])
 fi
 if [test x"$ssl_found" != xyes]; then
@@ -435,17 +368,99 @@
   if test x"$LIBGNUTLS" != x
   then
 ssl_found=yes
-AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-AC_LIBOBJ([gnutls])
+AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])   
+AC_LIBOBJ([gnutls])
 LIBS="$LIBGNUTLS $LIBS"
-  else
-AC_MSG_ERROR([GnuTLS has not been found. Use --with-ssl=openssl if you explicitly want OpenSSL.])
-  fi
-fi
-
+with_ssl=gnutls
+  else 
+if [ x"$with_ssl" == xgnutls ]; then
+  AC_MSG_ERROR([GnuTLS has not been found. Use --with-ssl=openssl if you explicitly want OpenSSL.])  
+fi
+  fi