- use AM_GNU_GETTEXT without own buggy gettext detetection procedure,

- added ALL_LINGUAS,
- fixed AC_OUTPUT file list.

Changed files:
    freetype-autoconf.patch -> 1.1

diff --git a/freetype-autoconf.patch b/freetype-autoconf.patch
new file mode 100644 (file)
index 0000000..26b35f7
--- /dev/null
+++ b/freetype-autoconf.patch
@@ -0,0 +1,138 @@
+diff -Nru freetype-1.3.1/configure.in freetype-1.3.1.new/configure.in
+--- freetype-1.3.1/configure.in        Sun Jan 16 21:18:51 2000
++++ freetype-1.3.1.new/configure.in    Sun Jan 16 21:18:34 2000
+@@ -4,6 +4,8 @@
+ 
+ AC_INIT(lib/freetype.h)
+ 
++AM_INIT_AUTOMAKE(freetype, 1.3.1)
++
+ dnl Due to a bug in autoconf we must set $srcdir explicitly to an absolute
+ dnl path.
+ srcdir=`cd $srcdir; pwd`
+@@ -17,11 +19,6 @@
+ dnl libttf.so version
+ version_info='4:0:2'
+ 
+-AC_ARG_ENABLE(nls,
+-              [  --disable-nls           don't use NLS],
+-              USE_NLS=no, USE_NLS=yes)
+-AC_SUBST(USE_NLS)
+-
+ dnl Checks for system type.
+ AC_CANONICAL_SYSTEM
+ 
+@@ -57,100 +54,8 @@
+ AC_SUBST(freetype_version)
+ AC_SUBST(version_info)
+ 
+-dnl gettext support
+-if test "$USE_NLS" = "yes"; then
+-  AC_REQUIRE([AC_PROG_MAKE_SET])
+-  AC_CHECK_HEADERS(locale.h)
+-  AC_CHECK_FUNCS(setlocale)
+-  AC_SUBST(HAVE_LOCALE_H)  
+-
+-  ALL_LINGUAS="de fr cs nl es"
+-  AC_CHECK_HEADERS(libintl.h)
+-  AC_CHECK_LIB(intl,gettext)
+-  AC_SUBST(HAVE_LIBINTL_H)  
+-  AC_SUBST(HAVE_LIBINTL)
+-
+-  dnl Handle localedir
+-  LOCALEDIR='${prefix}/share/locale'
+-  AC_ARG_WITH(locale-dir,
+-  [  --with-locale-dir=DIR   Location of the locale file(s)
+-                          [PREFIX/share/locale]],[
+-    if test x$withval = xyes; then
+-      AC_MSG_WARN(Usage is: --with-locale-dir=basedir)
+-    else
+-      if test x$withval = xno; then
+-        AC_MSG_WARN(Usage is: --with-locale-dir=basedir)
+-      else
+-        LOCALEDIR=$withval
+-      fi
+-    fi
+-  ])
+-  AC_SUBST(LOCALEDIR)
+-
+-  AC_PATH_PROG(MSGFMT, msgfmt, $MSGFMT)
+-  if test -n "$MSGFMT"; then
+-    AC_CHECK_FUNCS(dcgettext)
+-    AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+-    AC_PATH_PROG(XGETTEXT, xgettext, $XGETTEXT)
+-    AC_PATH_PROG(MSGMERGE, msgmerge, $MSGMERGE)
+-
+-    dnl Test whether we really found GNU xgettext.
+-    if test -n "$XGETTEXT"; then
+-      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
+-
+-    dnl We add another test for comparing GNU xgettext with openwin xgettext
+-    if test -n "$XGETTEXT"; then
+-      if $XGETTEXT --help > /dev/null 2> /dev/null; then
+-        : ;
+-      else
+-        AC_MSG_RESULT(
+-          [found xgettext program is not GNU xgettext; ignore it])
+-        XGETTEXT=""
+-      fi
+-    fi
+-
+-    dnl Test whether we really found GNU msgfmt.
+-    if test -n "$MSGFMT"; then
+-      if $MSGFMT < /dev/null 2> /dev/null; then
+-        AC_MSG_RESULT(
+-          [found msgfmt program is not GNU msgfmt; NLS won't be installed])
+-        MSGFMT=""
+-      fi
+-    fi
+-
+-    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
+-
+-  if test -n "$ALL_LINGUAS"; then
+-    for lang in $ALL_LINGUAS; do
+-      CATALOGS="$CATALOGS $lang$CATOBJEXT"
+-    done
+-  fi
+-  AC_SUBST(CATALOGS)
+-  AC_SUBST(CATOBJEXT)
+-  AC_SUBST(INSTOBJEXT)
+-  AC_SUBST(DATADIRNAME)
+-fi
+-
+-dnl don't use NLS, when there is no gettext installed
+-if test x"$MSGFMT" = x; then
+-  USE_NLS=no
+-fi
+-
++ALL_LINGUAS="cs de es fr nl"
++AM_GNU_GETTEXT
+ 
+ AC_CHECK_PROG(RM, rm, rm)
+ AC_CHECK_PROG(RMDIR, rmdir, rmdir)
+@@ -194,8 +99,7 @@
+            MakeSub
+            lib/arch/unix/Makefile
+            test/arch/unix/Makefile 
+-           po/Makefile.in,
+-          [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+-
++           po/Makefile.in
++         intl/Makefile)
+ 
+ dnl end of configure.in