diff -urN freetype-1.3.1.org/configure.in freetype-1.3.1/configure.in --- freetype-1.3.1.org/configure.in 1999-09-03 15:09:55.000000000 +0200 +++ freetype-1.3.1/configure.in 2023-12-03 15:53:38.966698165 +0100 @@ -2,14 +2,16 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT(lib/freetype.h) +AC_INIT([freetype],[1.3.1]) + +AM_INIT_AUTOMAKE dnl Due to a bug in autoconf we must set $srcdir explicitly to an absolute dnl path. srcdir=`cd $srcdir; pwd` -AM_DISABLE_STATIC -AM_PROG_LIBTOOL +AC_DISABLE_STATIC([]) +LT_INIT dnl FreeType version freetype_version='1.2.0' @@ -17,14 +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 - dnl Checks for programs. AC_PROG_CC AC_PROG_CPP @@ -44,6 +38,7 @@ esac fi AC_SUBST(XX_CFLAGS) +AC_SUBST(LDFLAGS) dnl at least Digital UNIX 4.0d needs this due to a strange make program @@ -57,100 +52,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([external]) AC_CHECK_PROG(RM, rm, rm) AC_CHECK_PROG(RMDIR, rmdir, rmdir) @@ -184,18 +87,18 @@ AC_CHECK_FUNCS(memcpy memmove) -AC_CONFIG_HEADER(ft_conf.h) +AC_CONFIG_HEADERS([ft_conf.h]) dnl Another bug: to make --srcdir work correctly we have to create the dnl directory hierarchy first since autoconf only uses mkdir. $srcdir/mkinstalldirs lib/arch/unix test/arch/unix -AC_OUTPUT(Makefile +AC_CONFIG_FILES([Makefile 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 + ]) +AC_OUTPUT dnl end of configure.in diff -urN freetype-1.3.1.org/contrib/ttf2bdf/configure.in freetype-1.3.1/contrib/ttf2bdf/configure.in --- freetype-1.3.1.org/contrib/ttf2bdf/configure.in 1998-01-14 22:45:26.000000000 +0100 +++ freetype-1.3.1/contrib/ttf2bdf/configure.in 2023-12-03 17:03:19.985312018 +0100 @@ -1,7 +1,8 @@ dnl $Id: configure.in,v 1.1 1998/01/14 21:45:26 mleisher Exp $ dnl Process this file with autoconf to produce a configure script. -AC_INIT(../../lib/freetype.h) +AC_INIT +AC_CONFIG_SRCDIR([../../lib/freetype.h]) AC_PROG_CC @@ -31,10 +32,13 @@ AC_CHECK_PROG(RM, rm, rm) dnl Checks for header files. -AC_HEADER_STDC +AC_CHECK_INCLUDES_DEFAULT +AC_PROG_EGREP + AC_CHECK_HEADERS(unistd.h) dnl Checks for library functions. AC_FUNC_MEMCMP -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff -urN freetype-1.3.1.org/contrib/ttf2pfb/configure.in freetype-1.3.1/contrib/ttf2pfb/configure.in --- freetype-1.3.1.org/contrib/ttf2pfb/configure.in 1999-03-02 18:34:16.000000000 +0100 +++ freetype-1.3.1/contrib/ttf2pfb/configure.in 2023-12-03 17:03:29.788431544 +0100 @@ -1,8 +1,9 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(../../lib/freetype.h) +AC_INIT +AC_CONFIG_SRCDIR([../../lib/freetype.h]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AC_PROG_CC AC_PROG_CPP @@ -37,9 +38,12 @@ AC_STRUCT_TM dnl Checks for header files. -AC_HEADER_STDC +AC_CHECK_INCLUDES_DEFAULT +AC_PROG_EGREP + AC_CHECK_HEADERS(unistd.h) -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT dnl end of configure.in diff -urN freetype-1.3.1.org/contrib/ttf2pk/configure.in freetype-1.3.1/contrib/ttf2pk/configure.in --- freetype-1.3.1.org/contrib/ttf2pk/configure.in 1999-06-10 23:51:36.000000000 +0200 +++ freetype-1.3.1/contrib/ttf2pk/configure.in 2023-12-03 17:01:47.867188847 +0100 @@ -5,9 +5,10 @@ dnl Some tests are omitted since we assume that you've built the dnl FreeType library successfully. -AC_INIT(../../lib/freetype.h) +AC_INIT +AC_CONFIG_SRCDIR([../../lib/freetype.h]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AC_PROG_CC AC_PROG_CPP @@ -82,6 +83,7 @@ ]) fi -AC_OUTPUT(Makefile MakeSub) +AC_CONFIG_FILES([Makefile MakeSub]) +AC_OUTPUT dnl end of configure.in diff -urN freetype-1.3.1.org/contrib/ttfbanner/configure.in freetype-1.3.1/contrib/ttfbanner/configure.in --- freetype-1.3.1.org/contrib/ttfbanner/configure.in 1998-12-30 18:54:37.000000000 +0100 +++ freetype-1.3.1/contrib/ttfbanner/configure.in 2023-12-03 16:59:03.894189572 +0100 @@ -1,8 +1,9 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(../../lib/freetype.h) +AC_INIT +AC_CONFIG_SRCDIR([../../lib/freetype.h]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AC_PROG_CC AC_PROG_CPP @@ -33,6 +34,7 @@ AC_CHECK_PROG(RM, rm, rm) AC_PROG_INSTALL -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT dnl end of configure.in diff -urN freetype-1.3.1.org/lib/arch/unix/Makefile.in freetype-1.3.1/lib/arch/unix/Makefile.in --- freetype-1.3.1.org/lib/arch/unix/Makefile.in 2023-12-03 15:58:46.892394657 +0100 +++ freetype-1.3.1/lib/arch/unix/Makefile.in 2023-12-03 15:59:03.767597237 +0100 @@ -132,7 +132,7 @@ FT_LIBS = @LIBS@ # i18n stuff -LOCALEDIR = @LOCALEDIR@ +LOCALEDIR = @datadir@/locale all: do_link