From c1096ce501b8c0d96b580b4e72db44427e72e759 Mon Sep 17 00:00:00 2001 From: hniksic Date: Mon, 3 Nov 2003 16:08:32 -0800 Subject: [PATCH] [svn] Use AC_MSG_NOTICE instead of echo. --- ChangeLog | 3 +++ configure.in | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fe07964..3869a14b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * configure.in: Also check whether #include works before deciding to use Solaris libmd5. + * configure.in: Use AC_MSG_NOTICE instead of echo. Use + AC_MSG_ERROR for fatal errors. + 2003-11-03 Hrvoje Niksic * configure.in: Look for nanosleep in -lrt and -lposix4, which is diff --git a/configure.in b/configure.in index 21a4cebb..ed0b8180 100644 --- a/configure.in +++ b/configure.in @@ -37,7 +37,7 @@ dnl dnl What version of Wget are we building? dnl VERSION=`sed -e 's/^.*"\(.*\)";$/\1/' ${srcdir}/src/version.c` -echo "configuring for GNU Wget $VERSION" +AC_MSG_NOTICE([configuring for GNU Wget $VERSION]) AC_SUBST(VERSION) PACKAGE=wget AC_SUBST(PACKAGE) @@ -407,9 +407,7 @@ main(){return 0;} dnl If linking with SSL was forced rather than auto-detected, then dnl bail out if SSL failed. if test x"$wget_force_ssl" = x"yes"; then - exec >&2 - echo "ERROR: Failed to find OpenSSL libraries." - exit 2 + AC_MSG_ERROR([failed to find OpenSSL libraries], 2) fi fi @@ -440,11 +438,11 @@ then AC_CHECK_LIB(md5, md5_calc, [ dnl There are programs that insert bogus in the include dnl path. That makes the system md5 library is useless to us. - AC_TRY_CPP([#include - ], [ + AC_CHECK_HEADERS([md5.h], [ AC_DEFINE(HAVE_SOLARIS_MD5) LIBS="-lmd5 $LIBS" found_md5=yes + AC_MSG_NOTICE([using Solaris MD5 implementation]) ]) ]) fi @@ -455,14 +453,16 @@ then if test x"$ssl_success" = xyes; then AC_DEFINE(HAVE_OPENSSL_MD5) found_md5=yes + AC_MSG_NOTICE([using OpenSSL MD5 implementation]) fi fi dnl If none of the above worked, use the one we ship with Wget. if test x"$found_md5" = xno; then AC_DEFINE(HAVE_BUILTIN_MD5) - found_md5=yes MD5_OBJ="$MD5_OBJ gnu-md5\$o" + found_md5=yes + AC_MSG_NOTICE([using GNU MD5 implementation]) fi fi AC_DEFINE(HAVE_MD5) -- 2.39.2