mostly reindents.

we need to simplify that :|

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/configure.ac b/configure.ac
index c4ca9ef..cd48fad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@ AC_CANONICAL_HOST
 
 AC_MSG_CHECKING([for prefix])
 if test x$prefix = xNONE; then
 
 AC_MSG_CHECKING([for prefix])
 if test x$prefix = xNONE; then

-        mutt_cv_prefix=$ac_default_prefix
+    mutt_cv_prefix=$ac_default_prefix

 else
 else

-        mutt_cv_prefix=$prefix
+    mutt_cv_prefix=$prefix

 fi
 AC_MSG_RESULT($mutt_cv_prefix)
 
 fi
 AC_MSG_RESULT($mutt_cv_prefix)
 


@@ -32,7 +32,7 @@ AC_PROG_CC
 AC_ISC_POSIX
 AM_C_PROTOTYPES
 if test "x$U" != "x"; then
 AC_ISC_POSIX
 AM_C_PROTOTYPES
 if test "x$U" != "x"; then

-  AC_MSG_ERROR(Compiler not ANSI compliant)
+    AC_MSG_ERROR(Compiler not ANSI compliant)

 fi
 AC_PROG_CPP
 AC_PROG_MAKE_SET
 fi
 AC_PROG_CPP
 AC_PROG_MAKE_SET


@@ -52,13 +52,13 @@ AC_PATH_PROG(GDB, gdb, no)
 AC_PATH_PROG(SDB, sdb, no)
 
 if test $GDB != no ; then
 AC_PATH_PROG(SDB, sdb, no)
 
 if test $GDB != no ; then

-        DEBUGGER=$GDB
+    DEBUGGER=$GDB

 elif test $DBX != no ; then
 elif test $DBX != no ; then

-        DEBUGGER=$DBX
+    DEBUGGER=$DBX

 elif test $SDB != no ; then
 elif test $SDB != no ; then

-        DEBUGGER=$SDB
+    DEBUGGER=$SDB

 else
 else

-        DEBUGGER=no
+    DEBUGGER=no

 fi
 
 AC_SUBST([DEBUGGER])
 fi
 
 AC_SUBST([DEBUGGER])


@@ -89,77 +89,85 @@ AH_TEMPLATE([ICONV_NONTRANS],
 
 MUTT_C99_INTTYPES
 
 
 MUTT_C99_INTTYPES
 

+dnl ---------------- sendmail ----------------
+

 ac_aux_path_sendmail=/usr/sbin:/usr/lib
 AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail)
 AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ])
 
 ac_aux_path_sendmail=/usr/sbin:/usr/lib
 AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail)
 AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ])
 

+

 OPS='$(srcdir)/OPS'
 
 OPS='$(srcdir)/OPS'
 

-       AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),
-       [       if test x$enableval = xyes; then
-                       have_gpgme=yes
-               fi
-        ])
-       AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]),
-       gpgme_config_prefix="$withval", gpgme_config_prefix="")
-
-        if test x$have_gpgme = xyes; then
-               if test x$gpgme_config_prefix != x; then
-                       GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
-               else
-                       AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
-               fi
-               if test "x$GPGME_CONFIG" = "xno"; then
-                       AC_MSG_ERROR([GPGME not found])
-               else
-                       LIBGPGME_CFLAGS=`$GPGME_CONFIG --cflags`
-                       LIBGPGME_LIBS=`$GPGME_CONFIG --libs`
-                        MUTTLIBS="$MUTTLIBS $LIBGPGME_LIBS"
-                       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
-                       AC_DEFINE(CRYPT_BACKEND_GPGME, 1,
-                                 [Defined, if GPGME support is enabled])
-               fi
-       fi
-       AC_SUBST(LIBGPGME_CFLAGS)
-       AC_SUBST(LIBGPGME_LIBS)
-
-        AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]),
-        [       if test x$enableval = xno ; then
-                        have_pgp=no
-                fi
-        ])
+dnl ---------------- gpgme ----------------
+
+    AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),
+    [   if test x$enableval = xyes; then
+            have_gpgme=yes
+        fi
+    ])
+    AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]),
+    gpgme_config_prefix="$withval", gpgme_config_prefix="")
+
+    if test x$have_gpgme = xyes; then
+        if test x$gpgme_config_prefix != x; then
+            GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
+        else
+            AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+        fi
+        if test "x$GPGME_CONFIG" = "xno"; then
+            AC_MSG_ERROR([GPGME not found])
+        else
+            LIBGPGME_CFLAGS=`$GPGME_CONFIG --cflags`
+            LIBGPGME_LIBS=`$GPGME_CONFIG --libs`
+            MUTTLIBS="$MUTTLIBS $LIBGPGME_LIBS"
+            MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
+            AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
+        fi
+    fi
+    AC_SUBST(LIBGPGME_CFLAGS)
+    AC_SUBST(LIBGPGME_LIBS)

 
 

