[svn] Allow use of Autoconf 2.5x.

diff --git a/aclocal.m4 b/aclocal.m4
index ab25df589f15f19f9cd9c04bfa54f078ba962dec..3406e42e91b89b32492538e715fd02d09eb8797c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -38,7 +38,7 @@ AC_SUBST(ANSI2KNR)dnl
 
 AC_DEFUN(AM_PROG_CC_STDC,
 [AC_REQUIRE([AC_PROG_CC])
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
 AC_CACHE_VAL(am_cv_prog_cc_stdc,
 [am_cv_prog_cc_stdc=no
 ac_save_CC="$CC"
@@ -75,7 +75,7 @@ esac
 ])
 
 AC_DEFUN(WGET_STRUCT_UTIMBUF,
-[AC_MSG_CHECKING(for struct utimbuf)
+[AC_MSG_CHECKING([for struct utimbuf])
 if test x"$ac_cv_header_utime_h" = xyes; then
   AC_EGREP_CPP([struct[        ]+utimbuf],
     [#include <utime.h>],
@@ -102,7 +102,7 @@ AC_DEFUN(WGET_WITH_NLS,
     dnl last moment.
 
     if test x"$HAVE_NLS" = xyes; then
-      AC_MSG_RESULT("language catalogs: $ALL_LINGUAS")
+      AC_MSG_RESULT([language catalogs: $ALL_LINGUAS])
       AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
       AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
@@ -178,7 +178,7 @@ dnl This is not strictly an Autoconf macro, because it is run from
 dnl within `config.status' rather than from within configure.  This
 dnl is why special rules must be applied for it.
 AC_DEFUN(WGET_PROCESS_PO,
-  [srcdir=$ac_given_srcdir # Advanced autoconf hackery
+  [
    dnl I wonder what the following several lines do...
    if test "x$srcdir" != "x."; then
      if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then

diff --git a/configure.in b/configure.in
index 7847ea88d22b64cd00e07b4cf8312ec8a428e101..4e44568546a1bfb0e4621a5b657e540bb1c88ee5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -300,7 +300,7 @@ if test x"$with_ssl" != x"no"; then
       LDFLAGS="-L$ssl_root/lib -R$ssl_root/lib $wget_save_LDFLAGS"
     fi
 
-    AC_MSG_RESULT(["Looking for SSL libraries in $ssl_root"])
+    AC_MSG_RESULT([Looking for SSL libraries in $ssl_root])
 
     dnl Check whether the compiler can find the include files.  On
     dnl some systems Gcc finds libraries in /usr/local/lib, but fails
@@ -309,13 +309,13 @@ if test x"$with_ssl" != x"no"; then
     ssl_found_includes=no
     CPPFLAGS="$SSL_INCLUDES $wget_save_CPPFLAGS"
 
-    AC_MSG_CHECKING(["for includes"])
+    AC_MSG_CHECKING([for includes])
 
     AC_TRY_CPP([#include <openssl/ssl.h>
 #include <openssl/rsa.h>
 ],
-      AC_MSG_RESULT("found"); ssl_found_includes=yes,
-      AC_MSG_RESULT("not found")
+      AC_MSG_RESULT(found); ssl_found_includes=yes,
+      AC_MSG_RESULT([not found])
     )
 
     if test x"$ssl_found_includes" = xno; then
@@ -354,7 +354,7 @@ if test x"$with_ssl" != x"no"; then
 
     ssl_run_failure=no
 
-    AC_MSG_CHECKING("whether SSL libs are resolved at runtime")
+    AC_MSG_CHECKING([whether SSL libs are resolved at runtime])
     AC_TRY_RUN([
 int RSA_new();
 int SSL_new();
@@ -374,7 +374,7 @@ main(){return 0;}
   if test x"$ssl_success" = xyes; then
     dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
     dnl to use instead.
-    AC_MSG_RESULT("Compiling in support for SSL in $ssl_root")
+    AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
     AC_DEFINE(HAVE_SSL)
     AC_SUBST(SSL_INCLUDES)
     SSL_OBJ='gen_sslfunc$o'
@@ -445,7 +445,7 @@ AC_SUBST(MD5_OBJ)
 dnl
 dnl Set of available languages.
 dnl
-ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//')`
+ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')`
 
 dnl Originally this used to be static, looking like this:
 dnl     ALL_LINGUAS="cs de hr it ..."