Andreas Krennmair:

[apps/madmutt.git] / configure

diff --git a/configure b/configure
index ce066f0..cf11695 100755 (executable)
--- a/configure
+++ b/configure
@@ -859,6 +859,7 @@ Optional Features:
   --enable-debug             Enable debugging support
   --enable-flock             Use flock() to lock files
   --disable-fcntl            Do NOT use fcntl() to lock files
+  --disable-inodesort        Do NOT read files in maildir folders sorted by inode.
   --disable-warnings         Turn off compiler warnings (not recommended)
   --enable-nfs-fix           Work around an NFS with broken attributes caching
   --enable-buffy-size        Use file size attribute instead of access time
@@ -881,16 +882,16 @@ Optional Packages:
   --with-mailpath=DIR        Directory where spool mailboxes are located
   --with-docdir=PATH         Specify where to put the documentation
   --with-domain=DOMAIN       Specify your DNS domain name
-    --with-gss=PFX         Compile in GSSAPI authentication for IMAP
+  --with-gss=PFX           Compile in GSSAPI authentication for IMAP
   --with-ssl=PFX           Compile in SSL support for POP/IMAP
   --with-gnutls=PFX        Compile in GNU TLS support for POP/IMAP
   --with-nss=PFX           Compile in SSL support for POP/IMAP via NSS
   --with-sasl=PFX          Use Cyrus SASL library for POP/IMAP authentication
   --with-sasl2=PFX         Use Cyrus SASL library version 2 for POP/IMAP authentication
-  --with-idn=PFX               Use GNU libidn for domain names
+  --with-idn=PFX           Use GNU libidn for domain names
   --with-exec-shell=SHELL    Specify alternate shell (ONLY if /bin/sh is broken)
   --without-gdbm             Get rid of gdbm even if it is available
-  --with-bdb=DIR          Use BerkeleyDB4 if gdbm is not available
+  --with-bdb=DIR           Use BerkeleyDB4 if gdbm is not available
   --with-libiconv-prefix=DIR Search for libiconv in DIR/include and DIR/lib
   --with-included-gettext    Use the GNU gettext library included here
   --without-wc-funcs         Do not use the system's wchar_t functions
@@ -4514,7 +4515,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
                 PGPAUX_TARGET="pgpring pgpewrap"
-                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o"
+                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
 
        # Check whether --enable-smime or --disable-smime was given.
@@ -4532,7 +4533,7 @@ cat >>confdefs.h <<\_ACEOF
 #define CRYPT_BACKEND_CLASSIC_SMIME 1
 _ACEOF
 
-               MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o "
+               MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
                SMIMEAUX_TARGET="smime_keys"
        fi
 
@@ -9543,7 +9544,7 @@ cat >>confdefs.h <<\_ACEOF
 #define DL_STANDALONE 1
 _ACEOF
 
-        DOTLOCK_TARGET="mutt_dotlock"
+        DOTLOCK_TARGET="muttng_dotlock"
 else
         MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS dotlock.o"
 fi
@@ -9559,7 +9560,7 @@ if test "${with_docdir+set}" = set; then
   withval="$with_docdir"
   mutt_cv_docdir=$withval
 else
-  mutt_cv_docdir="$mutt_cv_prefix/doc/mutt"
+  mutt_cv_docdir="$mutt_cv_prefix/doc/muttng"
 fi;
 echo "$as_me:$LINENO: result: $mutt_cv_docdir" >&5
 echo "${ECHO_T}$mutt_cv_docdir" >&6
@@ -9604,6 +9605,7 @@ _ACEOF
 
                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o"
                 need_socket="yes"
+               need_pop="yes"
                 need_md5="yes"
         fi
 
@@ -10852,7 +10854,7 @@ fi;
 if test "${with_sasl+set}" = set; then
   withval="$with_sasl"
 
-        if test "$need_socket" != "yes"
+        if test "$with_sasl" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes"
         then
           { { echo "$as_me:$LINENO: error: SASL support is only useful with POP or IMAP support" >&5
 echo "$as_me: error: SASL support is only useful with POP or IMAP support" >&2;}
@@ -10966,10 +10968,10 @@ fi
 if test "${with_sasl2+set}" = set; then
   withval="$with_sasl2"
 
-        if test "$need_socket" != "yes"
+        if test "$with_sasl2" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes"
         then
-          { { echo "$as_me:$LINENO: error: SASL support is only useful with POP or IMAP support" >&5
-echo "$as_me: error: SASL support is only useful with POP or IMAP support" >&2;}
+          { { echo "$as_me:$LINENO: error: SASL2 support is only useful with POP or IMAP support" >&5
+echo "$as_me: error: SASL2 support is only useful with POP or IMAP support" >&2;}
    { (exit 1); exit 1; }; }
         fi
 
@@ -11046,8 +11048,8 @@ _ACEOF
   LIBS="-lsasl2 $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: could not find libsasl" >&5
-echo "$as_me: error: could not find libsasl" >&2;}
+  { { echo "$as_me:$LINENO: error: could not find libsasl2" >&5
+echo "$as_me: error: could not find libsasl2" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -11458,6 +11460,21 @@ _ACEOF
 
 fi
 
+mutt_cv_inodesort=yes
+# Check whether --enable-inodesort or --disable-inodesort was given.
+if test "${enable_inodesort+set}" = set; then
+  enableval="$enable_inodesort"
+  if test $enableval = no ; then mutt_cv_inodesort=no; fi
+fi;
+
+if test $mutt_cv_inodesort = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_INODESORT 1
+_ACEOF
+
+fi
+
 mutt_cv_warnings=yes
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
@@ -11752,11 +11769,6 @@ echo "$as_me: error: You need Sleepycat DB4 or GDBM for --enable-hcache" >&2;}
 fi
 fi;
 
-if test "$need_md5" = "yes"
-then
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5c.o"
-fi
-