-        if test x$have_pgp != xno ; then
-                AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1,
-                    [ Define if you want classic PGP support. ])
-                PGPAUX_TARGET="pgpringng\$(EXEEXT) pgpewrapng\$(EXEEXT)"
-                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o"
+
+dnl ---------------- pgp/smime ----------------
+
+    AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]),
+    [   if test x$enableval = xno ; then
+            have_pgp=no
+        fi
+    ])
+
+    if test x$have_pgp != xno ; then
+        AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1,
+            [ Define if you want classic PGP support. ])
+        PGPAUX_TARGET="pgpringng\$(EXEEXT) pgpewrapng\$(EXEEXT)"
+        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o"
+    fi
+
+    AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]),
+    [  if test x$enableval = xno ; then
+            have_smime=no

         fi
         fi

+    ])
+
+    if test x$have_smime != xno ; then
+        AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1, [ Define if you want clasic S/MIME support. ])
+        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
+        SMIMEAUX_TARGET="smime_keysng"
+    fi
+

 
 

-       AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]),
-       [       if test x$enableval = xno ; then
-                       have_smime=no
-               fi
-       ])
-
-       if test x$have_smime != xno ; then
-               AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1,
-                  [ Define if you want clasic S/MIME support. ])
-               MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
-               SMIMEAUX_TARGET="smime_keysng"
-       fi
-
-        AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
-                [if test -x "$withval" ; then
-                        MIXMASTER="$withval"
-                 else
-                        MIXMASTER="mixmaster"
-                 fi
-                 OPS="$OPS \$(srcdir)/OPS.MIX"
-                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o"
-                 AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER",
-                         [ Where to find mixmaster on your system. ])
-                ])
+dnl ---------------- mixmaster ----------------
+
+    AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
+    [  if test -x "$withval" ; then
+            MIXMASTER="$withval"
+        else
+            MIXMASTER="mixmaster"
+        fi
+        OPS="$OPS \$(srcdir)/OPS.MIX"
+        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o"
+        AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER", [ Where to find mixmaster on your system. ])
+    ])

 
 # We now require all OPS
 OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT "
 
 # We now require all OPS
 OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT "


@@ -171,12 +179,12 @@ AC_SUBST(SMIMEAUX_TARGET)
 
 AC_PATH_PROG(ISPELL, ispell, no)
 if test $ISPELL != no; then
 
 AC_PATH_PROG(ISPELL, ispell, no)
 if test $ISPELL != no; then

-        AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ])
+    AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ])

 fi
 
 AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang[=DIR]], [Use S-Lang instead of ncurses]),
 fi
 
 AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang[=DIR]], [Use S-Lang instead of ncurses]),

