]>
Commit | Line | Data |
---|---|---|
117fda08 | 1 | diff -uNr gdm-2.2.5.4.orig/gui/acinclude.m4 gdm-2.2.5.4/gui/acinclude.m4 |
2 | --- gdm-2.2.5.4.orig/acinclude.m4 Thu Jan 1 01:00:00 1970 | |
3 | +++ gdm-2.2.5.4/acinclude.m4 Tue Dec 2 22:38:16 2003 | |
4 | @@ -0,0 +1,299 @@ | |
5 | +## xml-i18n-tools.m4 - Configure xml-i18n-tools for the target system. -*-Shell-script-*- | |
6 | +## Copyright (C) 2001 Eazel, Inc. | |
7 | +## Author: Maciej Stachowiak <mjs@noisehavoc.org> | |
8 | +## | |
9 | +## This program is free software; you can redistribute it and/or modify | |
10 | +## it under the terms of the GNU General Public License as published by | |
11 | +## the Free Software Foundation; either version 2 of the License, or | |
12 | +## (at your option) any later version. | |
13 | +## | |
14 | +## This program is distributed in the hope that it will be useful, but | |
15 | +## WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 | +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 | +## General Public License for more details. | |
18 | +## | |
19 | +## You should have received a copy of the GNU General Public License | |
20 | +## along with this program; if not, write to the Free Software | |
21 | +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
22 | +## | |
23 | +## As a special exception to the GNU General Public License, if you | |
24 | +## distribute this file as part of a program that contains a | |
25 | +## configuration script generated by Autoconf, you may include it under | |
26 | +## the same distribution terms that you use for the rest of that program. | |
27 | + | |
28 | +AC_DEFUN(XML_I18N_TOOLS_NEWER_THAN_0_9,[ true ]) | |
29 | + | |
30 | +dnl AC_PROG_XML_I18N_TOOLS([MINIMUM-VERSION [,"G2" if always using --utf8] ]) | |
31 | +# serial 1 AC_PROG_XML_I18N_TOOLS | |
32 | +AC_DEFUN(AC_PROG_XML_I18N_TOOLS, | |
33 | +[ | |
34 | + AC_DEFUN(X18T_PFORG1, dnl and -u for G2 | |
35 | + ifelse([$2],[G2],[ -u ], [ -p ])) | |
36 | + AC_DEFUN(X18T_XML_KIND, | |
37 | + ifelse([$2],[G2],[ -u ],[ $(XML_I18N_XML_KIND) ])) | |
38 | + AC_DEFUN(X18T_KEYS_KIND, | |
39 | + ifelse([$2],[G2],[ -u ],[ $(XML_I18N_KEYS_KIND) ])) | |
40 | + | |
41 | + XML_I18N_MERGE_DESKTOP_RULE='%.desktop: %.desktop.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d -u X18T_PFORG1' | |
42 | +XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d -u X18T_PFORG1' | |
43 | + XML_I18N_MERGE_KEYS_RULE='%.keys: %.keys.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -k X18T_KEYS_KIND' | |
44 | + XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -p' | |
45 | + XML_I18N_MERGE_PONG_RULE='%.pong: %.pong.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_PFORG1' | |
46 | + XML_I18N_MERGE_SERVER_RULE='%.server: %.server.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -u' | |
47 | + XML_I18N_MERGE_SHEET_RULE='%.sheet: %.sheet.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x -u' | |
48 | +XML_I18N_MERGE_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1' | |
49 | + XML_I18N_MERGE_XML_RULE='%.xml: %.xml.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_XML_KIND' | |
50 | + | |
51 | +AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE) | |
52 | +AC_SUBST(XML_I18N_MERGE_DIRECTORY_RULE) | |
53 | +AC_SUBST(XML_I18N_MERGE_KEYS_RULE) | |
54 | +AC_SUBST(XML_I18N_MERGE_OAF_RULE) | |
55 | +AC_SUBST(XML_I18N_MERGE_PONG_RULE) | |
56 | +AC_SUBST(XML_I18N_MERGE_SERVER_RULE) | |
57 | +AC_SUBST(XML_I18N_MERGE_SHEET_RULE) | |
58 | +AC_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE) | |
59 | +AC_SUBST(XML_I18N_MERGE_XML_RULE) | |
60 | + | |
61 | +# Use the tools built into the package, not the ones that are installed. | |
62 | + | |
63 | +XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract' | |
64 | +AC_SUBST(XML_I18N_EXTRACT)dnl | |
65 | + | |
66 | +XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge' | |
67 | +AC_SUBST(XML_I18N_MERGE)dnl | |
68 | + | |
69 | +XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update' | |
70 | +AC_SUBST(XML_I18N_UPDATE)dnl | |
71 | + | |
72 | +AC_PATH_PROG(INTLTOOL_PERL, perl) | |
73 | +if test -z "$INTLTOOL_PERL"; then | |
74 | + AC_MSG_ERROR([perl not found; required for xml-i18n-tools]) | |
75 | +fi | |
76 | +if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then | |
77 | + AC_MSG_ERROR([perl 5.x required for xml-i18n-tools]) | |
78 | +fi | |
79 | + | |
80 | +dnl Remove Intltool [] tags from po/POTFILES | |
81 | +dnl | |
82 | +ifdef([AC_DIVERSION_ICMDS],[ | |
83 | + AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) | |
84 | + changequote(,) | |
85 | + mv -f po/POTFILES po/POTFILES.tmp | |
86 | + sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES | |
87 | + rm -f po/POTFILES.tmp | |
88 | + changequote([,]) | |
89 | + AC_DIVERT_POP() | |
90 | +],[ | |
91 | + ifdef([AC_CONFIG_COMMANDS_PRE],[ | |
92 | + AC_CONFIG_COMMANDS_PRE([ | |
93 | + changequote(,) | |
94 | + mv -f po/POTFILES po/POTFILES.tmp | |
95 | + sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES | |
96 | + rm -f po/POTFILES.tmp | |
97 | + changequote([,]) | |
98 | + ]) | |
99 | + ]) | |
100 | +]) | |
101 | + | |
102 | +dnl manually sed perl in so people don't have to put the xml-i18n-tools scripts in their | |
103 | +dnl AC_OUTPUT | |
104 | +AC_OUTPUT_COMMANDS([ | |
105 | +sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-extract.in > xml-i18n-extract.out | |
106 | +if cmp -s xml-i18n-extract xml-i18n-extract.out 2>/dev/null; then | |
107 | + rm -f xml-i18n-extract.out | |
108 | +else | |
109 | + mv -f xml-i18n-extract.out xml-i18n-extract | |
110 | +fi | |
111 | +chmod ugo+x xml-i18n-extract | |
112 | +chmod u+w xml-i18n-extract | |
113 | + | |
114 | +sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-merge.in > xml-i18n-merge.out | |
115 | +if cmp -s xml-i18n-merge xml-i18n-merge.out 2>/dev/null; then | |
116 | + rm -f xml-i18n-merge.out | |
117 | +else | |
118 | + mv -f xml-i18n-merge.out xml-i18n-merge | |
119 | +fi | |
120 | +chmod ugo+x xml-i18n-merge | |
121 | +chmod u+w xml-i18n-merge | |
122 | + | |
123 | +sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-update.in > xml-i18n-update.out | |
124 | +if cmp -s xml-i18n-update xml-i18n-update.out 2>/dev/null; then | |
125 | + rm -f xml-i18n-update.out | |
126 | +else | |
127 | + mv -f xml-i18n-update.out xml-i18n-update | |
128 | +fi | |
129 | +chmod ugo+x xml-i18n-update | |
130 | +chmod u+w xml-i18n-update | |
131 | +], INTLTOOL_PERL=${INTLTOOL_PERL}) | |
132 | + | |
133 | +# Redirect the config.log output again, so that the ltconfig log is not | |
134 | +# clobbered by the next message. | |
135 | +exec 5>>./config.log | |
136 | +]) | |
137 | + | |
138 | +dnl old names | |
139 | +AC_DEFUN(AM_PROG_XML_I18N_TOOLS, [indir([AC_PROG_XML_I18N_TOOLS])])dnl | |
140 | +# Configure paths for ESD | |
141 | +# Manish Singh 98-9-30 | |
142 | +# stolen back from Frank Belew | |
143 | +# stolen from Manish Singh | |
144 | +# Shamelessly stolen from Owen Taylor | |
145 | + | |
146 | +dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | |
147 | +dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS | |
148 | +dnl | |
149 | +AC_DEFUN(AM_PATH_ESD, | |
150 | +[dnl | |
151 | +dnl Get the cflags and libraries from the esd-config script | |
152 | +dnl | |
153 | +AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], | |
154 | + esd_prefix="$withval", esd_prefix="") | |
155 | +AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], | |
156 | + esd_exec_prefix="$withval", esd_exec_prefix="") | |
157 | +AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], | |
158 | + , enable_esdtest=yes) | |
159 | + | |
160 | + if test x$esd_exec_prefix != x ; then | |
161 | + esd_args="$esd_args --exec-prefix=$esd_exec_prefix" | |
162 | + if test x${ESD_CONFIG+set} != xset ; then | |
163 | + ESD_CONFIG=$esd_exec_prefix/bin/esd-config | |
164 | + fi | |
165 | + fi | |
166 | + if test x$esd_prefix != x ; then | |
167 | + esd_args="$esd_args --prefix=$esd_prefix" | |
168 | + if test x${ESD_CONFIG+set} != xset ; then | |
169 | + ESD_CONFIG=$esd_prefix/bin/esd-config | |
170 | + fi | |
171 | + fi | |
172 | + | |
173 | + AC_PATH_PROG(ESD_CONFIG, esd-config, no) | |
174 | + min_esd_version=ifelse([$1], ,0.2.5,$1) | |
175 | + AC_MSG_CHECKING(for ESD - version >= $min_esd_version) | |
176 | + no_esd="" | |
177 | + if test "$ESD_CONFIG" = "no" ; then | |
178 | + no_esd=yes | |
179 | + else | |
180 | + ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` | |
181 | + ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` | |
182 | + | |
183 | + esd_major_version=`$ESD_CONFIG $esd_args --version | \ | |
184 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
185 | + esd_minor_version=`$ESD_CONFIG $esd_args --version | \ | |
186 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
187 | + esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ | |
188 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
189 | + if test "x$enable_esdtest" = "xyes" ; then | |
190 | + ac_save_CFLAGS="$CFLAGS" | |
191 | + ac_save_LIBS="$LIBS" | |
192 | + CFLAGS="$CFLAGS $ESD_CFLAGS" | |
193 | + LIBS="$LIBS $ESD_LIBS" | |
194 | +dnl | |
195 | +dnl Now check if the installed ESD is sufficiently new. (Also sanity | |
196 | +dnl checks the results of esd-config to some extent | |
197 | +dnl | |
198 | + rm -f conf.esdtest | |
199 | + AC_TRY_RUN([ | |
200 | +#include <stdio.h> | |
201 | +#include <stdlib.h> | |
202 | +#include <string.h> | |
203 | +#include <esd.h> | |
204 | + | |
205 | +char* | |
206 | +my_strdup (char *str) | |
207 | +{ | |
208 | + char *new_str; | |
209 | + | |
210 | + if (str) | |
211 | + { | |
212 | + new_str = malloc ((strlen (str) + 1) * sizeof(char)); | |
213 | + strcpy (new_str, str); | |
214 | + } | |
215 | + else | |
216 | + new_str = NULL; | |
217 | + | |
218 | + return new_str; | |
219 | +} | |
220 | + | |
221 | +int main () | |
222 | +{ | |
223 | + int major, minor, micro; | |
224 | + char *tmp_version; | |
225 | + | |
226 | + system ("touch conf.esdtest"); | |
227 | + | |
228 | + /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
229 | + tmp_version = my_strdup("$min_esd_version"); | |
230 | + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
231 | + printf("%s, bad version string\n", "$min_esd_version"); | |
232 | + exit(1); | |
233 | + } | |
234 | + | |
235 | + if (($esd_major_version > major) || | |
236 | + (($esd_major_version == major) && ($esd_minor_version > minor)) || | |
237 | + (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) | |
238 | + { | |
239 | + return 0; | |
240 | + } | |
241 | + else | |
242 | + { | |
243 | + printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); | |
244 | + printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); | |
245 | + printf("*** best to upgrade to the required version.\n"); | |
246 | + printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); | |
247 | + printf("*** to point to the correct copy of esd-config, and remove the file\n"); | |
248 | + printf("*** config.cache before re-running configure\n"); | |
249 | + return 1; | |
250 | + } | |
251 | +} | |
252 | + | |
253 | +],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
254 | + CFLAGS="$ac_save_CFLAGS" | |
255 | + LIBS="$ac_save_LIBS" | |
256 | + fi | |
257 | + fi | |
258 | + if test "x$no_esd" = x ; then | |
259 | + AC_MSG_RESULT(yes) | |
260 | + ifelse([$2], , :, [$2]) | |
261 | + else | |
262 | + AC_MSG_RESULT(no) | |
263 | + if test "$ESD_CONFIG" = "no" ; then | |
264 | + echo "*** The esd-config script installed by ESD could not be found" | |
265 | + echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" | |
266 | + echo "*** your path, or set the ESD_CONFIG environment variable to the" | |
267 | + echo "*** full path to esd-config." | |
268 | + else | |
269 | + if test -f conf.esdtest ; then | |
270 | + : | |
271 | + else | |
272 | + echo "*** Could not run ESD test program, checking why..." | |
273 | + CFLAGS="$CFLAGS $ESD_CFLAGS" | |
274 | + LIBS="$LIBS $ESD_LIBS" | |
275 | + AC_TRY_LINK([ | |
276 | +#include <stdio.h> | |
277 | +#include <esd.h> | |
278 | +], [ return 0; ], | |
279 | + [ echo "*** The test program compiled, but did not run. This usually means" | |
280 | + echo "*** that the run-time linker is not finding ESD or finding the wrong" | |
281 | + echo "*** version of ESD. If it is not finding ESD, you'll need to set your" | |
282 | + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | |
283 | + echo "*** to the installed location Also, make sure you have run ldconfig if that" | |
284 | + echo "*** is required on your system" | |
285 | + echo "***" | |
286 | + echo "*** If you have an old version installed, it is best to remove it, although" | |
287 | + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], | |
288 | + [ echo "*** The test program failed to compile or link. See the file config.log for the" | |
289 | + echo "*** exact error that occured. This usually means ESD was incorrectly installed" | |
290 | + echo "*** or that you have moved ESD since it was installed. In the latter case, you" | |
291 | + echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) | |
292 | + CFLAGS="$ac_save_CFLAGS" | |
293 | + LIBS="$ac_save_LIBS" | |
294 | + fi | |
295 | + fi | |
296 | + ESD_CFLAGS="" | |
297 | + ESD_LIBS="" | |
298 | + ifelse([$3], , :, [$3]) | |
299 | + fi | |
300 | + AC_SUBST(ESD_CFLAGS) | |
301 | + AC_SUBST(ESD_LIBS) | |
302 | + rm -f conf.esdtest | |
303 | +]) | |
304 | diff -ur gdm-2.2.5.4.orig/gui/gdmconfig.desktop.in gdm-2.2.5.4/gui/gdmconfig.desktop.in | |
305 | --- gdm-2.2.5.4.orig/gui/gdmconfig.desktop.in Thu May 3 22:22:22 2001 | |
306 | +++ gdm-2.2.5.4/gui/gdmconfig.desktop.in Fri Jan 2 15:19:42 2004 | |
307 | @@ -4,5 +4,7 @@ | |
308 | TryExec=gdmconfig | |
309 | Exec=gdmconfig | |
310 | Icon=gdm.xpm | |
311 | -Terminal=0 | |
312 | +Terminal=false | |
313 | Type=Application | |
314 | +Encoding=UTF-8 | |
315 | +# vi: encoding=utf-8 | |
316 | diff -ur gdm-2.2.5.4.orig/gui/gdmflexiserver-xnest.desktop.in gdm-2.2.5.4/gui/gdmflexiserver-xnest.desktop.in | |
317 | --- gdm-2.2.5.4.orig/gui/gdmflexiserver-xnest.desktop.in Sun Aug 19 03:15:09 2001 | |
318 | +++ gdm-2.2.5.4/gui/gdmflexiserver-xnest.desktop.in Fri Jan 2 15:19:37 2004 | |
319 | @@ -6,5 +6,7 @@ | |
320 | TryExec=Xnest | |
321 | Exec=gdmflexiserver --xnest | |
322 | Icon= | |
323 | -Terminal=0 | |
324 | +Terminal=false | |
325 | Type=Application | |
326 | +Encoding=UTF-8 | |
327 | +# vi: encoding=utf-8 | |
328 | diff -ur gdm-2.2.5.4.orig/gui/gdmflexiserver.desktop.in gdm-2.2.5.4/gui/gdmflexiserver.desktop.in | |
329 | --- gdm-2.2.5.4.orig/gui/gdmflexiserver.desktop.in Wed Aug 22 14:06:11 2001 | |
330 | +++ gdm-2.2.5.4/gui/gdmflexiserver.desktop.in Fri Jan 2 15:19:40 2004 | |
331 | @@ -3,5 +3,7 @@ | |
332 | _Comment=Log in as another user without loging out | |
333 | Exec=gdmflexiserver | |
334 | Icon= | |
335 | -Terminal=0 | |
336 | +Terminal=false | |
337 | Type=Application | |
338 | +Encoding=UTF-8 | |
339 | +# vi: encoding=utf-8 | |
340 | diff -ur gdm-2.2.5.4.orig/gui/gdmphotosetup.desktop.in gdm-2.2.5.4/gui/gdmphotosetup.desktop.in | |
341 | --- gdm-2.2.5.4.orig/gui/gdmphotosetup.desktop.in Fri May 18 00:43:06 2001 | |
342 | +++ gdm-2.2.5.4/gui/gdmphotosetup.desktop.in Fri Jan 2 15:19:43 2004 | |
343 | @@ -4,5 +4,7 @@ | |
344 | TryExec=gdmphotosetup | |
345 | Exec=gdmphotosetup | |
346 | Icon= | |
347 | -Terminal=0 | |
348 | +Terminal=false | |
349 | Type=Application | |
350 | +Encoding=UTF-8 | |
351 | +# vi: encoding=utf-8 |