X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=c4ca9ef6c1e4ff63ae362ba877d1188d5d9fbd45;hp=5b381acc03c9f25352d14c665ea935fa740b2abd;hb=69cbbd6ba2aec89f81ecf169e21b7bc4ec5bce90;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3

diff --git a/configure.ac b/configure.ac
index 5b381ac..c4ca9ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ fi
 AC_SUBST([DEBUGGER])
 
 AH_TEMPLATE([sig_atomic_t],
-            [/* Define to `int' if <signal.h> doesn't define.])
+            [Define to 'int' if <signal.h> doesn't define.])
 AH_TEMPLATE([HAVE_START_COLOR],
             [Define if you have start_color, as a function or macro.])
 AH_TEMPLATE([HAVE_TYPEAHEAD],
@@ -114,7 +114,7 @@ OPS='$(srcdir)/OPS'
 		else
 			LIBGPGME_CFLAGS=`$GPGME_CONFIG --cflags`
 			LIBGPGME_LIBS=`$GPGME_CONFIG --libs`
-      MUTTLIBS="$MUTTLIBS $LIBGPGME_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])
@@ -141,14 +141,14 @@ OPS='$(srcdir)/OPS'
  			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"
@@ -299,14 +299,8 @@ 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])
-                    ])
+                    [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)
@@ -368,7 +362,9 @@ fi
 
 
 AC_ARG_WITH(homespool,
-  AC_HELP_STRING([--with-homespool[=FILE]], [File in user's directory where new mail is spooled]), with_homespool=${withval})
+            AC_HELP_STRING([--with-homespool[=FILE]],
+                           [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
@@ -438,21 +434,6 @@ int main (int argc, char **argv)
         fi
 fi
 
-AC_ARG_ENABLE(external_dotlock, AC_HELP_STRING([--enable-external-dotlock], [Force use of an external dotlock program]),
-        [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"
-then
-        AC_DEFINE(DL_STANDALONE,1,[ Define if you want to use an external dotlocking program. ])
-        DOTLOCK_TARGET="muttng_dotlock"
-else
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS dotlock.o"
-fi
-
-AC_SUBST(DOTLOCK_TARGET)
-
-
 AC_MSG_CHECKING(where to put the documentation)
 AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]),
         [mutt_cv_docdir=$withval],