-        [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish,
-                [AC_TRY_RUN([#include <sys/param.h>
+    [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish,
+        [AC_TRY_RUN([#include <sys/param.h>

 
 main ()
 {
 
 main ()
 {


@@ -186,101 +194,99 @@ main ()
         exit (1);
 #endif
 }],
         exit (1);
 #endif
 }],

-                        mutt_cv_bsdish=yes,
-                        mutt_cv_bsdish=no,
-                        mutt_cv_bsdish=no)])
+        mutt_cv_bsdish=yes,
+        mutt_cv_bsdish=no,
+        mutt_cv_bsdish=no)])

 
         AC_MSG_CHECKING(for S-Lang)
         if test $withval = yes; then
 
         AC_MSG_CHECKING(for S-Lang)
         if test $withval = yes; then

-                if test -d $srcdir/../slang; then
-                        mutt_cv_slang=$srcdir/../slang/src
-                        CFLAGS="$CFLAGS -I${mutt_cv_slang}"
-                        LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
-                else
-                        if test -d $mutt_cv_prefix/include/slang; then
-                                CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang"
-                        elif test -d /usr/include/slang; then
-                                CFLAGS="$CFLAGS -I/usr/include/slang"
-                        fi
-                        mutt_cv_slang=yes
+            if test -d $srcdir/../slang; then
+                mutt_cv_slang=$srcdir/../slang/src
+                CFLAGS="$CFLAGS -I${mutt_cv_slang}"
+                LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
+            else
+                if test -d $mutt_cv_prefix/include/slang; then
+                    CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang"
+                elif test -d /usr/include/slang; then
+                    CFLAGS="$CFLAGS -I/usr/include/slang"

                 fi
                 fi

+                mutt_cv_slang=yes
+            fi

         else
         else

-                dnl ---Check to see if $withval is a source directory
-                if test -f $withval/src/slang.h; then
-                        mutt_cv_slang=$withval/src
-                        CFLAGS="$CFLAGS -I${mutt_cv_slang}"
-                        LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
-                else
-                        dnl ---Must be installed somewhere
-                        mutt_cv_slang=$withval
-                        if test -d $withval/include/slang; then
-                                CFLAGS="$CFLAGS -I${withval}/include/slang"
-                        elif test -d $withval/include; then
-                                CFLAGS="$CFLAGS -I${withval}/include"
-                        fi
-                        LDFLAGS="$LDFLAGS -L${withval}/lib"
+            dnl ---Check to see if $withval is a source directory
+            if test -f $withval/src/slang.h; then
+                mutt_cv_slang=$withval/src
+                CFLAGS="$CFLAGS -I${mutt_cv_slang}"
+                LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
+            else
+                dnl ---Must be installed somewhere
+                mutt_cv_slang=$withval
+                if test -d $withval/include/slang; then
+                        CFLAGS="$CFLAGS -I${withval}/include/slang"
+                elif test -d $withval/include; then
+                        CFLAGS="$CFLAGS -I${withval}/include"

                 fi
                 fi

+                LDFLAGS="$LDFLAGS -L${withval}/lib"
+            fi

         fi
         AC_MSG_RESULT($mutt_cv_slang)
         if test $mutt_cv_bsdish = yes; then
         fi
         AC_MSG_RESULT($mutt_cv_slang)
         if test $mutt_cv_bsdish = yes; then

-                AC_CHECK_LIB(termlib, main)
+            AC_CHECK_LIB(termlib, main)

         fi
         fi

-        AC_DEFINE(USE_SLANG_CURSES,1,
-                [ Define if you compile with SLang instead of curses/ncurses. ])
+        AC_DEFINE(USE_SLANG_CURSES,1, [ Define if you compile with SLang instead of curses/ncurses. ])

         AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])
         MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o"
 
         dnl --- now that we've found it, check the link
 
         AC_CHECK_LIB(slang, SLtt_get_terminfo,
         AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])
         MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o"
 
         dnl --- now that we've found it, check the link
 
         AC_CHECK_LIB(slang, SLtt_get_terminfo,

-                [MUTTLIBS="$MUTTLIBS -lslang -lm"],
-                [AC_MSG_ERROR(unable to compile.  check config.log)], -lm)
-
+            [MUTTLIBS="$MUTTLIBS -lslang -lm"],
+            [AC_MSG_ERROR(unable to compile.  check config.log)], -lm)

         ],
 
         ],
 

