--- /dev/null
+diff -Nur mutt-1.2.5.orig/acinclude.m4 mutt-1.2.5/acinclude.m4
+--- mutt-1.2.5.orig/acinclude.m4 Thu Jan 1 01:00:00 1970
++++ mutt-1.2.5/acinclude.m4 Sat Mar 10 15:31:34 2001
+@@ -0,0 +1,457 @@
++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 ---------------------------------------------------------------------------
++
++# Macro to add for using GNU gettext.
++# Ulrich Drepper <drepper@cygnus.com>, 1995.
++
++#
++# Slightly modified by Thomas Roessler <roessler@guug.de>
++#
++
++#
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU Public License
++# but which still want to provide support for the GNU gettext functionality.
++# Please note that the actual code is *not* freely available.
++
++# serial 105
++
++AC_DEFUN(MUTT_AM_WITH_NLS,
++ [AC_MSG_CHECKING([whether NLS is requested])
++ dnl Default is enabled NLS
++ AC_ARG_ENABLE(nls,
++ [ --disable-nls do not use Native Language Support],
++ USE_NLS=$enableval, USE_NLS=yes)
++ AC_MSG_RESULT($USE_NLS)
++ AC_SUBST(USE_NLS)
++
++ USE_INCLUDED_LIBINTL=no
++
++ dnl If we use NLS figure out what method
++ if test "$USE_NLS" = "yes"; then
++ AC_DEFINE(ENABLE_NLS)
++ AC_MSG_CHECKING([whether included gettext is requested])
++ AC_ARG_WITH(included-gettext,
++ [ --with-included-gettext use the GNU gettext library included here],
++ nls_cv_force_use_gnu_gettext=$withval,
++ nls_cv_force_use_gnu_gettext=no)
++ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
++
++ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
++ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
++ dnl User does not insist on using GNU NLS library. Figure out what
++ dnl to use. If gettext or catgets are available (in this order) we
++ dnl use this. Else we have to fall back to GNU NLS library.
++ dnl catgets is only used if permitted by option --with-catgets.
++ nls_cv_header_intl=
++ nls_cv_header_libgt=
++ CATOBJEXT=NONE
++
++ AC_CHECK_HEADER(libintl.h,
++ [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
++ [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
++ gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
++
++ if test "$gt_cv_func_gettext_libc" != "yes"; then
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, gettext,
++ gt_cv_func_gettext_libintl=yes,
++ gt_cv_func_gettext_libintl=no)])
++ fi
++
++ if test "$gt_cv_func_gettext_libintl" = yes; then
++ LIBS="$LIBS -lintl"
++ fi
++
++ if test "$gt_cv_func_gettext_libc" = "yes" \
++ || test "$gt_cv_func_gettext_libintl" = "yes"; then
++ AC_DEFINE(HAVE_GETTEXT)
++ MUTT_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
++ if test "$MSGFMT" != "no"; then
++ AC_CHECK_FUNCS(dcgettext)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ MUTT_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr],
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [CATOBJEXT=.mo
++ DATADIRNAME=lib])
++ INSTOBJEXT=.mo
++ fi
++ fi
++ ])
++
++ if test "$CATOBJEXT" = "NONE"; then
++ AC_MSG_CHECKING([whether catgets can be used])
++ AC_ARG_WITH(catgets,
++ [ --with-catgets use catgets functions if available],
++ nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
++ AC_MSG_RESULT($nls_cv_use_catgets)
++
++ if test "$nls_cv_use_catgets" = "yes"; then
++ dnl No gettext in C library. Try catgets next.
++ AC_CHECK_LIB(i, main)
++ AC_CHECK_FUNC(catgets,
++ [AC_DEFINE(HAVE_CATGETS)
++ INTLOBJS="\$(CATOBJS)"
++ AC_PATH_PROG(GENCAT, gencat, no)dnl
++ if test "$GENCAT" != "no"; then
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
++ if test "$GMSGFMT" = "no"; then
++ MUTT_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
++ fi
++ MUTT_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++ USE_INCLUDED_LIBINTL=yes
++ CATOBJEXT=.cat
++ INSTOBJEXT=.cat
++ DATADIRNAME=lib
++ INTLDEPS='$(top_builddir)/intl/libintl.a'
++ INTLLIBS=$INTLDEPS
++ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++ nls_cv_header_intl=intl/libintl.h
++ nls_cv_header_libgt=intl/libgettext.h
++ fi])
++ fi
++ fi
++
++ if test "$CATOBJEXT" = "NONE"; then
++ dnl Neither gettext nor catgets in included in the C library.
++ dnl Fall back on GNU gettext library.
++ nls_cv_use_gnu_gettext=yes
++ fi
++ fi
++
++ if test "$nls_cv_use_gnu_gettext" = "yes"; then
++ dnl Mark actions used to generate GNU NLS library.
++ INTLOBJS="\$(GETTOBJS)"
++ MUTT_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ MUTT_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++ AC_SUBST(MSGFMT)
++ USE_INCLUDED_LIBINTL=yes
++ CATOBJEXT=.gmo
++ INSTOBJEXT=.mo
++ DATADIRNAME=share
++ INTLDEPS='$(top_builddir)/intl/libintl.a'
++ INTLLIBS=$INTLDEPS
++ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++ nls_cv_header_intl=intl/libintl.h
++ nls_cv_header_libgt=intl/libgettext.h
++ fi
++
++ dnl Test whether we really found GNU xgettext.
++ if test "$XGETTEXT" != ":"; then
++ dnl If it is no GNU xgettext we define it as : so that the
++ dnl Makefiles still can work.
++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++ : ;
++ else
++ AC_MSG_RESULT(
++ [found xgettext program is not GNU xgettext; ignore it])
++ XGETTEXT=":"
++ fi
++ fi
++
++ # We need to process the po/ directory.
++ POSUB=po
++ else
++ DATADIRNAME=share
++ nls_cv_header_intl=intl/libintl.h
++ nls_cv_header_libgt=intl/libgettext.h
++ fi
++ if test -z "$nsl_cv_header_intl"; then
++ # Clean out junk possibly left behind by a previous configuration.
++ rm -f intl/libintl.h
++ fi
++ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
++ AC_OUTPUT_COMMANDS(
++ [case "$CONFIG_FILES" in *po/Makefile.in*)
++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
++ esac])
++
++
++ # If this is used in GNU gettext we have to set USE_NLS to `yes'
++ # because some of the sources are only built for this goal.
++ if test "$PACKAGE" = gettext; then
++ USE_NLS=yes
++ USE_INCLUDED_LIBINTL=yes
++ fi
++
++ dnl These rules are solely for the distribution goal. While doing this
++ dnl we only have to keep exactly one list of the available catalogs
++ dnl in configure.in.
++ for lang in $ALL_LINGUAS; do
++ GMOFILES="$GMOFILES $lang.gmo"
++ POFILES="$POFILES $lang.po"
++ done
++
++ dnl Make all variables we use known to autoconf.
++ AC_SUBST(USE_INCLUDED_LIBINTL)
++ AC_SUBST(CATALOGS)
++ AC_SUBST(CATOBJEXT)
++ AC_SUBST(DATADIRNAME)
++ AC_SUBST(GMOFILES)
++ AC_SUBST(INSTOBJEXT)
++ AC_SUBST(INTLDEPS)
++ AC_SUBST(INTLLIBS)
++ AC_SUBST(INTLOBJS)
++ AC_SUBST(POFILES)
++ AC_SUBST(POSUB)
++ ])
++
++AC_DEFUN(MUTT_AM_GNU_GETTEXT,
++ [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++ AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_PROG_RANLIB])dnl
++ AC_REQUIRE([AC_ISC_POSIX])dnl
++ AC_REQUIRE([AC_HEADER_STDC])dnl
++ AC_REQUIRE([AC_C_CONST])dnl
++ AC_REQUIRE([AC_C_INLINE])dnl
++ AC_REQUIRE([AC_TYPE_OFF_T])dnl
++ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
++ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
++ AC_REQUIRE([AC_FUNC_MMAP])dnl
++
++ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
++unistd.h sys/param.h])
++ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
++strdup __argz_count __argz_stringify __argz_next])
++
++ if test "${ac_cv_func_stpcpy+set}" != "set"; then
++ AC_CHECK_FUNCS(stpcpy)
++ fi
++ if test "${ac_cv_func_stpcpy}" = "yes"; then
++ AC_DEFINE(HAVE_STPCPY)
++ fi
++
++ MUTT_AM_LC_MESSAGES
++ MUTT_AM_WITH_NLS
++
++ if test "x$CATOBJEXT" != "x"; then
++ if test "x$ALL_LINGUAS" = "x"; then
++ LINGUAS=
++ else
++ AC_MSG_CHECKING(for catalogs to be installed)
++ NEW_LINGUAS=
++ for lang in ${LINGUAS=$ALL_LINGUAS}; do
++ case "$ALL_LINGUAS" in
++ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
++ esac
++ done
++ LINGUAS=$NEW_LINGUAS
++ AC_MSG_RESULT($LINGUAS)
++ fi
++
++ dnl Construct list of names of catalog files to be constructed.
++ if test -n "$LINGUAS"; then
++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
++ fi
++ fi
++
++ dnl The reference to <locale.h> in the installed <libintl.h> file
++ dnl must be resolved because we cannot expect the users of this
++ dnl to define HAVE_LOCALE_H.
++ if test $ac_cv_header_locale_h = yes; then
++ INCLUDE_LOCALE_H="#include <locale.h>"
++ else
++ INCLUDE_LOCALE_H="\
++/* The system does not provide the header <locale.h>. Take care yourself. */"
++ fi
++ AC_SUBST(INCLUDE_LOCALE_H)
++
++ dnl Determine which catalog format we have (if any is needed)
++ dnl For now we know about two different formats:
++ dnl Linux libc-5 and the normal X/Open format
++ test -d intl || mkdir intl
++ if test "$CATOBJEXT" = ".cat"; then
++ AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
++
++ dnl Transform the SED scripts while copying because some dumb SEDs
++ dnl cannot handle comments.
++ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
++ fi
++ dnl po2tbl.sed is always needed.
++ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
++ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
++
++ dnl In the intl/Makefile.in we have a special dependency which makes
++ dnl only sense for gettext. We comment this out for non-gettext
++ dnl packages.
++ if test "$PACKAGE" = "gettext"; then
++ GT_NO="#NO#"
++ GT_YES=
++ else
++ GT_NO=
++ GT_YES="#YES#"
++ fi
++ AC_SUBST(GT_NO)
++ AC_SUBST(GT_YES)
++
++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
++ dnl Try to locate is.
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++ AC_SUBST(MKINSTALLDIRS)
++
++ dnl *** For now the libtool support in intl/Makefile is not for real.
++ l=
++ AC_SUBST(l)
++
++ dnl Generate list of files to be processed by xgettext which will
++ dnl be included in po/Makefile.
++ test -d po || mkdir po
++ if test "x$srcdir" != "x."; then
++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++ posrcprefix="$srcdir/"
++ else
++ posrcprefix="../$srcdir/"
++ fi
++ else
++ posrcprefix="../"
++ fi
++ rm -f po/POTFILES
++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++ < $srcdir/po/POTFILES.in > po/POTFILES
++ ])
++
++# Search path for a program which passes the given test.
++# Ulrich Drepper <drepper@cygnus.com>, 1996.
++#
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU Public License
++# but which still want to provide support for the GNU gettext functionality.
++# Please note that the actual code is *not* freely available.
++
++# serial 1
++
++dnl MUTT_AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++AC_DEFUN(MUTT_AM_PATH_PROG_WITH_TEST,
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++ /*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in ifelse([$5], , $PATH, [$5]); do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if [$3]; then
++ ac_cv_path_$1="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++dnl If no 4th arg is given, leave the cache variable unset,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++ ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test -n "[$]$1"; then
++ AC_MSG_RESULT([$]$1)
++else
++ AC_MSG_RESULT(no)
++fi
++AC_SUBST($1)dnl
++])
++
++# Check whether LC_MESSAGES is available in <locale.h>.
++# Ulrich Drepper <drepper@cygnus.com>, 1995.
++#
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU Public License
++# but which still want to provide support for the GNU gettext functionality.
++# Please note that the actual code is *not* freely available.
++
++# serial 1
++
++AC_DEFUN(MUTT_AM_LC_MESSAGES,
++ [if test $ac_cv_header_locale_h = yes; then
++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
++ if test $am_cv_val_LC_MESSAGES = yes; then
++ AC_DEFINE(HAVE_LC_MESSAGES)
++ fi
++ fi])
++
projects / packages / mutt.git / commitdiff