1 diff -urN freetype-1.3.1.org/configure.in freetype-1.3.1/configure.in
2 --- freetype-1.3.1.org/configure.in Fri Apr 12 13:38:29 2002
3 +++ freetype-1.3.1/configure.in Fri Apr 12 13:38:43 2002
6 AC_INIT(lib/freetype.h)
8 +AM_INIT_AUTOMAKE(freetype, 1.3.1)
10 dnl Due to a bug in autoconf we must set $srcdir explicitly to an absolute
12 srcdir=`cd $srcdir; pwd`
18 - [ --disable-nls don't use NLS],
19 - USE_NLS=no, USE_NLS=yes)
22 dnl Checks for system type.
26 AC_SUBST(freetype_version)
27 AC_SUBST(version_info)
30 -if test "$USE_NLS" = "yes"; then
31 - AC_REQUIRE([AC_PROG_MAKE_SET])
32 - AC_CHECK_HEADERS(locale.h)
33 - AC_CHECK_FUNCS(setlocale)
34 - AC_SUBST(HAVE_LOCALE_H)
36 - ALL_LINGUAS="de fr cs nl es"
37 - AC_CHECK_HEADERS(libintl.h)
38 - AC_CHECK_LIB(intl,gettext)
39 - AC_SUBST(HAVE_LIBINTL_H)
40 - AC_SUBST(HAVE_LIBINTL)
42 - dnl Handle localedir
43 - LOCALEDIR='${prefix}/share/locale'
44 - AC_ARG_WITH(locale-dir,
45 - [ --with-locale-dir=DIR Location of the locale file(s)
46 - [PREFIX/share/locale]],[
47 - if test x$withval = xyes; then
48 - AC_MSG_WARN(Usage is: --with-locale-dir=basedir)
50 - if test x$withval = xno; then
51 - AC_MSG_WARN(Usage is: --with-locale-dir=basedir)
59 - AC_PATH_PROG(MSGFMT, msgfmt, $MSGFMT)
60 - if test -n "$MSGFMT"; then
61 - AC_CHECK_FUNCS(dcgettext)
62 - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
63 - AC_PATH_PROG(XGETTEXT, xgettext, $XGETTEXT)
64 - AC_PATH_PROG(MSGMERGE, msgmerge, $MSGMERGE)
66 - dnl Test whether we really found GNU xgettext.
67 - if test -n "$XGETTEXT"; then
68 - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
72 - [found xgettext program is not GNU xgettext; ignore it])
77 - dnl We add another test for comparing GNU xgettext with openwin xgettext
78 - if test -n "$XGETTEXT"; then
79 - if $XGETTEXT --help > /dev/null 2> /dev/null; then
83 - [found xgettext program is not GNU xgettext; ignore it])
88 - dnl Test whether we really found GNU msgfmt.
89 - if test -n "$MSGFMT"; then
90 - if $MSGFMT < /dev/null 2> /dev/null; then
92 - [found msgfmt program is not GNU msgfmt; NLS won't be installed])
98 - [extern int _nl_msg_cat_cntr;
99 - return _nl_msg_cat_cntr],
101 - DATADIRNAME=share],
107 - if test -n "$ALL_LINGUAS"; then
108 - for lang in $ALL_LINGUAS; do
109 - CATALOGS="$CATALOGS $lang$CATOBJEXT"
113 - AC_SUBST(CATOBJEXT)
114 - AC_SUBST(INSTOBJEXT)
115 - AC_SUBST(DATADIRNAME)
118 -dnl don't use NLS, when there is no gettext installed
119 -if test x"$MSGFMT" = x; then
123 +ALL_LINGUAS="cs de es fr nl"
126 AC_CHECK_PROG(RM, rm, rm)
127 AC_CHECK_PROG(RMDIR, rmdir, rmdir)
130 lib/arch/unix/Makefile
131 test/arch/unix/Makefile
133 - [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
138 dnl end of configure.in
139 diff -urN freetype-1.3.1.org/lib/arch/unix/Makefile.in freetype-1.3.1/lib/arch/unix/Makefile.in
140 --- freetype-1.3.1.org/lib/arch/unix/Makefile.in Fri Apr 12 13:38:30 2002
141 +++ freetype-1.3.1/lib/arch/unix/Makefile.in Fri Apr 12 13:42:10 2002
146 -LOCALEDIR = @LOCALEDIR@
147 +LOCALEDIR = @datadir@/locale