-        [mutt_cv_curses=/usr
-        AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]),
-                [if test $withval != yes; then
-                        mutt_cv_curses=$withval
+        [   mutt_cv_curses=/usr
+            AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]),
+            [   if test $withval != yes; then
+                    mutt_cv_curses=$withval

                 fi
                 if test x$mutt_cv_curses != x/usr; then
                 fi
                 if test x$mutt_cv_curses != x/usr; then

-                        LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS"
-                        CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
-                fi])
-
-       AC_CHECK_FUNC(initscr,,[
-       cf_ncurses="ncurses"
-       for lib in ncursesw ncurses
-       do
-               AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
-       done
-        AC_CHECK_LIB($cf_ncurses, initscr,
-                [MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
-                if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then
-                        CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+                    LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS"
+                    CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"

                 fi
                 fi

-               
-                if test "$cf_ncurses" = ncursesw; then
-                       AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"])
-                       AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
-               else
-                       AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])
-               fi],
+            ])
+
+            AC_CHECK_FUNC(initscr,,[
+            cf_ncurses="ncurses"
+            for lib in ncursesw ncurses; do
+                AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
+            done
+            AC_CHECK_LIB($cf_ncurses, initscr,
+                [   MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
+                    if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then
+                        CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+                    fi

 
 

+                    if test "$cf_ncurses" = ncursesw; then
+                        AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"])
+                        AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
+                    else
+                        AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])
+                    fi
+                ],

                 [CF_CURSES_LIBS])
                 [CF_CURSES_LIBS])

-               ])
+            ])

 
 

-        old_LIBS="$LIBS"
-        LIBS="$LIBS $MUTTLIBS"
-        CF_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>],
-                           [start_color typeahead bkgdset curs_set meta use_default_colors resizeterm])
-        if test "$ac_cv_func_decl_start_color" = yes; then
+            old_LIBS="$LIBS"
+            LIBS="$LIBS $MUTTLIBS"
+            CF_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>],
+                               [start_color typeahead bkgdset curs_set meta use_default_colors resizeterm])
+            if test "$ac_cv_func_decl_start_color" = yes; then

                 AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])
                 AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])

-        fi
-        if test "$ac_cv_func_decl_resizeterm" = yes; then
+            fi
+            if test "$ac_cv_func_decl_resizeterm" = yes; then

                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o"
                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o"

-        fi
-        LIBS="$old_LIBS"
+            fi
+            LIBS="$old_LIBS"

         ])
 
 AC_HEADER_STDC
         ])
 
 AC_HEADER_STDC


@@ -295,18 +301,16 @@ AC_TYPE_SIGNAL
 
 AC_MSG_CHECKING(for sig_atomic_t in signal.h)
 AC_EGREP_HEADER(sig_atomic_t,signal.h,
 
 AC_MSG_CHECKING(for sig_atomic_t in signal.h)
 AC_EGREP_HEADER(sig_atomic_t,signal.h,

-  [
-    ac_cv_type_sig_atomic_t=yes;
-    AC_EGREP_HEADER(volatile.*sig_atomic_t,
-                    signal.h,
-                    [is_sig_atomic_t_volatile=yes; AC_MSG_RESULT([yes, volatile])],
-                    [is_sig_atomic_t_volatile=no;  AC_MSG_RESULT([yes, non volatile])])
-  ],
-  [
-    AC_MSG_RESULT(no)
-    AC_CHECK_TYPE(sig_atomic_t, int)
-    is_sig_atomic_t_volatile=no
-  ])
+    [   ac_cv_type_sig_atomic_t=yes;
+        AC_EGREP_HEADER(volatile.*sig_atomic_t,
+                        signal.h,
+                        [is_sig_atomic_t_volatile=yes; AC_MSG_RESULT([yes, volatile])],
+                        [is_sig_atomic_t_volatile=no;  AC_MSG_RESULT([yes, non volatile])])
+    ],
+    [   AC_MSG_RESULT(no)
+        AC_CHECK_TYPE(sig_atomic_t, int)
+        is_sig_atomic_t_volatile=no
+    ])

 if test $is_sig_atomic_t_volatile = 'yes'
 then
     AC_DEFINE(SIG_ATOMIC_VOLATILE_T, sig_atomic_t)
 if test $is_sig_atomic_t_volatile = 'yes'
 then
     AC_DEFINE(SIG_ATOMIC_VOLATILE_T, sig_atomic_t)


