From: Pierre Habouzit Date: Thu, 17 May 2007 21:58:22 +0000 (+0200) Subject: this is now useless X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=140da0c6d18fe8691ec591cea2f32d05be40f502;p=apps%2Fmadmutt.git this is now useless Signed-off-by: Pierre Habouzit --- diff --git a/m4/curslib.m4 b/m4/curslib.m4 deleted file mode 100644 index 5d443ec..0000000 --- a/m4/curslib.m4 +++ /dev/null @@ -1,83 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Look for the curses libraries. Older curses implementations may require -dnl termcap/termlib to be linked as well. -AC_DEFUN([CF_CURSES_LIBS],[ -AC_CHECK_FUNC(initscr,,[ -case $host_os in #(vi -freebsd*) #(vi - AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"]) - ;; -hpux10.*|hpux11.*) - AC_CHECK_LIB(cur_colr,initscr,[ - LIBS="-lcur_colr $LIBS" - CFLAGS="-I/usr/include/curses_colr $CFLAGS" - ac_cv_func_initscr=yes - ],[ - AC_CHECK_LIB(Hcurses,initscr,[ - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - LIBS="-lHcurses $LIBS" - CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS" - ac_cv_func_initscr=yes - ])]) - ;; -linux*) # Suse Linux does not follow /usr/lib convention - LIBS="$LIBS -L/lib" - ;; -esac - -if test ".$With5lib" != ".no" ; then -if test -d /usr/5lib ; then - # SunOS 3.x or 4.x - CPPFLAGS="$CPPFLAGS -I/usr/5include" - LIBS="$LIBS -L/usr/5lib" -fi -fi - -if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" - - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ - for cf_term_lib in termcap termlib unknown - do - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) - done - ]) - - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown - do - AC_CHECK_LIB($cf_curs_lib,initscr,[break]) - done - test $cf_curs_lib = unknown && AC_ERROR(no curses library found) - - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=no]) - AC_MSG_RESULT($cf_result) - test $cf_result = no && AC_ERROR(Cannot link curses library) - elif test "$cf_term_lib" != predefined ; then - AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr(); tgoto((char *)0, 0, 0);], - [cf_result=no], - [ - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=error]) - ]) - AC_MSG_RESULT($cf_result) - fi -fi - -])]) diff --git a/m4/funcdecl.m4 b/m4/funcdecl.m4 deleted file mode 100644 index f46be2e..0000000 --- a/m4/funcdecl.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Check if a function is declared by including a set of include files. -dnl Invoke the corresponding actions according to whether it is found or not. -dnl -dnl Gcc (unlike other compilers) will only warn about the miscast assignment -dnl in the first test, but most compilers will oblige with an error in the -dnl second test. -dnl -dnl CF_CHECK_FUNCDECL(INCLUDES, FUNCTION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -AC_DEFUN([CF_CHECK_FUNCDECL], -[ -AC_MSG_CHECKING([for $2 declaration]) -AC_CACHE_VAL(ac_cv_func_decl_$2, -[AC_TRY_COMPILE([$1], -[#ifndef ${ac_func} -extern int ${ac_func}(); -#endif],[ -AC_TRY_COMPILE([$1], -[#ifndef ${ac_func} -int (*p)() = ${ac_func}; -#endif],[ -eval "ac_cv_func_decl_$2=yes"],[ -eval "ac_cv_func_decl_$2=no"])],[ -eval "ac_cv_func_decl_$2=yes"])]) -if eval "test \"`echo '$ac_cv_func_'decl_$2`\" = yes"; then - AC_MSG_RESULT(yes) - ifelse([$3], , :, [$3]) -else - AC_MSG_RESULT(no) -ifelse([$4], , , [$4 -])dnl -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl Check if functions are declared by including a set of include files. -dnl and define DECL_XXX if not. -dnl -dnl CF_CHECK_FUNCDECLS(INCLUDES, FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -AC_DEFUN([CF_CHECK_FUNCDECLS], -[for ac_func in $2 -do -CF_CHECK_FUNCDECL([$1], $ac_func, -[ - CF_UPPER(ac_tr_func,HAVE_$ac_func) - AC_DEFINE_UNQUOTED($ac_tr_func) $3], -[$4])dnl -dnl [$3], -dnl [ -dnl CF_UPPER(ac_tr_func,DECL_$ac_func) -dnl AC_DEFINE_UNQUOTED($ac_tr_func) $4])dnl -done -])dnl -dnl --------------------------------------------------------------------------- -dnl Make an uppercase version of a variable -dnl $1=uppercase($2) -AC_DEFUN([CF_UPPER], -[ -changequote(,)dnl -$1=`echo $2 | tr '[a-z]' '[A-Z]'` -changequote([,])dnl -])dnl -dnl --------------------------------------------------------------------------- diff --git a/m4/libesmtp.m4 b/m4/libesmtp.m4 deleted file mode 100644 index e1f20e3..0000000 --- a/m4/libesmtp.m4 +++ /dev/null @@ -1,51 +0,0 @@ -dnl vim:ft=config: - -dnl Search for libesmtp, by Steven Engelhardt -dnl -dnl libesmtp often requires linking against -lpthread or -lc_r (BSD). -dnl This macro attempts to centralize this code. - -AC_DEFUN([MUTT_AM_LIBESMTP], -[ - AC_ARG_WITH( - [libesmtp], - [ --with-libesmtp=DIR Compile in support for libesmtp for the MTA], - [ if test "$with_libesmtp" != "no" - then - mutt_libesmtp_check_path="$PATH" - - if test "$with_libesmtp" != "yes" - then - mutt_libesmtp_check_path="$tmp_path:$withval/bin" - fi - - dnl 1. Find libesmtp-config - AC_PATH_PROG([mutt_libesmtp_config_path], - [libesmtp-config], - [no], - [$mutt_libesmtp_check_path]) - - if test "$mutt_libesmtp_config_path" = "no" - then - AC_MSG_ERROR([libesmtp-config binary not found.]) - fi - - dnl 2. Get CFLAGS and LIBS from libesmtp-config - mutt_libesmtp_cflags=`$mutt_libesmtp_config_path --cflags` - mutt_libesmtp_libs=`$mutt_libesmtp_config_path --libs` - - dnl 3. Verify libesmtp.h can be found with these settings - temp_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $mutt_libesmtp_cflags" - AC_CHECK_HEADER([libesmtp.h], - [], - AC_MSG_ERROR([Could not find libesmtp.h])) - CFLAGS="$temp_CFLAGS" - - dnl 4. Export use_libesmtp variable so configure.in can - dnl act accordingly. - use_libesmtp=yes - fi - ] - ) -])