diff --git a/aclocal.m4 b/aclocal.m4 index a3b04dd6..d20e6e8c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2,17 +2,21 @@ dnl dnl Check for `struct utimbuf'. dnl -AC_DEFUN([WGET_STRUCT_UTIMBUF], -[AC_MSG_CHECKING([for struct utimbuf]) -if test x"$ac_cv_header_utime_h" = xyes; then - AC_EGREP_CPP([struct[ ]+utimbuf], - [#include ], - [AC_DEFINE(HAVE_STRUCT_UTIMBUF) - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) -else - AC_MSG_RESULT(no) -fi]) +AC_DEFUN([WGET_STRUCT_UTIMBUF], [ + AC_MSG_CHECKING([for struct utimbuf]) + if test x"$ac_cv_header_utime_h" = xyes; then + AC_EGREP_CPP([struct[ ]+utimbuf], + [#include + ], [ + AC_DEFINE([HAVE_STRUCT_UTIMBUF], [], + [Define if you have struct utimbuf.]) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)]) + else + AC_MSG_RESULT(no) + fi +]) dnl Check for socklen_t. The third argument of accept, getsockname, @@ -36,10 +40,12 @@ int accept (int, struct sockaddr *, size_t *); ], [], [ AC_MSG_RESULT(size_t) - AC_DEFINE(socklen_t, size_t) + AC_DEFINE([socklen_t], [size_t], + [Define to int or size_t on systems without socklen_t.]) ], [ AC_MSG_RESULT(int) - AC_DEFINE(socklen_t, int) + AC_DEFINE([socklen_t], [int], + [Define to int or size_t on systems without socklen_t.]) ]) ]) ]) @@ -51,11 +57,12 @@ dnl even on those because Apache installs its own fnmatch.h to dnl /usr/local/include (!), which GCC uses before /usr/include. AC_DEFUN([WGET_FNMATCH], [ - AC_MSG_CHECKING([whether fnmatch.h can be included]) + AC_MSG_CHECKING([for working fnmatch.h]) AC_COMPILE_IFELSE([#include ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_FNMATCH_H) + AC_DEFINE([HAVE_WORKING_FNMATCH_H], [], + [Define if fnmatch.h can be included.]) ], [ AC_MSG_RESULT(no) ]) @@ -67,11 +74,13 @@ dnl link with -lt (recently) or with -lposix (older releases). AC_DEFUN([WGET_NANOSLEEP], [ AC_CHECK_FUNCS(nanosleep, [], [ AC_CHECK_LIB(rt, nanosleep, [ - AC_DEFINE(HAVE_NANOSLEEP) + AC_DEFINE([HAVE_NANOSLEEP], [], + [Define if you have the nanosleep function.]) LIBS="-lrt $LIBS" ], [ AC_CHECK_LIB(posix4, nanosleep, [ - AC_DEFINE(HAVE_NANOSLEEP) + AC_DEFINE([HAVE_NANOSLEEP], [], + [Define if you have the nanosleep function.]) LIBS="-lposix4 $LIBS" ]) ]) @@ -112,7 +121,8 @@ AC_BEFORE([$0], [AC_C_INLINE]) AC_MSG_CHECKING([for function prototypes]) if test "$am_cv_prog_cc_stdc" != no; then AC_MSG_RESULT(yes) - AC_DEFINE(PROTOTYPES) + AC_DEFINE([PROTOTYPES], [], + [Define if ANSI function prototypes are available.]) U= ANSI2KNR= else AC_MSG_RESULT(no) @@ -383,7 +393,8 @@ AC_DEFUN(WGET_WITH_NLS, AC_CHECK_LIB(intl, gettext, [ dnl gettext is in libintl; announce the fact manually. LIBS="-lintl $LIBS" - AC_DEFINE(HAVE_GETTEXT) + AC_DEFINE([HAVE_GETTEXT], [], + [Define if you have the gettext function.]) ], [ AC_CHECK_FUNCS(gettext, [], [ AC_MSG_RESULT([gettext not found; disabling NLS]) @@ -418,7 +429,7 @@ AC_DEFUN(WGET_WITH_NLS, USE_NLS=$HAVE_NLS AC_SUBST(USE_NLS) if test "x$HAVE_NLS" = xyes; then - AC_DEFINE(HAVE_NLS) + AC_DEFINE([HAVE_NLS], [], [Define this if you want the NLS support.]) fi ]) diff --git a/configure.in b/configure.in index 0169fe33..dbd019b0 100644 --- a/configure.in +++ b/configure.in @@ -46,14 +46,17 @@ dnl dnl Get cannonical host dnl AC_CANONICAL_HOST -AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os") +AC_DEFINE_UNQUOTED([OS_TYPE], "$host_os", + [Define to be the name of the operating system.]) dnl dnl Process features. dnl AC_ARG_WITH(socks, -[ --with-socks use the socks library], -[AC_DEFINE(HAVE_SOCKS)]) + [ --with-socks use the socks library], + [AC_DEFINE([HAVE_SOCKS], [], + [Define if you wish to compile with socks support.])] +) AC_ARG_WITH(ssl, [[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto] @@ -62,17 +65,20 @@ AC_ARG_WITH(ssl, AC_ARG_ENABLE(opie, [ --disable-opie disable support for opie or s/key FTP login], USE_OPIE=$enableval, USE_OPIE=yes) -test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE) +test x"${USE_OPIE}" = xyes && AC_DEFINE([USE_OPIE], [], + [Define if you want the Opie support for FTP compiled in.]) AC_ARG_ENABLE(digest, [ --disable-digest disable support for HTTP digest authorization], USE_DIGEST=$enableval, USE_DIGEST=yes) -test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST) +test x"${USE_DIGEST}" = xyes && AC_DEFINE([USE_DIGEST], [], + [Define if you want the HTTP Digest Authorization compiled in.]) AC_ARG_ENABLE(debug, [ --disable-debug disable support for debugging output], ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes) -test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG) +test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE([ENABLE_DEBUG], [], + [Define if you want the debug output support compiled in.]) wget_need_md5=no @@ -373,7 +379,8 @@ main(){return 0;} if test x"$ssl_success" = xyes; then AC_MSG_NOTICE([compiling in support for SSL in $ssl_root]) - AC_DEFINE(HAVE_SSL) + AC_DEFINE([HAVE_SSL], [], + [Define if SSL support should be compiled in.]) AC_SUBST(SSL_INCLUDES) SSL_OBJ='gen_sslfunc$o' AC_SUBST(SSL_OBJ) @@ -421,7 +428,7 @@ then AC_COMPILE_IFELSE([#include ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOLARIS_MD5) + AC_DEFINE([HAVE_SOLARIS_MD5], [], [Define to use Solaris MD5.]) LIBS="-lmd5 $LIBS" found_md5=yes AC_MSG_NOTICE([using the Solaris MD5 implementation]) @@ -433,7 +440,7 @@ then dnl implementation. if test x"$found_md5" = xno; then if test x"$ssl_success" = xyes; then - AC_DEFINE(HAVE_OPENSSL_MD5) + AC_DEFINE([HAVE_OPENSSL_MD5], [], [Define to use OpenSSL MD5.]) found_md5=yes AC_MSG_NOTICE([using the OpenSSL MD5 implementation]) fi @@ -441,13 +448,13 @@ then 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) + AC_DEFINE([HAVE_BUILTIN_MD5], [], [Define to use built-in MD5.]) MD5_OBJ="$MD5_OBJ gnu-md5\$o" found_md5=yes AC_MSG_NOTICE([using the GNU MD5 implementation]) fi fi -AC_DEFINE(HAVE_MD5) +AC_DEFINE([HAVE_MD5], [], [Define if we're compiling support for MD5.]) AC_SUBST(MD5_OBJ) dnl **********************************************************************