@@ -325,7 +329,7 @@ AC_CHECK_FUNCS(snprintf vsnprintf)
 
 AC_CHECK_FUNC(getopt)
 if test $ac_cv_func_getopt = yes; then
 
 AC_CHECK_FUNC(getopt)
 if test $ac_cv_func_getopt = yes; then

-        AC_CHECK_HEADERS(getopt.h)
+    AC_CHECK_HEADERS(getopt.h)

 fi
 
 dnl SCO uses chsize() instead of ftruncate()
 fi
 
 dnl SCO uses chsize() instead of ftruncate()


@@ -342,22 +346,22 @@ AC_ARG_WITH(regex, AC_HELP_STRING([--with-regex], [Use the GNU regex library]),
         [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)])
 
 if test $mutt_cv_regex = no ; then
         [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)])
 
 if test $mutt_cv_regex = no ; then

-AC_CACHE_CHECK([whether your system's regexp library is completely broken],
+    AC_CACHE_CHECK([whether your system's regexp library is completely broken],

         [mutt_cv_regex_broken],
         AC_TRY_RUN([
 #include <unistd.h>
 #include <regex.h>
 main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
         mutt_cv_regex_broken=no, mutt_cv_regex_broken=yes, mutt_cv_regex_broken=yes))
         [mutt_cv_regex_broken],
         AC_TRY_RUN([
 #include <unistd.h>
 #include <regex.h>
 main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
         mutt_cv_regex_broken=no, mutt_cv_regex_broken=yes, mutt_cv_regex_broken=yes))

-        if test $mutt_cv_regex_broken = yes ; then
-                echo "Using the included GNU regex instead." >&AC_FD_MSG
-                mutt_cv_regex=yes
-        fi
+    if test $mutt_cv_regex_broken = yes ; then
+        echo "Using the included GNU regex instead." >&AC_FD_MSG
+        mutt_cv_regex=yes
+    fi

 fi
 
 if test $mutt_cv_regex = yes; then
 fi
 
 if test $mutt_cv_regex = yes; then

-        AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ])
-        AC_LIBOBJ(regex)
+    AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ])
+    AC_LIBOBJ(regex)

 fi
 
 
 fi
 
 


