]>
Commit | Line | Data |
---|---|---|
e3b55a33 AM |
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 | |
ec611159 | 4 | @@ -4,6 +4,8 @@ |
5 | ||
6 | AC_INIT(lib/freetype.h) | |
7 | ||
8 | +AM_INIT_AUTOMAKE(freetype, 1.3.1) | |
9 | + | |
10 | dnl Due to a bug in autoconf we must set $srcdir explicitly to an absolute | |
11 | dnl path. | |
12 | srcdir=`cd $srcdir; pwd` | |
13 | @@ -17,11 +19,6 @@ | |
14 | dnl libttf.so version | |
15 | version_info='4:0:2' | |
16 | ||
17 | -AC_ARG_ENABLE(nls, | |
18 | - [ --disable-nls don't use NLS], | |
19 | - USE_NLS=no, USE_NLS=yes) | |
20 | -AC_SUBST(USE_NLS) | |
21 | - | |
22 | dnl Checks for system type. | |
23 | AC_CANONICAL_SYSTEM | |
24 | ||
25 | @@ -57,100 +54,8 @@ | |
26 | AC_SUBST(freetype_version) | |
27 | AC_SUBST(version_info) | |
28 | ||
29 | -dnl gettext support | |
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) | |
35 | - | |
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) | |
41 | - | |
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) | |
49 | - else | |
50 | - if test x$withval = xno; then | |
51 | - AC_MSG_WARN(Usage is: --with-locale-dir=basedir) | |
52 | - else | |
53 | - LOCALEDIR=$withval | |
54 | - fi | |
55 | - fi | |
56 | - ]) | |
57 | - AC_SUBST(LOCALEDIR) | |
58 | - | |
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) | |
65 | - | |
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 | |
69 | - : ; | |
70 | - else | |
71 | - AC_MSG_RESULT( | |
72 | - [found xgettext program is not GNU xgettext; ignore it]) | |
73 | - XGETTEXT="" | |
74 | - fi | |
75 | - fi | |
76 | - | |
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 | |
80 | - : ; | |
81 | - else | |
82 | - AC_MSG_RESULT( | |
83 | - [found xgettext program is not GNU xgettext; ignore it]) | |
84 | - XGETTEXT="" | |
85 | - fi | |
86 | - fi | |
87 | - | |
88 | - dnl Test whether we really found GNU msgfmt. | |
89 | - if test -n "$MSGFMT"; then | |
90 | - if $MSGFMT < /dev/null 2> /dev/null; then | |
91 | - AC_MSG_RESULT( | |
92 | - [found msgfmt program is not GNU msgfmt; NLS won't be installed]) | |
93 | - MSGFMT="" | |
94 | - fi | |
95 | - fi | |
96 | - | |
97 | - AC_TRY_LINK(, | |
98 | - [extern int _nl_msg_cat_cntr; | |
99 | - return _nl_msg_cat_cntr], | |
100 | - [CATOBJEXT=.gmo | |
101 | - DATADIRNAME=share], | |
102 | - [CATOBJEXT=.mo | |
103 | - DATADIRNAME=lib]) | |
104 | - INSTOBJEXT=.mo | |
105 | - fi | |
106 | - | |
107 | - if test -n "$ALL_LINGUAS"; then | |
108 | - for lang in $ALL_LINGUAS; do | |
109 | - CATALOGS="$CATALOGS $lang$CATOBJEXT" | |
110 | - done | |
111 | - fi | |
112 | - AC_SUBST(CATALOGS) | |
113 | - AC_SUBST(CATOBJEXT) | |
114 | - AC_SUBST(INSTOBJEXT) | |
115 | - AC_SUBST(DATADIRNAME) | |
116 | -fi | |
117 | - | |
118 | -dnl don't use NLS, when there is no gettext installed | |
119 | -if test x"$MSGFMT" = x; then | |
120 | - USE_NLS=no | |
121 | -fi | |
122 | - | |
123 | +ALL_LINGUAS="cs de es fr nl" | |
124 | +AM_GNU_GETTEXT | |
125 | ||
126 | AC_CHECK_PROG(RM, rm, rm) | |
127 | AC_CHECK_PROG(RMDIR, rmdir, rmdir) | |
128 | @@ -194,8 +99,7 @@ | |
129 | MakeSub | |
130 | lib/arch/unix/Makefile | |
131 | test/arch/unix/Makefile | |
132 | - po/Makefile.in, | |
133 | - [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) | |
134 | - | |
135 | + po/Makefile.in | |
136 | + intl/Makefile) | |
137 | ||
138 | dnl end of configure.in | |
e3b55a33 AM |
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 | |
142 | @@ -132,7 +132,7 @@ | |
143 | FT_LIBS = @LIBS@ | |
144 | ||
145 | # i18n stuff | |
146 | -LOCALEDIR = @LOCALEDIR@ | |
147 | +LOCALEDIR = @datadir@/locale | |
148 | ||
149 | ||
150 | all: do_link |