X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=37e920202ff402e731bedae0cd57c21fdc3a6dd6;hp=34c085aac0501463a0f4aea987e90495372f6b7b;hb=1ffe18af5bf2fda6f7dc86c514b56c6a82ec3040;hpb=8682670f5c23aca480236b8456aa8192b154a3e0

diff --git a/configure.ac b/configure.ac
index 34c085a..37e9202 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ fi
 AC_MSG_RESULT($mutt_cv_prefix)
 
 AC_PROG_CPP
-AC_PROG_CC_STDC
 AC_PROG_CC_C99
 
 AM_C_PROTOTYPES
@@ -48,22 +47,6 @@ AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_SIZEOF(off_t)
 
-AC_PATH_PROG(DBX, dbx, no)
-AC_PATH_PROG(GDB, gdb, no)
-AC_PATH_PROG(SDB, sdb, no)
-
-if test $GDB != no ; then
-    DEBUGGER=$GDB
-elif test $DBX != no ; then
-    DEBUGGER=$DBX
-elif test $SDB != no ; then
-    DEBUGGER=$SDB
-else
-    DEBUGGER=no
-fi
-
-AC_SUBST([DEBUGGER])
-
 AH_TEMPLATE([sig_atomic_t],
             [Define to 'int' if <signal.h> doesn't define.])
 AH_TEMPLATE([HAVE_START_COLOR],
@@ -104,8 +87,10 @@ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[
     if test x$enableval = xyes; then
         AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)])
         MUTTLIBS="$MUTTLIBS $GPGME_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])
+        AM_CONDITIONAL(BUILD_GPGME, true)
+    else
+        AM_CONDITIONAL(BUILD_GPGME, false)
     fi
 ])
 
@@ -942,11 +927,11 @@ AC_SUBST(HTMLCLEAN_CMD)
 
 AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         po/Makefile.in doc/Makefile contrib/Makefile
-        muttbug.sh
         lib-lib/Makefile
         lib-mime/Makefile
         lib-crypt/Makefile
         lib-hash/Makefile
+        lib-ui/Makefile
         lib/Makefile
         imap/Makefile
         pop/Makefile