@@ -366,38 +370,39 @@ AC_ARG_WITH(homespool,
                            [File in user's directory where new mail is spooled]),
                            with_homespool=${withval})
 if test x$with_homespool != x; then
                            [File in user's directory where new mail is spooled]),
                            with_homespool=${withval})
 if test x$with_homespool != x; then

-        if test $with_homespool = yes; then
-                with_homespool=mailbox
-        fi
-        AC_DEFINE_UNQUOTED(MAILPATH,"$with_homespool",[ Where new mail is spooled. ])
-        AC_DEFINE(HOMESPOOL,1,
-          [Is mail spooled to the user's home directory?  If defined,
-           MAILPATH should be set to the filename of the spool mailbox
-           relative the the home directory.
-           use: configure --with-homespool=FILE])
-        AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
-        mutt_cv_setgid=no
+    if test $with_homespool = yes; then
+            with_homespool=mailbox
+    fi
+    AC_DEFINE_UNQUOTED(MAILPATH,"$with_homespool",[ Where new mail is spooled. ])
+    AC_DEFINE(HOMESPOOL,1,
+    [   Is mail spooled to the user's home directory?  If defined,
+        MAILPATH should be set to the filename of the spool mailbox
+        relative the the home directory.
+        use: configure --with-homespool=FILE
+    ])
+    AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
+    mutt_cv_setgid=no

 else
 else

-        AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]),
-                [mutt_cv_mailpath=$withval],
-                [ AC_CACHE_CHECK(where new mail is stored, mutt_cv_mailpath,
-                        [mutt_cv_mailpath=no
-                        if test -d /var/mail; then
-                                mutt_cv_mailpath=/var/mail
-                        elif test -d /var/spool/mail; then
-                                mutt_cv_mailpath=/var/spool/mail
-                        elif test -d /usr/spool/mail; then
-                                mutt_cv_mailpath=/usr/spool/mail
-                        elif test -d /usr/mail; then
-                                mutt_cv_mailpath=/usr/mail
-                        fi])
-                ])
-        if test "$mutt_cv_mailpath" = no; then
-                AC_MSG_ERROR("Could not determine where new mail is stored.")
-        fi
-        AC_DEFINE_UNQUOTED(MAILPATH,"$mutt_cv_mailpath",[ Where new mail is spooled. ])
+    AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]),
+        [mutt_cv_mailpath=$withval],
+        [ AC_CACHE_CHECK(where new mail is stored, mutt_cv_mailpath,
+            [mutt_cv_mailpath=no
+            if test -d /var/mail; then
+                mutt_cv_mailpath=/var/mail
+            elif test -d /var/spool/mail; then
+                mutt_cv_mailpath=/var/spool/mail
+            elif test -d /usr/spool/mail; then
+                mutt_cv_mailpath=/usr/spool/mail
+            elif test -d /usr/mail; then
+                mutt_cv_mailpath=/usr/mail
+            fi])
+        ])
+    if test "$mutt_cv_mailpath" = no; then
+        AC_MSG_ERROR("Could not determine where new mail is stored.")
+    fi
+    AC_DEFINE_UNQUOTED(MAILPATH,"$mutt_cv_mailpath",[ Where new mail is spooled. ])

 
 

-        AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_TRY_RUN([#include <sys/types.h>
+    AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_TRY_RUN([#include <sys/types.h>

 #include <sys/stat.h>
 
 int main (int argc, char **argv)
 #include <sys/stat.h>
 
 int main (int argc, char **argv)


@@ -426,12 +431,12 @@ int main (int argc, char **argv)
         exit (1);
 }], mutt_cv_groupwrite=yes, mutt_cv_groupwrite=no, mutt_cv_groupwrite=no)])
 
         exit (1);
 }], mutt_cv_groupwrite=yes, mutt_cv_groupwrite=no, mutt_cv_groupwrite=no)])
 

-                if test $mutt_cv_groupwrite = yes; then
-                        AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
-                        AC_DEFINE(USE_SETGID,1,[ Define if mutt should run setgid "mail". ])
-                        mutt_cv_setgid=yes
-                fi
+        if test $mutt_cv_groupwrite = yes; then
+            AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
+            AC_DEFINE(USE_SETGID,1,[ Define if mutt should run setgid "mail". ])
+            mutt_cv_setgid=yes

         fi
         fi

+    fi

 fi
 
 AC_MSG_CHECKING(where to put the documentation)
 fi
 
 AC_MSG_CHECKING(where to put the documentation)


@@ -444,11 +449,11 @@ docdir=$mutt_cv_docdir
 AC_SUBST(docdir)
 
 if test x$mutt_cv_setgid = xyes; then
 AC_SUBST(docdir)
 
 if test x$mutt_cv_setgid = xyes; then

-        DOTLOCK_GROUP='mail'
-        DOTLOCK_PERMISSION=2755
+    DOTLOCK_GROUP='mail'
+    DOTLOCK_PERMISSION=2755

 else
 else

-        DOTLOCK_GROUP=''
-        DOTLOCK_PERMISSION=755
+    DOTLOCK_GROUP=''
+    DOTLOCK_PERMISSION=755

 fi
 AC_SUBST(DOTLOCK_GROUP)
 AC_SUBST(DOTLOCK_PERMISSION)
 fi
 AC_SUBST(DOTLOCK_GROUP)
 AC_SUBST(DOTLOCK_PERMISSION)


