Commit 20bd486b authored by Thomas Roessler's avatar Thomas Roessler

Properly handle character set definition file installation.

parent 40decabc
This file is an incredibly cheap hack around a bug in automake.
Just leave it alone, it merely needs to exist. *sigh*
tlr, Tue, 19 Jan 1999 23:45:08 +0100
......@@ -56,6 +56,7 @@ to ``configure'' to help it out, or change the default behavior:
--with-sharedir=DIR
specify where to put architecture independent data files
--with-curses=DIR
use the curses lib in DIR/lib. If you have ncurses, ``configure''
will automatically look in /usr/include/ncurses for the include
......@@ -153,6 +154,26 @@ run the ``configure'' script again.
Please note that "VPATH" builds currently do _not_ work.
Character set support
=====================
Mutt has extensive support for doing character set conversions. To
use this, you'll need the proper character set definition files.
If these files are already installed on your system (glibc 2.0
includes them), you can tell the configure script this by using the
--with-charmaps option. As an argument, it takes the directory in
which the character set definition files have been installed. By
default, configure looks into /usr/share/i18n/charmaps.
If these files are not present on your system, you can download a
charmaps tar-ball from the same place from which you got mutt (e.g.,
ftp.guug.de/pub/mutt/). Unpack it under the mutt toplevel source
directory, and re-configure mutt. configure will detect this; the
character set definition files should be automatically installed in
the proper place.
Platform Notes
==============
......
......@@ -54,7 +54,7 @@ ACLOCAL_AMFLAGS = -I m4
LDADD = @LIBOBJS@ @INTLLIBS@
SUBDIRS = doc intl m4 po contrib
SUBDIRS = m4 po intl doc $(ADD_SUBDIRS)
OPS=@OPS@
......
......@@ -140,3 +140,6 @@
/* Where's mixmaster located? */
#undef MIXMASTER
/* Where are the character set definitions located? */
#undef CHARMAPS_DIR
......@@ -36,11 +36,6 @@
#include "mutt.h"
#include "charset.h"
/* Where are character set definition files located? */
#define CHARMAPS_DIR "/usr/share/i18n/charmaps"
/* Define this if you want any dprint () statements in this code */
#undef CHARSET_DEBUG
......
......@@ -360,6 +360,31 @@ AC_ARG_WITH(sharedir, [ --with-sharedir=PATH specify where to put arch in
sharedir=$mutt_cv_sharedir
AC_SUBST(sharedir)
mutt_cv_charmaps=/usr/share/i18n/charmaps
AC_ARG_WITH(charmaps, [--with-charmaps=PATH specify where on the system mutt can find character set definitions],
[mutt_cv_charmaps=$withval])
AC_MSG_CHECKING(whether character set definitions on your system are usable)
if test ! -f $mutt_cv_charmaps/ISO_10646 ; then
AC_MSG_RESULT(no)
mutt_cv_charmaps=$mutt_cv_sharedir/charmaps
echo "Mutt will expect character map definitions under $mutt_cv_charmaps." >&AC_FD_MSG
if test -d $srcdir/charmaps ; then
echo "We will install the included character set definitions." >&AC_FD_MSG
mutt_cv_add_subdirs="charmaps"
else
mutt_cv_add_subdirs=""
echo "If you want character set support, read INSTALL".
fi
else
AC_MSG_RESULT(yes)
fi
AC_DEFINE_UNQUOTED(CHARMAPS_DIR, "$mutt_cv_charmaps")
charmaps=$mutt_cv_charmaps
AC_SUBST(charmaps)
AC_ARG_WITH(docdir, [ --with-docdir=PATH specify where to put the documentation],
[mutt_cv_docdir=$withval],
[ AC_CACHE_CHECK(where to put the documentation,
......@@ -454,6 +479,9 @@ AC_ARG_ENABLE(exact-address, [ --enable-exact-address enable regeneration o
AC_SUBST(MUTT_LIB_OBJECTS)
ADD_SUBDIRS="$mutt_cv_add_subdirs"
AC_SUBST(ADD_SUBDIRS)
MUTT_AM_GNU_GETTEXT
CPPFLAGS="$CPPFLAGS -I\$(srcdir)/intl"
......@@ -461,4 +489,13 @@ MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
AC_SUBST(MUTTLOCALEDIR)
AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR")
AC_OUTPUT(Makefile intl/Makefile m4/Makefile po/Makefile.in Muttrc doc/Makefile doc/manual.sgml doc/dotlock.man doc/mutt.man charsets/Makefile contrib/Makefile)
output="Makefile intl/Makefile m4/Makefile po/Makefile.in Muttrc \
doc/Makefile doc/manual.sgml doc/dotlock.man doc/mutt.man \
contrib/Makefile"
if test -d $srcdir/charmaps ; then
output="$output charmaps/Makefile"
fi
AC_OUTPUT($output)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment