From: Pierre Habouzit Date: Tue, 14 Nov 2006 11:04:09 +0000 (+0100) Subject: continue the configure simplifications. X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=a9533eed32ccd9bae6f6f42980d0478f84dc2551 continue the configure simplifications. Signed-off-by: Pierre Habouzit --- diff --git a/configure.ac b/configure.ac index 2b40a60..9867df4 100644 --- a/configure.ac +++ b/configure.ac @@ -16,31 +16,16 @@ ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv d AC_CANONICAL_HOST -AC_MSG_CHECKING([for prefix]) -if test x$prefix = xNONE; then - mutt_cv_prefix=$ac_default_prefix -else - mutt_cv_prefix=$prefix -fi -AC_MSG_RESULT($mutt_cv_prefix) - AC_PROG_CPP AC_PROG_CC_C99 - -AM_C_PROTOTYPES -AC_C_INLINE -AC_C_CONST -if test "x$U" != "x"; then - AC_MSG_ERROR(Compiler not ANSI compliant) -fi AC_ISC_POSIX AC_HEADER_STDC +PKG_PROG_PKG_CONFIG AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_GPERF -PKG_PROG_PKG_CONFIG AC_CHECK_TOOL(AR, ar, ar) AC_SYS_LARGEFILE @@ -71,15 +56,13 @@ AH_TEMPLATE([ICONV_NONTRANS], [Define as 1 if iconv() only converts exactly and we should treat all return values other than (size_t)(-1) as equivalent.]) -MUTT_C99_INTTYPES - dnl ---------------- sendmail ---------------- 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. ]) -OPS='$(srcdir)/OPS' +OPS="\$(srcdir)/OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT" dnl ---------------- gpgme ---------------- @@ -103,8 +86,6 @@ AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmas AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER",[Where to find mixmaster on your system.]) ]) -# We now require all OPS -OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT " AC_SUBST([OPS]) AC_PATH_PROG(ISPELL, ispell, no) @@ -135,8 +116,8 @@ main () CFLAGS="$CFLAGS -I${mutt_cv_slang}" LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" else - if test -d $mutt_cv_prefix/include/slang; then - CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang" + if test -d ${prefix}/include/slang; then + CFLAGS="$CFLAGS -I${prefix}/include/slang" elif test -d /usr/include/slang; then CFLAGS="$CFLAGS -I/usr/include/slang" fi @@ -517,7 +498,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) ac_prefer_gdbm=$withval) if test x$ac_prefer_gdbm != xno -a x$ac_qdbm_here != xyes; then ac_cv_gdbmopen=no - GDBM_DIRS="$mutt_cv_prefix /usr/local /usr" + GDBM_DIRS="${prefix} /usr/local /usr" AC_MSG_CHECKING([for gdbm_open]) for d in $GDBM_DIRS; do if test x$ac_cv_gdbmopen = xno && test -d "$d/include" && test -d "$d/lib"; then @@ -539,7 +520,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available ]), ac_bdb_prefix=$withval) if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_qdbm_here != xyes; then - test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + test x$ac_bdb_prefix = xyes && ac_bdb_prefix="${prefix} /opt/csw/bdb4 /opt /usr/local /usr" for d in $ac_bdb_prefix; do bdbpfx="$bdbpfx $d" for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do @@ -617,12 +598,11 @@ AC_ARG_ENABLE(iconv, AC_HELP_STRING([--disable-iconv], [Disable iconv support]), AM_GNU_GETTEXT -if test "$am_cv_func_iconv" != "yes" -then - AC_MSG_WARN([Configuring without iconv support. See INSTALL for details]) +if test "$am_cv_func_iconv" != "yes"; then + AC_MSG_WARN([Configuring without iconv support. See INSTALL for details]) else -AC_CHECK_HEADERS(iconv.h, + AC_CHECK_HEADERS(iconv.h, [AC_MSG_CHECKING(whether iconv.h defines iconv_t) AC_EGREP_HEADER([typedef.*iconv_t],iconv.h, [AC_MSG_RESULT(yes) @@ -630,13 +610,13 @@ AC_CHECK_HEADERS(iconv.h, [Define if defines iconv_t.])], AC_MSG_RESULT(no))]) -dnl (1) Some implementations of iconv won't convert from UTF-8 to UTF-8. -dnl (2) In glibc-2.1.2 and earlier there is a bug that messes up ob and -dnl obl when args 2 and 3 are 0 (fixed in glibc-2.1.3). -AC_CACHE_CHECK([whether this iconv is good enough], mutt_cv_iconv_good, - mutt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_RUN([ + dnl (1) Some implementations of iconv won't convert from UTF-8 to UTF-8. + dnl (2) In glibc-2.1.2 and earlier there is a bug that messes up ob and + dnl obl when args 2 and 3 are 0 (fixed in glibc-2.1.3). + AC_CACHE_CHECK([whether this iconv is good enough], mutt_cv_iconv_good, + mutt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_RUN([ #include int main() { @@ -652,57 +632,14 @@ changequote([, ])dnl !(ob == buf && obl == sizeof(buf)) || iconv_close(cd))); } - ], - mutt_cv_iconv_good=yes, - mutt_cv_iconv_good=no, - mutt_cv_iconv_good=yes) - LIBS="$mutt_save_LIBS") -if test "$mutt_cv_iconv_good" = no; then - AC_MSG_ERROR(Try using libiconv instead) -fi - -dnl This is to detect implementations such as the one in glibc-2.1, -dnl which always convert exactly but return the number of characters -dnl converted instead of the number converted inexactly. -AC_CACHE_CHECK([whether iconv is non-transcribing], mutt_cv_iconv_nontrans, - mutt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_RUN([ -#include -#include -int main() -{ - iconv_t cd; - const char *ib; - char *ob; - size_t ibl, obl; - const char *s = "\304\211"; -changequote(, )dnl - char t[3]; -changequote([, ])dnl - ib = s, ibl = 2, ob = t, obl = 3; - return ((cd = iconv_open("UTF-8", "UTF-8")) == (iconv_t)(-1) || - iconv(cd, &ib, &ibl, &ob, &obl)); -} - ], - mutt_cv_iconv_nontrans=no, - mutt_cv_iconv_nontrans=yes, - mutt_cv_iconv_nontrans=no) - LIBS="$mutt_save_LIBS") -if test "$mutt_cv_iconv_nontrans" = yes; then - AC_DEFINE(ICONV_NONTRANS, 1) -else - 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. ]) -else - AC_CHECK_FUNCS(bind_textdomain_codeset) -fi + ], + mutt_cv_iconv_good=yes, + mutt_cv_iconv_good=no, + mutt_cv_iconv_good=yes) + LIBS="$mutt_save_LIBS") + if test "$mutt_cv_iconv_good" = no; then + AC_MSG_ERROR(Try using libiconv instead) + fi fi # libiconv @@ -716,21 +653,23 @@ AC_CHECK_FUNCS(iswxdigit towupper towlower) AC_TYPE_MBSTATE_T AC_CACHE_CHECK([for nl_langinfo and CODESET], mutt_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - mutt_cv_langinfo_codeset=yes, - mutt_cv_langinfo_codeset=no)]) + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + mutt_cv_langinfo_codeset=yes, + mutt_cv_langinfo_codeset=no)]) if test $mutt_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET,1,[ Define if you have and nl_langinfo(CODESET). ]) + AC_DEFINE(HAVE_LANGINFO_CODESET,1, + [Define if you have and nl_langinfo(CODESET).]) fi AC_CACHE_CHECK([for nl_langinfo and YESEXPR], mutt_cv_langinfo_yesexpr, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(YESEXPR);], - mutt_cv_langinfo_yesexpr=yes, - mutt_cv_langinfo_yesexpr=no)]) + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(YESEXPR);], + mutt_cv_langinfo_yesexpr=yes, + mutt_cv_langinfo_yesexpr=no)]) if test $mutt_cv_langinfo_yesexpr = yes; then - AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have and nl_langinfo(YESEXPR). ]) + AC_DEFINE(HAVE_LANGINFO_YESEXPR,1, + [Define if you have and nl_langinfo(YESEXPR).]) fi dnl -- libesmtp -- @@ -739,10 +678,7 @@ if test x$use_libesmtp = xyes; then CFLAGS="$CFLAGS $mutt_libesmtp_cflags" MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs" MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o" - - AC_DEFINE(USE_LIBESMTP, - 1, - [Define to enable the use of libesmtp]) + AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp]) fi dnl -- end libesmtp -- @@ -751,37 +687,32 @@ dnl -- sgml tools -- dnl Documentation tools have_openjade="no" AC_PATH_PROG([OSPCAT], [ospcat], [none]) -if test "$OSPCAT" != "none" -then - AC_MSG_CHECKING([for openjade docbook stylesheets]) - dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"` - DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\(@<:@^'@:>@*\)\/catalog'.*/\1/p"` - # ospcat may spit out an absolute path without an SOIBASE - if test -z "$DSLROOT" - then - DSLROOT=`echo $dslosfile | sed -e 's|\(.*\)/print/docbook.dsl|\1|'` - fi - if test -f $DSLROOT/print/docbook.dsl - then - AC_MSG_RESULT([in $DSLROOT]) - have_openjade="yes" - else - AC_MSG_RESULT([not found: PDF documentation will not be built.]) - fi +if test "x$OSPCAT" != "xnone"; then + AC_MSG_CHECKING([for openjade docbook stylesheets]) + dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"` + DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\(@<:@^'@:>@*\)\/catalog'.*/\1/p"` + # ospcat may spit out an absolute path without an SOIBASE + if test -z "$DSLROOT"; then + DSLROOT=`echo $dslosfile | sed -e 's|\(.*\)/print/docbook.dsl|\1|'` + fi + if test -f $DSLROOT/print/docbook.dsl; then + AC_MSG_RESULT([in $DSLROOT]) + have_openjade="yes" + else + AC_MSG_RESULT([not found: PDF documentation will not be built.]) + fi fi AC_SUBST(DSLROOT) AC_MSG_CHECKING([for lynx]) AC_PATH_PROG([HTML2TXT_CMD], [lynx], [none]) -if test x"$HTML2TXT_CMD" = x"none" -then - AC_MSG_CHECKING([for w3m]) - AC_PATH_PROG([HTML2TXT_CMD], [w3m], [none]) +if test x"$HTML2TXT_CMD" = x"none"; then + AC_MSG_CHECKING([for w3m]) + AC_PATH_PROG([HTML2TXT_CMD], [w3m], [none]) fi -if test x"$HTML2TXT_CMD" = x"none" -then - AC_MSG_CHECKING([for elinks]) - AC_PATH_PROG([HTML2TXT_CMD], [elinks], [none]) +if test x"$HTML2TXT_CMD" = x"none"; then + AC_MSG_CHECKING([for elinks]) + AC_PATH_PROG([HTML2TXT_CMD], [elinks], [none]) fi case "$HTML2TXT_CMD" in *elinks*) @@ -802,25 +733,29 @@ AC_SUBST(HTML2TXT_CMD) AC_MSG_CHECKING([for tidy]) AC_PATH_PROG([HTMLCLEAN_CMD], [tidy], [none]) -if test x"$HTMLCLEAN_CMD" != x"none" -then - HTMLCLEAN_CMD="$HTMLCLEAN_CMD -q -i -m -asxml -utf8 " +if test x"$HTMLCLEAN_CMD" != x"none"; then + HTMLCLEAN_CMD="$HTMLCLEAN_CMD -q -i -m -asxml -utf8 " else - HTMLCLEAN_CMD="echo " + HTMLCLEAN_CMD="echo " fi AC_SUBST(HTMLCLEAN_CMD) -AC_OUTPUT(Makefile intl/Makefile m4/Makefile - po/Makefile.in doc/Makefile contrib/Makefile - lib-lib/Makefile - lib-mime/Makefile - lib-crypt/Makefile - lib-hash/Makefile - lib-sys/Makefile - lib-ui/Makefile - lib/Makefile - imap/Makefile - pop/Makefile - nntp/Makefile - Madmuttrc.head - doc/instdoc.sh) +AC_OUTPUT(Makefile + Madmuttrc.head + + intl/Makefile + m4/Makefile + po/Makefile.in + doc/Makefile doc/instdoc.sh + contrib/Makefile + lib-lib/Makefile + lib-mime/Makefile + lib-crypt/Makefile + lib-hash/Makefile + lib-sys/Makefile + lib-ui/Makefile + lib/Makefile + imap/Makefile + pop/Makefile + nntp/Makefile +) diff --git a/m4/Makefile.am b/m4/Makefile.am index c454ce5..ba7143f 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,18 +1,13 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- ##m4-files-begin -EXTRA_DIST = glibc2.m4 intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 README Makefile.am.in \ -codeset.m4 \ -curslib.m4 \ -funcdecl.m4 \ -gettext.m4 \ -glibc21.m4 \ -gssapi.m4 \ -iconv.m4 \ -lcmessage.m4 \ -libesmtp.m4 \ -progtest.m4 \ -types.m4 +EXTRA_DIST = README Makefile.am.in \ + intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lib-ld.m4 \ + lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 \ + nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 stdint_h.m4 \ + uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 \ + xsize.m4 codeset.m4 curslib.m4 funcdecl.m4 gettext.m4 gssapi.m4 \ + iconv.m4 lcmessage.m4 libesmtp.m4 progtest.m4 types.m4 ##m4-files-end Makefile.am: Makefile.am.in diff --git a/m4/glibc2.m4 b/m4/glibc2.m4 deleted file mode 100644 index e8f5bfe..0000000 --- a/m4/glibc2.m4 +++ /dev/null @@ -1,30 +0,0 @@ -# glibc2.m4 serial 1 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Test for the GNU C Library, version 2.0 or newer. -# From Bruno Haible. - -AC_DEFUN([gt_GLIBC2], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, - ac_cv_gnu_library_2, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2=yes, - ac_cv_gnu_library_2=no) - ] - ) - AC_SUBST(GLIBC2) - GLIBC2="$ac_cv_gnu_library_2" - ] -) diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 deleted file mode 100644 index d95fd98..0000000 --- a/m4/glibc21.m4 +++ /dev/null @@ -1,30 +0,0 @@ -# glibc21.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([gl_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 deleted file mode 100644 index b8d7817..0000000 --- a/m4/intdiv0.m4 +++ /dev/null @@ -1,70 +0,0 @@ -# intdiv0.m4 serial 1 (gettext-0.11.3) -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([gt_INTDIV0], -[ - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], - gt_cv_int_divbyzero_sigfpe, - [ - AC_TRY_RUN([ -#include -#include - -static void -#ifdef __cplusplus -sigfpe_handler (int sig) -#else -sigfpe_handler (sig) int sig; -#endif -{ - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ - exit (sig != SIGFPE); -} - -int x = 1; -int y = 0; -int z; -int nan; - -int main () -{ - signal (SIGFPE, sigfpe_handler); -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) - signal (SIGTRAP, sigfpe_handler); -#endif -/* Linux/SPARC yields signal SIGILL. */ -#if defined (__sparc__) && defined (__linux__) - signal (SIGILL, sigfpe_handler); -#endif - - z = x / y; - nan = y / y; - exit (1); -} -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, - [ - # Guess based on the CPU. - case "$host_cpu" in - alpha* | i[34567]86 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac - ]) - ]) - case "$gt_cv_int_divbyzero_sigfpe" in - *yes) value=1;; - *) value=0;; - esac - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, - [Define if integer division by zero raises signal SIGFPE.]) -]) diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4 deleted file mode 100644 index af10170..0000000 --- a/m4/printf-posix.m4 +++ /dev/null @@ -1,44 +0,0 @@ -# printf-posix.m4 serial 2 (gettext-0.13.1) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether the printf() function supports POSIX/XSI format strings with -dnl positions. - -AC_DEFUN([gt_PRINTF_POSIX], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], - gt_cv_func_printf_posix, - [ - AC_TRY_RUN([ -#include -#include -/* The string "%2$d %1$d", with dollar characters protected from the shell's - dollar expansion (possibly an autoconf bug). */ -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -static char buf[100]; -int main () -{ - sprintf (buf, format, 33, 55); - return (strcmp (buf, "55 33") != 0); -}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, - [ - AC_EGREP_CPP(notposix, [ -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ - notposix -#endif - ], gt_cv_func_printf_posix="guessing no", - gt_cv_func_printf_posix="guessing yes") - ]) - ]) - case $gt_cv_func_printf_posix in - *yes) - AC_DEFINE(HAVE_POSIX_PRINTF, 1, - [Define if your printf() function supports format strings with positions.]) - ;; - esac -]) diff --git a/m4/signed.m4 b/m4/signed.m4 deleted file mode 100644 index 048f593..0000000 --- a/m4/signed.m4 +++ /dev/null @@ -1,17 +0,0 @@ -# signed.m4 serial 1 (gettext-0.10.40) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([bh_C_SIGNED], -[ - AC_CACHE_CHECK([for signed], bh_cv_c_signed, - [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) - if test $bh_cv_c_signed = no; then - AC_DEFINE(signed, , - [Define to empty if the C compiler doesn't support this keyword.]) - fi -]) diff --git a/m4/types.m4 b/m4/types.m4 deleted file mode 100644 index 5f219fb..0000000 --- a/m4/types.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl types.m4 -dnl macros for type checks not covered by autoconf - -dnl MUTT_C99_INTTYPES -dnl Brendan Cully -dnl -# MUTT_C99_INTTYPES -# Check for C99 integer type definitions, or define if missing -AC_DEFUN([MUTT_C99_INTTYPES], -[dnl -AC_CHECK_HEADERS([inttypes.h]) -AC_CHECK_TYPE([uint32_t], - [AC_DEFINE(HAVE_C99_INTTYPES, 1, [Define if you have the C99 integer types])], - [AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(int) - AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long)]) -AH_VERBATIM([X_HAVE_C99_INTTYPES], - [#ifndef HAVE_C99_INTTYPES -# if SIZEOF_SHORT == 4 -typedef unsigned short uint32_t; -# elif SIZEOF_INT == 4 -typedef unsigned int uint32_t; -# elif SIZEOF_LONG == 4 -typedef unsigned long uint32_t; -# endif -# if SIZEOF_INT == 8 -typedef unsigned int uint64_t; -# elif SIZEOF_LONG == 8 -typedef unsigned long uint64_t; -# elif SIZEOF_LONG_LONG == 8 -typedef unsigned long long uint64_t; -# endif -#endif - ]) -]) diff --git a/main.c b/main.c index 3d1e21c..eace540 100644 --- a/main.c +++ b/main.c @@ -403,11 +403,6 @@ static void show_version (void) #else "-HAVE_ICONV " #endif -#if ICONV_NONTRANS - "+ICONV_NONTRANS " -#else - "-ICONV_NONTRANS " -#endif #ifdef HAVE_LIBIDN "+HAVE_LIBIDN " #else diff --git a/sendlib.c b/sendlib.c index 63399e4..5f713b6 100644 --- a/sendlib.c +++ b/sendlib.c @@ -625,7 +625,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, ib = bufi; ob = bufu, obl = sizeof (bufu); n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl); - assert (n == -1 || !n || ICONV_NONTRANS); + assert (n == -1 || !n); if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) { assert (errno == EILSEQ ||