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

diff --git a/configure.ac b/configure.ac
index 1187006..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,6 +60,12 @@ 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 ---------------- lua5.1 ----------------
+PKG_CHECK_MODULES(LUA,lua5.1,[
+    CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
+    LDFLAGS="$LDFLAGS $LUA_LIBS"
+],[AC_MSG_ERROR([could not find lua5.1])])
+
 dnl ---------------- gpgme ----------------
 
 AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[
@@ -69,20 +73,14 @@ 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
 ])
 
 AC_PATH_PROG(MIXMASTER, mixmaster, mixmaster)
 AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER",[Where to find mixmaster on your system.])
 
-AC_PATH_PROG(ISPELL, ispell, no)
-if test $ISPELL != no; then
-    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]),
     [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish,
         [AC_TRY_RUN([#include <sys/param.h>
@@ -641,7 +639,8 @@ dnl -- libesmtp --
 MUTT_AM_LIBESMTP
 if test x$use_libesmtp = xyes; then
     CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
-    MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs"
+    dnl HACK MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs"
+    MUTTLIBS="$MUTTLIBS -lesmtp"
     MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o"
     AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp])
 fi
@@ -734,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
-          tools/Makefile
           lib-lib/Makefile
+          lib-lua/Makefile
           lib-mime/Makefile
-          lib-crypt/Makefile
           lib-hash/Makefile
           lib-mx/Makefile
           lib-sys/Makefile