X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=0cb3f9f93b4f9e5ad7df404f395e755de9818704;hp=c22908029cd17f44c9c092ef9a46dffe38ce6042;hb=5b0581b41f115cd0442037a97db313ef5b5b8822;hpb=201fd8633cc86ccda413c919ae6e2ae04e89b4a9 diff --git a/configure.ac b/configure.ac index c229080..0cb3f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -165,60 +165,55 @@ 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. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" dnl --- now that we've found it, check the link AC_CHECK_LIB(slang, SLtt_get_terminfo, [MUTTLIBS="$MUTTLIBS -lslang -lm"], [AC_MSG_ERROR(unable to compile. check config.log)], -lm) - ], + ], + [ mutt_cv_curses=/usr + AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]), [ + if test $withval != yes; then + mutt_cv_curses=$withval + fi + if test x$mutt_cv_curses != x/usr; then + LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS" + CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" + fi + ]) - [ mutt_cv_curses=/usr - AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]), - [ if test $withval != yes; then - mutt_cv_curses=$withval - fi - if test x$mutt_cv_curses != x/usr; then - LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS" - CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" + AC_CHECK_FUNC(initscr,,[ + cf_ncurses="ncurses" + for lib in ncursesw ncurses; do + AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) + done + AC_CHECK_LIB($cf_ncurses, initscr, + [ MUTTLIBS="$MUTTLIBS -l$cf_ncurses" + if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then + CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" fi - ]) - AC_CHECK_FUNC(initscr,,[ - cf_ncurses="ncurses" - for lib in ncursesw ncurses; do - AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) - done - AC_CHECK_LIB($cf_ncurses, initscr, - [ MUTTLIBS="$MUTTLIBS -l$cf_ncurses" - if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then - CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" - fi - - if test "$cf_ncurses" = ncursesw; then - AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"]) - AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"]) - else - AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"]) - fi - ], - [CF_CURSES_LIBS]) - ]) - - old_LIBS="$LIBS" - 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. ]) - fi - if test "$ac_cv_func_decl_resizeterm" = yes; then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" - fi - LIBS="$old_LIBS" + if test "$cf_ncurses" = ncursesw; then + AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"]) + AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"]) + else + AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"]) + fi + ], + [CF_CURSES_LIBS]) ]) + old_LIBS="$LIBS" + 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. ]) + fi + LIBS="$old_LIBS" + ]) + AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h) AC_CHECK_HEADERS(sys/time.h sys/resource.h) AC_CHECK_HEADERS(unix.h) @@ -406,27 +401,23 @@ AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes) dnl -- end imap dependencies -- AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]), -[ if test "$with_ssl" != "no" - then - if test "$with_ssl" != "yes" - then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" - fi - saved_LIBS="$LIBS" - - AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library])) - AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto) +[ if test "$with_ssl" != "no"; then + if test "$with_ssl" != "yes"; then + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + fi + saved_LIBS="$LIBS" - AC_CHECK_FUNCS(RAND_status RAND_egd) + AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library])) + AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto) - AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ]) - LIBS="$saved_LIBS" - MUTTLIBS="$MUTTLIBS -lssl -lcrypto" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl.o" - need_ssl=yes + AC_CHECK_FUNCS(RAND_status RAND_egd) - fi + AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ]) + LIBS="$saved_LIBS" + MUTTLIBS="$MUTTLIBS -lssl -lcrypto" + need_ssl=yes + fi ]) AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls], [Enable SSL support using gnutls]), @@ -439,12 +430,12 @@ if test "$gnutls_prefix" != "no"; then CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS" AC_DEFINE(USE_GNUTLS, 1, [Define if you want support for SSL via the gnutls library.]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o" need_ssl=yes], [AC_MSG_ERROR([could not find libgnutls]) ]) fi AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) +AC_SUBST(MUTT_SSL_OBJECTS) AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]),[ @@ -456,8 +447,7 @@ AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], saved_LIBS="$LIBS" - AC_CHECK_LIB(sasl2, sasl_client_init,, - AC_MSG_ERROR([could not find libsasl2]),) + AC_CHECK_LIB(sasl2, sasl_client_init,,AC_MSG_ERROR([could not find libsasl2])) MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" MUTTLIBS="$MUTTLIBS -lsasl2" @@ -711,18 +701,18 @@ changequote([, ])dnl mutt_cv_iconv_nontrans=no) LIBS="$mutt_save_LIBS") if test "$mutt_cv_iconv_nontrans" = yes; then - AC_DEFINE(ICONV_NONTRANS, 1) + AC_DEFINE(ICONV_NONTRANS, 1) else - AC_DEFINE(ICONV_NONTRANS, 0) + AC_DEFINE(ICONV_NONTRANS, 0) fi CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl" if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then - AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET,1, - [ Define if your gettext has bind_textdomain_codeset. ]) + AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET,1, + [ Define if your gettext has bind_textdomain_codeset. ]) else - AC_CHECK_FUNCS(bind_textdomain_codeset) + AC_CHECK_FUNCS(bind_textdomain_codeset) fi fi # libiconv @@ -730,86 +720,11 @@ fi # libiconv dnl -- locales -- AC_CHECK_HEADERS(wchar.h) - -AC_CACHE_CHECK([for wchar_t], mutt_cv_wchar_t, - AC_TRY_COMPILE([ -#include -#include -#ifdef HAVE_WCHAR_H -#include -#endif - ], - [ wchar_t wc; return 0; ], - mutt_cv_wchar_t=yes, - mutt_cv_wchar_t=no)) - -if test "$mutt_cv_wchar_t" = no; then - AC_DEFINE(wchar_t,int,[ Define to 'int' if system headers don't define. ]) -fi - -AC_CACHE_CHECK([for wint_t], mutt_cv_wint_t, - AC_TRY_COMPILE([ -#include -#include -#ifdef HAVE_WCHAR_H -#include -#endif - ], - [ wint_t wc; return 0; ], - mutt_cv_wint_t=yes, - mutt_cv_wint_t=no)) - -if test "$mutt_cv_wint_t" = no; then - AC_DEFINE(wint_t,int,[ Define to 'int' if system headers don't define. ]) -fi - AC_CHECK_HEADERS(wctype.h) AC_CHECK_FUNCS(iswalnum iswalpha iswcntrl iswdigit) AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper) AC_CHECK_FUNCS(iswxdigit towupper towlower) - -AC_CACHE_CHECK([for mbstate_t], mutt_cv_mbstate_t, - AC_TRY_COMPILE([ -#include -#include -#ifdef HAVE_WCHAR_H -#include -#endif - ], - [ mbstate_t s; return 0; ], - mutt_cv_mbstate_t=yes, - mutt_cv_mbstate_t=no)) - -if test "$mutt_cv_mbstate_t" = no; then - AC_DEFINE(mbstate_t,int,[ Define to 'int' if system headers don't define. ]) -fi - -wc_funcs=maybe -AC_ARG_WITH(wc-funcs, AC_HELP_STRING([--without-wc-funcs], [Do not use the system's wchar_t functions]), - wc_funcs=$withval) - -if test "$wc_funcs" != yes -a "$wc_funcs" != no; then - AC_CACHE_CHECK([for wchar_t functions], mutt_cv_wc_funcs, - mutt_cv_wc_funcs=no - AC_TRY_LINK([ -#define _XOPEN_SOURCE 1 -#include -#include -#ifdef HAVE_WCTYPE_H -#include -#endif -#ifdef HAVE_WCHAR_H -#include -#endif], - [mbrtowc(0, 0, 0, 0); wctomb(0, 0); wcwidth(0); - iswprint(0); iswspace(0); towlower(0); towupper(0); iswalnum(0)], - mutt_cv_wc_funcs=yes)) - wc_funcs=$mutt_cv_wc_funcs -fi - -if test $wc_funcs = yes; then - AC_DEFINE(HAVE_WC_FUNCS,1,[ Define if you are using the system's wchar_t functions. ]) -fi +AC_TYPE_MBSTATE_T AC_CACHE_CHECK([for nl_langinfo and CODESET], mutt_cv_langinfo_codeset, [AC_TRY_LINK([#include ], @@ -912,6 +827,7 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile lib-mime/Makefile lib-crypt/Makefile lib-hash/Makefile + lib-sys/Makefile lib-ui/Makefile lib/Makefile imap/Makefile