@@ -465,37 +470,37 @@ need_socket="no"
 dnl -- socket dependencies --
 
 AC_ARG_ENABLE(pop,  AC_HELP_STRING([--enable-pop], [Enable POP3 support]),
 dnl -- socket dependencies --
 
 AC_ARG_ENABLE(pop,  AC_HELP_STRING([--enable-pop], [Enable POP3 support]),

-[       if test x$enableval = xyes ; then
-                AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
-                LIBPOP="-Lpop -lpop"
-                LIBPOPDEPS="\$(top_srcdir)/pop/pop.h pop/libpop.a"
-                need_socket="yes"
-               need_pop="yes"
-                need_md5="yes"
-        fi
+[   if test x$enableval = xyes ; then
+        AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
+        LIBPOP="-Lpop -lpop"
+        LIBPOPDEPS="\$(top_srcdir)/pop/pop.h pop/libpop.a"
+        need_socket="yes"
+        need_pop="yes"
+        need_md5="yes"
+    fi

 ])
 AM_CONDITIONAL(BUILD_POP, test x$need_pop = xyes)
 
 AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]),
 ])
 AM_CONDITIONAL(BUILD_POP, test x$need_pop = xyes)
 
 AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]),

-[       if test x$enableval = xyes ; then
-                AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ])
-                LIBIMAP="-Limap -limap"
-                LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a"
-                need_imap="yes"
-                need_socket="yes"
-                need_md5="yes"
-        fi
+[   if test x$enableval = xyes ; then
+        AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ])
+        LIBIMAP="-Limap -limap"
+        LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a"
+        need_imap="yes"
+        need_socket="yes"
+        need_md5="yes"
+    fi

 ])
 AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes)
 
 AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],
 ])
 AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes)
 
 AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],

-[      if test x$enableval = xyes ; then
-               AC_DEFINE(USE_NNTP,1,[ Compiling with newsreading support with NNTP ])
-                LIBNNTP="-Lnntp -lnntp"
-                LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a"
-                need_nntp="yes"
-               need_socket="yes"
-       fi
+[   if test x$enableval = xyes ; then
+        AC_DEFINE(USE_NNTP,1,[ Compiling with newsreading support with NNTP ])
+        LIBNNTP="-Lnntp -lnntp"
+        LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a"
+        need_nntp="yes"
+        need_socket="yes"
+    fi

 ])
 AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes)
 
 ])
 AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes)
 


@@ -503,17 +508,16 @@ dnl -- end socket dependencies --
 
 if test "$need_socket" = "yes"
 then
 
 if test "$need_socket" = "yes"
 then

-        AC_MSG_CHECKING([for socklen_t])
-        AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
-                AC_MSG_RESULT([no])
-                AC_DEFINE(socklen_t,int,
-                        [ Define to 'int' if <sys/socket.h> doesn't have it. ]))
-        AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
-        AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
-        AC_CHECK_FUNCS(getaddrinfo)
-        AC_DEFINE(USE_SOCKET,1,
-                [ Include code for socket support. Set automatically if you enable POP3 or IMAP ])
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS account.o mutt_socket.o mutt_tunnel.o"
+    AC_MSG_CHECKING([for socklen_t])
+    AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
+            AC_MSG_RESULT([no])
+            AC_DEFINE(socklen_t,int, [ Define to 'int' if <sys/socket.h> doesn't have it. ]))
+    AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
+    AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
+    AC_CHECK_FUNCS(getaddrinfo)
+    AC_DEFINE(USE_SOCKET,1,
+            [ Include code for socket support. Set automatically if you enable POP3 or IMAP ])
+    MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS account.o mutt_socket.o mutt_tunnel.o"

 fi
 
 dnl -- imap dependencies --
 fi
 
 dnl -- imap dependencies --