From 534fa1a8a1be01e8e9c0f6854a56b77767de9e78 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Fri, 3 Dec 1999 15:29:21 +0000 Subject: [PATCH] Fix the handling of --disable configure switches. --- configure.in | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index 9da68e9e..80cc41cd 100644 --- a/configure.in +++ b/configure.in @@ -344,7 +344,7 @@ int main (int argc, char **argv) fi AC_ARG_ENABLE(external_dotlock, [ --enable-external-dotlock Force use of an external dotlock program], - [mutt_cv_external_dotlock=yes]) + [mutt_cv_external_dotlock="$enableval"]) if test "x$mutt_cv_setgid" = "xyes" || test "x$mutt_cv_fchdir" = "xno" \ || test "x$mutt_cv_external_dotlock" = "xyes" @@ -442,19 +442,23 @@ AC_ARG_WITH(domain, [ --with-domain=DOMAIN Specify your DNS domain name ] fi]) AC_ARG_ENABLE(pop, [ --enable-pop Enable POP3 support], -[ AC_DEFINE(USE_POP) - AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) - AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o" +[ if test x$enableval = xyes ; then + AC_DEFINE(USE_POP) + AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) + AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o" + fi ]) AC_ARG_ENABLE(imap, [ --enable-imap Enable IMAP support], -[ AC_DEFINE(USE_IMAP) - AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) - AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) - LIBIMAP="-Limap -limap" - LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a" - need_imap="yes" +[ if test x$enableval = xyes ; then + AC_DEFINE(USE_IMAP) + AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) + AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) + LIBIMAP="-Limap -limap" + LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a" + need_imap="yes" + fi ]) AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes) @@ -492,7 +496,10 @@ AC_ARG_ENABLE(ssl, [ --enable-ssl Enable SSL support], AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support], - [ AC_DEFINE(DEBUG) ]) + [ if test x$enableval = xyes ; then + AC_DEFINE(DEBUG) + fi + ]) AC_ARG_ENABLE(flock, [ --enable-flock Use flock() to lock files], [if test $enableval = yes; then -- 2.40.0