projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repository cleanse.
[apps/madmutt.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
42d1806
..
476b0d2
100644
(file)
--- 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)
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
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. ])
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]),[
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_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
else
- A
M_CONDITIONAL(BUILD_GPGME, false
)
+ A
C_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.])
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>
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>
@@
-135,7
+133,6
@@
main ()
AC_CHECK_LIB(termlib, main)
fi
AC_DEFINE(USE_SLANG_CURSES,1, [ Define if you compile with SLang instead of curses/ncurses. ])
AC_CHECK_LIB(termlib, main)
fi
AC_DEFINE(USE_SLANG_CURSES,1, [ Define if you compile with SLang instead of curses/ncurses. ])
- AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])
dnl --- now that we've found it, check the link
dnl --- now that we've found it, check the link
@@
-179,8
+176,8
@@
main ()
LIBS="$LIBS $MUTTLIBS"
CF_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>],
[start_color typeahead bkgdset curs_set meta use_default_colors resizeterm])
LIBS="$LIBS $MUTTLIBS"
CF_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>],
[start_color typeahead bkgdset curs_set meta use_default_colors resizeterm])
- if test "$ac_cv_func_decl_start_color" = yes; then
- AC_
DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color.
])
+ if test "$ac_cv_func_decl_start_color"
!
= yes; then
+ AC_
MSG_ERROR([Your curses library does not supports color.
])
fi
LIBS="$old_LIBS"
])
fi
LIBS="$old_LIBS"
])
@@
-642,7
+639,8
@@
dnl -- libesmtp --
MUTT_AM_LIBESMTP
if test x$use_libesmtp = xyes; then
CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
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
MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o"
AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp])
fi
@@
-735,16
+733,14
@@
AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no")
AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
AC_OUTPUT(Makefile
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
intl/Makefile
m4/Makefile
po/Makefile.in
apidoc/Makefile apidoc/doxygen.cfg
doc/Makefile doc/instdoc.sh
- contrib/Makefile
lib-lib/Makefile
lib-lib/Makefile
+ lib-lua/Makefile
lib-mime/Makefile
lib-mime/Makefile
- lib-crypt/Makefile
lib-hash/Makefile
lib-mx/Makefile
lib-sys/Makefile
lib-hash/Makefile
lib-mx/Makefile
lib-sys/Makefile