X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=configure.ac;h=476b0d287ed2230a097611ec81e17bfc580172ef;hb=3ad8157bbbc6b9fae1c3252aad1c07fcccd92004;hp=bd9bd84a1a210c51231bb3aa62dc4f4c745a9ba3;hpb=9b2475d3970fb70c443ac5035a41208cd9db1569;p=apps%2Fmadmutt.git

diff --git a/configure.ac b/configure.ac
index bd9bd84..476b0d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,7 @@ dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED            !!!
 AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(madmutt, `cat "$srcdir/VERSION.in"`)
-
-AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
+AM_INIT_AUTOMAKE(madmutt, devel)
 
 AC_GNU_SOURCE
 
@@ -62,7 +60,7 @@ 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. ])
 
-dnl ---------------- gpgme ----------------
+dnl ---------------- lua5.1 ----------------
 PKG_CHECK_MODULES(LUA,lua5.1,[
     CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
     LDFLAGS="$LDFLAGS $LUA_LIBS"
@@ -75,9 +73,8 @@ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[
         AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)])
         MUTTLIBS="$MUTTLIBS $GPGME_LIBS"
         AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
-        AM_CONDITIONAL(BUILD_GPGME, true)
     else
-        AM_CONDITIONAL(BUILD_GPGME, false)
+        AC_MSG_ERROR([could not find gpgme])
     fi
 ])
 
@@ -736,17 +733,14 @@ AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no")
 AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
 AC_OUTPUT(Makefile
-          Madmuttrc.head
           intl/Makefile
           m4/Makefile
           po/Makefile.in
           apidoc/Makefile apidoc/doxygen.cfg
           doc/Makefile doc/instdoc.sh
-          contrib/Makefile
           lib-lib/Makefile
           lib-lua/Makefile
           lib-mime/Makefile
-          lib-crypt/Makefile
           lib-hash/Makefile
           lib-mx/Makefile
           lib-sys/Makefile