bootstrap: ensure gnulib_path is not empty.

[wget] / configure.ac

diff --git a/configure.ac b/configure.ac
index f5b776c3d71586ffca818dc0588b781071f73a20..4928c46d8f5c8dd832e5cd8327da5413b01593eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Template file for GNU Autoconf
-dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009, 2010 Free
+dnl Software Foundation, Inc.
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 
 AC_INIT([wget],
-       [1.12.1-devel],
+  [m4_esyscmd([build-aux/bzr-version-gen])],
        [bug-wget@gnu.org])
 AC_PREREQ(2.61)
 
@@ -223,7 +223,6 @@ dnl
 dnl Call Wget-specific macros defined in aclocal.
 dnl
 WGET_STRUCT_UTIMBUF
-WGET_SOCKLEN_T
 WGET_FNMATCH
 WGET_NANOSLEEP
 WGET_POSIX_CLOCK
@@ -232,7 +231,7 @@ WGET_NSL_SOCKET
 dnl Deal with specific hosts
 case $host_os in
   *mingw32* )
-    AC_SUBST(W32LIBS, '-lwsock32')
+    AC_SUBST(W32LIBS, '-lwsock32 -lws2_32')
     AC_LIBOBJ([mswindows])
     ;;
 esac