| blob | 32c3fd298484225ef9bd0e3c664cef20f9bc8291 |
1 --- /dev/null
2 +++ lxpanel-0.5.6/mkinstalldirs
3 @@ -0,0 +1,162 @@
4 +#! /bin/sh
5 +# mkinstalldirs --- make directory hierarchy
6 +
7 +scriptversion=2009-04-28.21; # UTC
8 +
9 +# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
10 +# Created: 1993-05-16
11 +# Public domain.
12 +#
13 +# This file is maintained in Automake, please report
14 +# bugs to <bug-automake@gnu.org> or send patches to
15 +# <automake-patches@gnu.org>.
16 +
17 +nl='
18 +'
19 +IFS=" "" $nl"
20 +errstatus=0
21 +dirmode=
22 +
23 +usage="\
24 +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
25 +
26 +Create each directory DIR (with mode MODE, if specified), including all
27 +leading file name components.
28 +
29 +Report bugs to <bug-automake@gnu.org>."
30 +
31 +# process command line arguments
32 +while test $# -gt 0 ; do
33 + case $1 in
34 + -h | --help | --h*) # -h for help
35 + echo "$usage"
36 + exit $?
37 + ;;
38 + -m) # -m PERM arg
39 + shift
40 + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
41 + dirmode=$1
42 + shift
43 + ;;
44 + --version)
45 + echo "$0 $scriptversion"
46 + exit $?
47 + ;;
48 + --) # stop option processing
49 + shift
50 + break
51 + ;;
52 + -*) # unknown option
53 + echo "$usage" 1>&2
54 + exit 1
55 + ;;
56 + *) # first non-opt arg
57 + break
58 + ;;
59 + esac
60 +done
61 +
62 +for file
63 +do
64 + if test -d "$file"; then
65 + shift
66 + else
67 + break
68 + fi
69 +done
70 +
71 +case $# in
72 + 0) exit 0 ;;
73 +esac
74 +
75 +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
76 +# mkdir -p a/c at the same time, both will detect that a is missing,
77 +# one will create a, then the other will try to create a and die with
78 +# a "File exists" error. This is a problem when calling mkinstalldirs
79 +# from a parallel make. We use --version in the probe to restrict
80 +# ourselves to GNU mkdir, which is thread-safe.
81 +case $dirmode in
82 + '')
83 + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
84 + echo "mkdir -p -- $*"
85 + exec mkdir -p -- "$@"
86 + else
87 + # On NextStep and OpenStep, the `mkdir' command does not
88 + # recognize any option. It will interpret all options as
89 + # directories to create, and then abort because `.' already
90 + # exists.
91 + test -d ./-p && rmdir ./-p
92 + test -d ./--version && rmdir ./--version
93 + fi
94 + ;;
95 + *)
96 + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
97 + test ! -d ./--version; then
98 + echo "mkdir -m $dirmode -p -- $*"
99 + exec mkdir -m "$dirmode" -p -- "$@"
100 + else
101 + # Clean up after NextStep and OpenStep mkdir.
102 + for d in ./-m ./-p ./--version "./$dirmode";
103 + do
104 + test -d $d && rmdir $d
105 + done
106 + fi
107 + ;;
108 +esac
109 +
110 +for file
111 +do
112 + case $file in
113 + /*) pathcomp=/ ;;
114 + *) pathcomp= ;;
115 + esac
116 + oIFS=$IFS
117 + IFS=/
118 + set fnord $file
119 + shift
120 + IFS=$oIFS
121 +
122 + for d
123 + do
124 + test "x$d" = x && continue
125 +
126 + pathcomp=$pathcomp$d
127 + case $pathcomp in
128 + -*) pathcomp=./$pathcomp ;;
129 + esac
130 +
131 + if test ! -d "$pathcomp"; then
132 + echo "mkdir $pathcomp"
133 +
134 + mkdir "$pathcomp" || lasterr=$?
135 +
136 + if test ! -d "$pathcomp"; then
137 + errstatus=$lasterr
138 + else
139 + if test ! -z "$dirmode"; then
140 + echo "chmod $dirmode $pathcomp"
141 + lasterr=
142 + chmod "$dirmode" "$pathcomp" || lasterr=$?
143 +
144 + if test ! -z "$lasterr"; then
145 + errstatus=$lasterr
146 + fi
147 + fi
148 + fi
149 + fi
150 +
151 + pathcomp=$pathcomp/
152 + done
153 +done
154 +
155 +exit $errstatus
156 +
157 +# Local Variables:
158 +# mode: shell-script
159 +# sh-indentation: 2
160 +# eval: (add-hook 'write-file-hooks 'time-stamp)
161 +# time-stamp-start: "scriptversion="
162 +# time-stamp-format: "%:y-%02m-%02d.%02H"
163 +# time-stamp-time-zone: "UTC"
164 +# time-stamp-end: "; # UTC"
165 +# End:
166 --- lxpanel-0.5.6.orig/config.sub
167 +++ lxpanel-0.5.6/config.sub
168 @@ -4,7 +4,7 @@
169 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
170 # Free Software Foundation, Inc.
172 -timestamp='2009-11-20'
173 +timestamp='2009-06-11'
175 # This file is (in principle) common to ALL GNU software.
176 # The presence of a machine in this file suggests that SOME GNU software
177 @@ -32,16 +32,13 @@ timestamp='2009-11-20'
180 # Please send patches to <config-patches@gnu.org>. Submit a context
181 -# diff and a properly formatted GNU ChangeLog entry.
182 +# diff and a properly formatted ChangeLog entry.
183 #
184 # Configuration subroutine to validate and canonicalize a configuration type.
185 # Supply the specified configuration type as an argument.
186 # If it is invalid, we print an error message on stderr and exit with code 1.
187 # Otherwise, we print the canonical config type on stdout and succeed.
189 -# You can get the latest version of this script from:
190 -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
191 -
192 # This file is supposed to be the same for all GNU packages
193 # and recognize all the CPU types, system types and aliases
194 # that are meaningful with *any* GNU software.
195 @@ -152,7 +149,7 @@ case $os in
196 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
197 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
198 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
199 - -apple | -axis | -knuth | -cray | -microblaze)
200 + -apple | -axis | -knuth | -cray)
201 os=
202 basic_machine=$1
203 ;;
204 @@ -287,7 +284,6 @@ case $basic_machine in
205 | pdp10 | pdp11 | pj | pjl \
206 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
207 | pyramid \
208 - | rx \
209 | score \
210 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
211 | sh64 | sh64le \
212 @@ -295,14 +291,13 @@ case $basic_machine in
213 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
214 | spu | strongarm \
215 | tahoe | thumb | tic4x | tic80 | tron \
216 - | ubicom32 \
217 | v850 | v850e \
218 | we32k \
219 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
220 | z8k | z80)
221 basic_machine=$basic_machine-unknown
222 ;;
223 - m6811 | m68hc11 | m6812 | m68hc12 | picochip)
224 + m6811 | m68hc11 | m6812 | m68hc12)
225 # Motorola 68HC11/12.
226 basic_machine=$basic_machine-unknown
227 os=-none
228 @@ -345,7 +340,7 @@ case $basic_machine in
229 | lm32-* \
230 | m32c-* | m32r-* | m32rle-* \
231 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
232 - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
233 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
234 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
235 | mips16-* \
236 | mips64-* | mips64el-* \
237 @@ -373,7 +368,7 @@ case $basic_machine in
238 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
239 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
240 | pyramid-* \
241 - | romp-* | rs6000-* | rx-* \
242 + | romp-* | rs6000-* \
243 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
244 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
245 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
246 @@ -382,7 +377,6 @@ case $basic_machine in
247 | tahoe-* | thumb-* \
248 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
249 | tron-* \
250 - | ubicom32-* \
251 | v850-* | v850e-* | vax-* \
252 | we32k-* \
253 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
254 @@ -732,9 +726,6 @@ case $basic_machine in
255 basic_machine=ns32k-utek
256 os=-sysv
257 ;;
258 - microblaze)
259 - basic_machine=microblaze-xilinx
260 - ;;
261 mingw32)
262 basic_machine=i386-pc
263 os=-mingw32
264 @@ -1256,9 +1247,6 @@ case $os in
265 # First match some system type aliases
266 # that might get confused with valid system types.
267 # -solaris* is a basic system type, with this one exception.
268 - -auroraux)
269 - os=-auroraux
270 - ;;
271 -solaris1 | -solaris1.*)
272 os=`echo $os | sed -e 's|solaris1|sunos4|'`
273 ;;
274 @@ -1280,8 +1268,8 @@ case $os in
275 # -sysv* is not here because it comes later, after sysvr4.
276 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
277 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
278 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
279 - | -sym* | -kopensolaris* \
280 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
281 + | -kopensolaris* \
282 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
283 | -aos* | -aros* \
284 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
285 @@ -1302,7 +1290,7 @@ case $os in
286 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
287 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
288 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
289 - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
290 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
291 # Remember, each alternative MUST END IN *, to match a version number.
292 ;;
293 -qnx*)
294 --- lxpanel-0.5.6.orig/Makefile.in
295 +++ lxpanel-0.5.6/Makefile.in
296 @@ -39,8 +39,9 @@ DIST_COMMON = README $(am__configure_dep
297 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
298 $(srcdir)/lxpanel.pc.in $(top_srcdir)/configure \
299 $(top_srcdir)/data/default/panels/panel.in ABOUT-NLS AUTHORS \
300 - COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \
301 - depcomp install-sh ltmain.sh missing
302 + COPYING ChangeLog INSTALL NEWS compile config.guess \
303 + config.rpath config.sub depcomp install-sh ltmain.sh missing \
304 + mkinstalldirs
305 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
306 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
307 $(top_srcdir)/configure.ac
308 @@ -48,7 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
309 $(ACLOCAL_M4)
310 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
311 configure.lineno config.status.lineno
312 -mkinstalldirs = $(install_sh) -d
313 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
314 CONFIG_HEADER = config.h
315 CONFIG_CLEAN_FILES = lxpanel.pc data/default/panels/panel
316 CONFIG_CLEAN_VPATH_FILES =
317 @@ -132,6 +133,8 @@ ACLOCAL = @ACLOCAL@
318 ALL_LINGUAS = @ALL_LINGUAS@
319 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
320 AMTAR = @AMTAR@
321 +APPLET_CFLAGS = @APPLET_CFLAGS@
322 +APPLET_LIBS = @APPLET_LIBS@
323 AR = @AR@
324 AUTOCONF = @AUTOCONF@
325 AUTOHEADER = @AUTOHEADER@
326 @@ -161,6 +164,8 @@ GMOFILES = @GMOFILES@
327 GMSGFMT = @GMSGFMT@
328 GREP = @GREP@
329 G_CAST_CHECKS = @G_CAST_CHECKS@
330 +INDICATORDIR = @INDICATORDIR@
331 +INDICATORICONSDIR = @INDICATORICONSDIR@
332 INSTALL = @INSTALL@
333 INSTALL_DATA = @INSTALL_DATA@
334 INSTALL_PROGRAM = @INSTALL_PROGRAM@
335 @@ -206,8 +211,6 @@ PACKAGE_URL = @PACKAGE_URL@
336 PACKAGE_VERSION = @PACKAGE_VERSION@
337 PATH_SEPARATOR = @PATH_SEPARATOR@
338 PKG_CONFIG = @PKG_CONFIG@
339 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
340 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
341 PLUGINS_LIST = @PLUGINS_LIST@
342 POFILES = @POFILES@
343 POSUB = @POSUB@
344 @@ -263,6 +266,7 @@ libdir = @libdir@
345 libexecdir = @libexecdir@
346 localedir = @localedir@
347 localstatedir = @localstatedir@
348 +lt_ECHO = @lt_ECHO@
349 mandir = @mandir@
350 mkdir_p = @mkdir_p@
351 oldincludedir = @oldincludedir@
352 --- /dev/null
353 +++ lxpanel-0.5.6/config.rpath
354 @@ -0,0 +1,548 @@
355 +#! /bin/sh
356 +# Output a system dependent set of variables, describing how to set the
357 +# run time search path of shared libraries in an executable.
358 +#
359 +# Copyright 1996-2003 Free Software Foundation, Inc.
360 +# Taken from GNU libtool, 2001
361 +# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
362 +#
363 +# This program is free software; you can redistribute it and/or modify
364 +# it under the terms of the GNU General Public License as published by
365 +# the Free Software Foundation; either version 2 of the License, or
366 +# (at your option) any later version.
367 +#
368 +# This program is distributed in the hope that it will be useful, but
369 +# WITHOUT ANY WARRANTY; without even the implied warranty of
370 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
371 +# General Public License for more details.
372 +#
373 +# You should have received a copy of the GNU General Public License
374 +# along with this program; if not, write to the Free Software
375 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
376 +#
377 +# As a special exception to the GNU General Public License, if you
378 +# distribute this file as part of a program that contains a
379 +# configuration script generated by Autoconf, you may include it under
380 +# the same distribution terms that you use for the rest of that program.
381 +#
382 +# The first argument passed to this file is the canonical host specification,
383 +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
384 +# or
385 +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
386 +# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
387 +# should be set by the caller.
388 +#
389 +# The set of defined variables is at the end of this script.
390 +
391 +# Known limitations:
392 +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
393 +# than 256 bytes, otherwise the compiler driver will dump core. The only
394 +# known workaround is to choose shorter directory names for the build
395 +# directory and/or the installation directory.
396 +
397 +# All known linkers require a `.a' archive for static linking (except M$VC,
398 +# which needs '.lib').
399 +libext=a
400 +shrext=.so
401 +
402 +host="$1"
403 +host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
404 +host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
405 +host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
406 +
407 +# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
408 +
409 +wl=
410 +if test "$GCC" = yes; then
411 + wl='-Wl,'
412 +else
413 + case "$host_os" in
414 + aix*)
415 + wl='-Wl,'
416 + ;;
417 + mingw* | pw32* | os2*)
418 + ;;
419 + hpux9* | hpux10* | hpux11*)
420 + wl='-Wl,'
421 + ;;
422 + irix5* | irix6* | nonstopux*)
423 + wl='-Wl,'
424 + ;;
425 + newsos6)
426 + ;;
427 + linux*)
428 + case $CC in
429 + icc|ecc)
430 + wl='-Wl,'
431 + ;;
432 + ccc)
433 + wl='-Wl,'
434 + ;;
435 + esac
436 + ;;
437 + osf3* | osf4* | osf5*)
438 + wl='-Wl,'
439 + ;;
440 + sco3.2v5*)
441 + ;;
442 + solaris*)
443 + wl='-Wl,'
444 + ;;
445 + sunos4*)
446 + wl='-Qoption ld '
447 + ;;
448 + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
449 + wl='-Wl,'
450 + ;;
451 + sysv4*MP*)
452 + ;;
453 + uts4*)
454 + ;;
455 + esac
456 +fi
457 +
458 +# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
459 +
460 +hardcode_libdir_flag_spec=
461 +hardcode_libdir_separator=
462 +hardcode_direct=no
463 +hardcode_minus_L=no
464 +
465 +case "$host_os" in
466 + cygwin* | mingw* | pw32*)
467 + # FIXME: the MSVC++ port hasn't been tested in a loooong time
468 + # When not using gcc, we currently assume that we are using
469 + # Microsoft Visual C++.
470 + if test "$GCC" != yes; then
471 + with_gnu_ld=no
472 + fi
473 + ;;
474 + openbsd*)
475 + with_gnu_ld=no
476 + ;;
477 +esac
478 +
479 +ld_shlibs=yes
480 +if test "$with_gnu_ld" = yes; then
481 + case "$host_os" in
482 + aix3* | aix4* | aix5*)
483 + # On AIX/PPC, the GNU linker is very broken
484 + if test "$host_cpu" != ia64; then
485 + ld_shlibs=no
486 + fi
487 + ;;
488 + amigaos*)
489 + hardcode_libdir_flag_spec='-L$libdir'
490 + hardcode_minus_L=yes
491 + # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
492 + # that the semantics of dynamic libraries on AmigaOS, at least up
493 + # to version 4, is to share data among multiple programs linked
494 + # with the same dynamic library. Since this doesn't match the
495 + # behavior of shared libraries on other platforms, we can use
496 + # them.
497 + ld_shlibs=no
498 + ;;
499 + beos*)
500 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
501 + :
502 + else
503 + ld_shlibs=no
504 + fi
505 + ;;
506 + cygwin* | mingw* | pw32*)
507 + # hardcode_libdir_flag_spec is actually meaningless, as there is
508 + # no search path for DLLs.
509 + hardcode_libdir_flag_spec='-L$libdir'
510 + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
511 + :
512 + else
513 + ld_shlibs=no
514 + fi
515 + ;;
516 + netbsd*)
517 + ;;
518 + solaris* | sysv5*)
519 + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
520 + ld_shlibs=no
521 + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
522 + :
523 + else
524 + ld_shlibs=no
525 + fi
526 + ;;
527 + sunos4*)
528 + hardcode_direct=yes
529 + ;;
530 + *)
531 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
532 + :
533 + else
534 + ld_shlibs=no
535 + fi
536 + ;;
537 + esac
538 + if test "$ld_shlibs" = yes; then
539 + # Unlike libtool, we use -rpath here, not --rpath, since the documented
540 + # option of GNU ld is called -rpath, not --rpath.
541 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
542 + fi
543 +else
544 + case "$host_os" in
545 + aix3*)
546 + # Note: this linker hardcodes the directories in LIBPATH if there
547 + # are no directories specified by -L.
548 + hardcode_minus_L=yes
549 + if test "$GCC" = yes; then
550 + # Neither direct hardcoding nor static linking is supported with a
551 + # broken collect2.
552 + hardcode_direct=unsupported
553 + fi
554 + ;;
555 + aix4* | aix5*)
556 + if test "$host_cpu" = ia64; then
557 + # On IA64, the linker does run time linking by default, so we don't
558 + # have to do anything special.
559 + aix_use_runtimelinking=no
560 + else
561 + aix_use_runtimelinking=no
562 + # Test if we are trying to use run time linking or normal
563 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
564 + # need to do runtime linking.
565 + case $host_os in aix4.[23]|aix4.[23].*|aix5*)
566 + for ld_flag in $LDFLAGS; do
567 + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
568 + aix_use_runtimelinking=yes
569 + break
570 + fi
571 + done
572 + esac
573 + fi
574 + hardcode_direct=yes
575 + hardcode_libdir_separator=':'
576 + if test "$GCC" = yes; then
577 + case $host_os in aix4.[012]|aix4.[012].*)
578 + collect2name=`${CC} -print-prog-name=collect2`
579 + if test -f "$collect2name" && \
580 + strings "$collect2name" | grep resolve_lib_name >/dev/null
581 + then
582 + # We have reworked collect2
583 + hardcode_direct=yes
584 + else
585 + # We have old collect2
586 + hardcode_direct=unsupported
587 + hardcode_minus_L=yes
588 + hardcode_libdir_flag_spec='-L$libdir'
589 + hardcode_libdir_separator=
590 + fi
591 + esac
592 + fi
593 + # Begin _LT_AC_SYS_LIBPATH_AIX.
594 + echo 'int main () { return 0; }' > conftest.c
595 + ${CC} ${LDFLAGS} conftest.c -o conftest
596 + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
597 +}'`
598 + if test -z "$aix_libpath"; then
599 + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
600 +}'`
601 + fi
602 + if test -z "$aix_libpath"; then
603 + aix_libpath="/usr/lib:/lib"
604 + fi
605 + rm -f conftest.c conftest
606 + # End _LT_AC_SYS_LIBPATH_AIX.
607 + if test "$aix_use_runtimelinking" = yes; then
608 + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
609 + else
610 + if test "$host_cpu" = ia64; then
611 + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
612 + else
613 + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
614 + fi
615 + fi
616 + ;;
617 + amigaos*)
618 + hardcode_libdir_flag_spec='-L$libdir'
619 + hardcode_minus_L=yes
620 + # see comment about different semantics on the GNU ld section
621 + ld_shlibs=no
622 + ;;
623 + bsdi4*)
624 + ;;
625 + cygwin* | mingw* | pw32*)
626 + # When not using gcc, we currently assume that we are using
627 + # Microsoft Visual C++.
628 + # hardcode_libdir_flag_spec is actually meaningless, as there is
629 + # no search path for DLLs.
630 + hardcode_libdir_flag_spec=' '
631 + libext=lib
632 + ;;
633 + darwin* | rhapsody*)
634 + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
635 + hardcode_direct=no
636 + fi
637 + ;;
638 + dgux*)
639 + hardcode_libdir_flag_spec='-L$libdir'
640 + ;;
641 + freebsd1*)
642 + ld_shlibs=no
643 + ;;
644 + freebsd2.2*)
645 + hardcode_libdir_flag_spec='-R$libdir'
646 + hardcode_direct=yes
647 + ;;
648 + freebsd2*)
649 + hardcode_direct=yes
650 + hardcode_minus_L=yes
651 + ;;
652 + freebsd*)
653 + hardcode_libdir_flag_spec='-R$libdir'
654 + hardcode_direct=yes
655 + ;;
656 + hpux9*)
657 + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
658 + hardcode_libdir_separator=:
659 + hardcode_direct=yes
660 + # hardcode_minus_L: Not really in the search PATH,
661 + # but as the default location of the library.
662 + hardcode_minus_L=yes
663 + ;;
664 + hpux10* | hpux11*)
665 + if test "$with_gnu_ld" = no; then
666 + case "$host_cpu" in
667 + hppa*64*)
668 + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
669 + hardcode_libdir_separator=:
670 + hardcode_direct=no
671 + ;;
672 + ia64*)
673 + hardcode_libdir_flag_spec='-L$libdir'
674 + hardcode_direct=no
675 + # hardcode_minus_L: Not really in the search PATH,
676 + # but as the default location of the library.
677 + hardcode_minus_L=yes
678 + ;;
679 + *)
680 + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
681 + hardcode_libdir_separator=:
682 + hardcode_direct=yes
683 + # hardcode_minus_L: Not really in the search PATH,
684 + # but as the default location of the library.
685 + hardcode_minus_L=yes
686 + ;;
687 + esac
688 + fi
689 + ;;
690 + irix5* | irix6* | nonstopux*)
691 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
692 + hardcode_libdir_separator=:
693 + ;;
694 + netbsd*)
695 + hardcode_libdir_flag_spec='-R$libdir'
696 + hardcode_direct=yes
697 + ;;
698 + newsos6)
699 + hardcode_direct=yes
700 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
701 + hardcode_libdir_separator=:
702 + ;;
703 + openbsd*)
704 + hardcode_direct=yes
705 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
706 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
707 + else
708 + case "$host_os" in
709 + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
710 + hardcode_libdir_flag_spec='-R$libdir'
711 + ;;
712 + *)
713 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
714 + ;;
715 + esac
716 + fi
717 + ;;
718 + os2*)
719 + hardcode_libdir_flag_spec='-L$libdir'
720 + hardcode_minus_L=yes
721 + ;;
722 + osf3*)
723 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
724 + hardcode_libdir_separator=:
725 + ;;
726 + osf4* | osf5*)
727 + if test "$GCC" = yes; then
728 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
729 + else
730 + # Both cc and cxx compiler support -rpath directly
731 + hardcode_libdir_flag_spec='-rpath $libdir'
732 + fi
733 + hardcode_libdir_separator=:
734 + ;;
735 + sco3.2v5*)
736 + ;;
737 + solaris*)
738 + hardcode_libdir_flag_spec='-R$libdir'
739 + ;;
740 + sunos4*)
741 + hardcode_libdir_flag_spec='-L$libdir'
742 + hardcode_direct=yes
743 + hardcode_minus_L=yes
744 + ;;
745 + sysv4)
746 + case $host_vendor in
747 + sni)
748 + hardcode_direct=yes # is this really true???
749 + ;;
750 + siemens)
751 + hardcode_direct=no
752 + ;;
753 + motorola)
754 + hardcode_direct=no #Motorola manual says yes, but my tests say they lie
755 + ;;
756 + esac
757 + ;;
758 + sysv4.3*)
759 + ;;
760 + sysv4*MP*)
761 + if test -d /usr/nec; then
762 + ld_shlibs=yes
763 + fi
764 + ;;
765 + sysv4.2uw2*)
766 + hardcode_direct=yes
767 + hardcode_minus_L=no
768 + ;;
769 + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
770 + ;;
771 + sysv5*)
772 + hardcode_libdir_flag_spec=
773 + ;;
774 + uts4*)
775 + hardcode_libdir_flag_spec='-L$libdir'
776 + ;;
777 + *)
778 + ld_shlibs=no
779 + ;;
780 + esac
781 +fi
782 +
783 +# Check dynamic linker characteristics
784 +# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
785 +libname_spec='lib$name'
786 +case "$host_os" in
787 + aix3*)
788 + ;;
789 + aix4* | aix5*)
790 + ;;
791 + amigaos*)
792 + ;;
793 + beos*)
794 + ;;
795 + bsdi4*)
796 + ;;
797 + cygwin* | mingw* | pw32*)
798 + shrext=.dll
799 + ;;
800 + darwin* | rhapsody*)
801 + shrext=.dylib
802 + ;;
803 + dgux*)
804 + ;;
805 + freebsd1*)
806 + ;;
807 + freebsd*)
808 + ;;
809 + gnu*)
810 + ;;
811 + hpux9* | hpux10* | hpux11*)
812 + case "$host_cpu" in
813 + ia64*)
814 + shrext=.so
815 + ;;
816 + hppa*64*)
817 + shrext=.sl
818 + ;;
819 + *)
820 + shrext=.sl
821 + ;;
822 + esac
823 + ;;
824 + irix5* | irix6* | nonstopux*)
825 + case "$host_os" in
826 + irix5* | nonstopux*)
827 + libsuff= shlibsuff=
828 + ;;
829 + *)
830 + case $LD in
831 + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
832 + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
833 + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
834 + *) libsuff= shlibsuff= ;;
835 + esac
836 + ;;
837 + esac
838 + ;;
839 + linux*oldld* | linux*aout* | linux*coff*)
840 + ;;
841 + linux*)
842 + ;;
843 + netbsd*)
844 + ;;
845 + newsos6)
846 + ;;
847 + nto-qnx)
848 + ;;
849 + openbsd*)
850 + ;;
851 + os2*)
852 + libname_spec='$name'
853 + shrext=.dll
854 + ;;
855 + osf3* | osf4* | osf5*)
856 + ;;
857 + sco3.2v5*)
858 + ;;
859 + solaris*)
860 + ;;
861 + sunos4*)
862 + ;;
863 + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
864 + ;;
865 + sysv4*MP*)
866 + ;;
867 + uts4*)
868 + ;;
869 +esac
870 +
871 +sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
872 +escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
873 +shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
874 +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
875 +
876 +sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
877 +
878 +# How to pass a linker flag through the compiler.
879 +wl="$escaped_wl"
880 +
881 +# Static library suffix (normally "a").
882 +libext="$libext"
883 +
884 +# Shared library suffix (normally "so").
885 +shlibext="$shlibext"
886 +
887 +# Flag to hardcode \$libdir into a binary during linking.
888 +# This must work even if \$libdir does not exist.
889 +hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
890 +
891 +# Whether we need a single -rpath flag with a separated argument.
892 +hardcode_libdir_separator="$hardcode_libdir_separator"
893 +
894 +# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
895 +# resulting binary.
896 +hardcode_direct="$hardcode_direct"
897 +
898 +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
899 +# resulting binary.
900 +hardcode_minus_L="$hardcode_minus_L"
901 +
902 +EOF
903 --- lxpanel-0.5.6.orig/aclocal.m4
904 +++ lxpanel-0.5.6/aclocal.m4
905 @@ -19,8 +19,8 @@ You have another version of autoconf. I
906 If you have problems, you may need to regenerate the build system entirely.
907 To do so, use the procedure documented by the package, typically `autoreconf'.])])
909 -# gettext.m4 serial 63 (gettext-0.18)
910 -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
911 +# gettext.m4 serial 60 (gettext-0.17)
912 +dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
913 dnl This file is free software; the Free Software Foundation
914 dnl gives unlimited permission to copy and/or distribute it,
915 dnl with or without modifications, as long as this notice is preserved.
916 @@ -36,7 +36,7 @@ dnl They are *not* in the public domain.
918 dnl Authors:
919 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
920 -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
921 +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
923 dnl Macro to add for using GNU gettext.
925 @@ -81,8 +81,6 @@ AC_DEFUN([AM_GNU_GETTEXT],
926 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
927 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
928 ])])])])])
929 - ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
930 - [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
931 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
932 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
933 ])])])])
934 @@ -146,11 +144,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
935 gt_use_preinstalled_gnugettext=no
936 ifelse(gt_included_intl, yes, [
937 AC_MSG_CHECKING([whether included gettext is requested])
938 - AC_ARG_WITH([included-gettext],
939 + AC_ARG_WITH(included-gettext,
940 [ --with-included-gettext use the GNU gettext library included here],
941 nls_cv_force_use_gnu_gettext=$withval,
942 nls_cv_force_use_gnu_gettext=no)
943 - AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
944 + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
946 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
947 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
948 @@ -290,7 +288,7 @@ return * gettext ("")$gt_expression_test
950 if test "$gt_use_preinstalled_gnugettext" = "yes" \
951 || test "$nls_cv_use_gnu_gettext" = "yes"; then
952 - AC_DEFINE([ENABLE_NLS], [1],
953 + AC_DEFINE(ENABLE_NLS, 1,
954 [Define to 1 if translation of program messages to the user's native language
955 is requested.])
956 else
957 @@ -324,9 +322,9 @@ return * gettext ("")$gt_expression_test
958 fi
960 dnl For backward compatibility. Some packages may be using this.
961 - AC_DEFINE([HAVE_GETTEXT], [1],
962 + AC_DEFINE(HAVE_GETTEXT, 1,
963 [Define if the GNU gettext() function is already present or preinstalled.])
964 - AC_DEFINE([HAVE_DCGETTEXT], [1],
965 + AC_DEFINE(HAVE_DCGETTEXT, 1,
966 [Define if the GNU dcgettext() function is already present or preinstalled.])
967 fi
969 @@ -342,9 +340,9 @@ return * gettext ("")$gt_expression_test
970 fi
972 dnl Make all variables we use known to autoconf.
973 - AC_SUBST([BUILD_INCLUDED_LIBINTL])
974 - AC_SUBST([USE_INCLUDED_LIBINTL])
975 - AC_SUBST([CATOBJEXT])
976 + AC_SUBST(BUILD_INCLUDED_LIBINTL)
977 + AC_SUBST(USE_INCLUDED_LIBINTL)
978 + AC_SUBST(CATOBJEXT)
980 dnl For backward compatibility. Some configure.ins may be using this.
981 nls_cv_header_intl=
982 @@ -352,36 +350,36 @@ return * gettext ("")$gt_expression_test
984 dnl For backward compatibility. Some Makefiles may be using this.
985 DATADIRNAME=share
986 - AC_SUBST([DATADIRNAME])
987 + AC_SUBST(DATADIRNAME)
989 dnl For backward compatibility. Some Makefiles may be using this.
990 INSTOBJEXT=.mo
991 - AC_SUBST([INSTOBJEXT])
992 + AC_SUBST(INSTOBJEXT)
994 dnl For backward compatibility. Some Makefiles may be using this.
995 GENCAT=gencat
996 - AC_SUBST([GENCAT])
997 + AC_SUBST(GENCAT)
999 dnl For backward compatibility. Some Makefiles may be using this.
1000 INTLOBJS=
1001 if test "$USE_INCLUDED_LIBINTL" = yes; then
1002 INTLOBJS="\$(GETTOBJS)"
1003 fi
1004 - AC_SUBST([INTLOBJS])
1005 + AC_SUBST(INTLOBJS)
1007 dnl Enable libtool support if the surrounding package wishes it.
1008 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
1009 - AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
1010 + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
1011 ])
1013 dnl For backward compatibility. Some Makefiles may be using this.
1014 INTLLIBS="$LIBINTL"
1015 - AC_SUBST([INTLLIBS])
1016 + AC_SUBST(INTLLIBS)
1018 dnl Make all documented variables known to autoconf.
1019 - AC_SUBST([LIBINTL])
1020 - AC_SUBST([LTLIBINTL])
1021 - AC_SUBST([POSUB])
1022 + AC_SUBST(LIBINTL)
1023 + AC_SUBST(LTLIBINTL)
1024 + AC_SUBST(POSUB)
1025 ])
1028 @@ -1033,8 +1031,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
1029 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1030 #
1031 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1032 -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1033 -# Inc.
1034 +# 2006, 2007, 2008 Free Software Foundation, Inc.
1035 # Written by Gordon Matzigkeit, 1996
1036 #
1037 # This file is free software; the Free Software Foundation gives
1038 @@ -1043,8 +1040,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
1040 m4_define([_LT_COPYING], [dnl
1041 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1042 -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1043 -# Inc.
1044 +# 2006, 2007, 2008 Free Software Foundation, Inc.
1045 # Written by Gordon Matzigkeit, 1996
1046 #
1047 # This file is part of GNU Libtool.
1048 @@ -1071,7 +1067,7 @@ m4_define([_LT_COPYING], [dnl
1049 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1050 ])
1052 -# serial 57 LT_INIT
1053 +# serial 56 LT_INIT
1056 # LT_PREREQ(VERSION)
1057 @@ -1100,7 +1096,6 @@ esac
1058 # ------------------
1059 AC_DEFUN([LT_INIT],
1060 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
1061 -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1062 AC_BEFORE([$0], [LT_LANG])dnl
1063 AC_BEFORE([$0], [LT_OUTPUT])dnl
1064 AC_BEFORE([$0], [LTDL_INIT])dnl
1065 @@ -1117,8 +1112,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
1066 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
1067 m4_require([_LT_PROG_LTMAIN])dnl
1069 -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
1070 -
1071 dnl Parse OPTIONS
1072 _LT_SET_OPTIONS([$0], [$1])
1074 @@ -1155,7 +1148,7 @@ m4_defun([_LT_CC_BASENAME],
1075 *) break;;
1076 esac
1077 done
1078 -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
1079 +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1080 ])
1083 @@ -1175,9 +1168,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
1084 m4_defun([_LT_SETUP],
1085 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
1086 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1087 -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
1088 -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
1089 -
1090 _LT_DECL([], [host_alias], [0], [The host system])dnl
1091 _LT_DECL([], [host], [0])dnl
1092 _LT_DECL([], [host_os], [0])dnl
1093 @@ -1219,6 +1209,7 @@ fi
1094 _LT_CHECK_OBJDIR
1096 m4_require([_LT_TAG_COMPILER])dnl
1097 +_LT_PROG_ECHO_BACKSLASH
1099 case $host_os in
1100 aix3*)
1101 @@ -1232,6 +1223,23 @@ aix3*)
1102 ;;
1103 esac
1105 +# Sed substitution that helps us do robust quoting. It backslashifies
1106 +# metacharacters that are still active within double-quoted strings.
1107 +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
1108 +
1109 +# Same as above, but do not quote variable references.
1110 +double_quote_subst='s/\([["`\\]]\)/\\\1/g'
1111 +
1112 +# Sed substitution to delay expansion of an escaped shell variable in a
1113 +# double_quote_subst'ed string.
1114 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1115 +
1116 +# Sed substitution to delay expansion of an escaped single quote.
1117 +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
1118 +
1119 +# Sed substitution to avoid accidental globbing in evaled expressions
1120 +no_glob_subst='s/\*/\\\*/g'
1121 +
1122 # Global variables:
1123 ofile=libtool
1124 can_build_shared=yes
1125 @@ -1272,28 +1280,6 @@ _LT_CONFIG_COMMANDS
1126 ])# _LT_SETUP
1129 -# _LT_PREPARE_SED_QUOTE_VARS
1130 -# --------------------------
1131 -# Define a few sed substitution that help us do robust quoting.
1132 -m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
1133 -[# Backslashify metacharacters that are still active within
1134 -# double-quoted strings.
1135 -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
1136 -
1137 -# Same as above, but do not quote variable references.
1138 -double_quote_subst='s/\([["`\\]]\)/\\\1/g'
1139 -
1140 -# Sed substitution to delay expansion of an escaped shell variable in a
1141 -# double_quote_subst'ed string.
1142 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1143 -
1144 -# Sed substitution to delay expansion of an escaped single quote.
1145 -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
1146 -
1147 -# Sed substitution to avoid accidental globbing in evaled expressions
1148 -no_glob_subst='s/\*/\\\*/g'
1149 -])
1150 -
1151 # _LT_PROG_LTMAIN
1152 # ---------------
1153 # Note that this code is called both from `configure', and `config.status'
1154 @@ -1446,7 +1432,7 @@ m4_define([_lt_decl_all_varnames],
1155 # declaration there will have the same value as in `configure'. VARNAME
1156 # must have a single quote delimited value for this to work.
1157 m4_define([_LT_CONFIG_STATUS_DECLARE],
1158 -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
1159 +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
1162 # _LT_CONFIG_STATUS_DECLARATIONS
1163 @@ -1456,7 +1442,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
1164 # embedded single quotes properly. In configure, this macro expands
1165 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
1166 #
1167 -# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
1168 +# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
1169 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
1170 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
1171 [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
1172 @@ -1555,20 +1541,12 @@ LTCC='$LTCC'
1173 LTCFLAGS='$LTCFLAGS'
1174 compiler='$compiler_DEFAULT'
1176 -# A function that is used when there is no print builtin or printf.
1177 -func_fallback_echo ()
1178 -{
1179 - eval 'cat <<_LTECHO_EOF
1180 -\$[]1
1181 -_LTECHO_EOF'
1182 -}
1183 -
1184 # Quote evaled strings.
1185 for var in lt_decl_all_varnames([[ \
1186 ]], lt_decl_quote_varnames); do
1187 - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
1188 + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
1189 *[[\\\\\\\`\\"\\\$]]*)
1190 - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
1191 + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
1192 ;;
1193 *)
1194 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
1195 @@ -1579,9 +1557,9 @@ done
1196 # Double-quote double-evaled strings.
1197 for var in lt_decl_all_varnames([[ \
1198 ]], lt_decl_dquote_varnames); do
1199 - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
1200 + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
1201 *[[\\\\\\\`\\"\\\$]]*)
1202 - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
1203 + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
1204 ;;
1205 *)
1206 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
1207 @@ -1589,38 +1567,16 @@ for var in lt_decl_all_varnames([[ \
1208 esac
1209 done
1211 +# Fix-up fallback echo if it was mangled by the above quoting rules.
1212 +case \$lt_ECHO in
1213 +*'\\\[$]0 --fallback-echo"')dnl "
1214 + lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
1215 + ;;
1216 +esac
1217 +
1218 _LT_OUTPUT_LIBTOOL_INIT
1219 ])
1221 -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
1222 -# ------------------------------------
1223 -# Generate a child script FILE with all initialization necessary to
1224 -# reuse the environment learned by the parent script, and make the
1225 -# file executable. If COMMENT is supplied, it is inserted after the
1226 -# `#!' sequence but before initialization text begins. After this
1227 -# macro, additional text can be appended to FILE to form the body of
1228 -# the child script. The macro ends with non-zero status if the
1229 -# file could not be fully written (such as if the disk is full).
1230 -m4_ifdef([AS_INIT_GENERATED],
1231 -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
1232 -[m4_defun([_LT_GENERATED_FILE_INIT],
1233 -[m4_require([AS_PREPARE])]dnl
1234 -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
1235 -[lt_write_fail=0
1236 -cat >$1 <<_ASEOF || lt_write_fail=1
1237 -#! $SHELL
1238 -# Generated by $as_me.
1239 -$2
1240 -SHELL=\${CONFIG_SHELL-$SHELL}
1241 -export SHELL
1242 -_ASEOF
1243 -cat >>$1 <<\_ASEOF || lt_write_fail=1
1244 -AS_SHELL_SANITIZE
1245 -_AS_PREPARE
1246 -exec AS_MESSAGE_FD>&1
1247 -_ASEOF
1248 -test $lt_write_fail = 0 && chmod +x $1[]dnl
1249 -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
1251 # LT_OUTPUT
1252 # ---------
1253 @@ -1630,11 +1586,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_
1254 AC_DEFUN([LT_OUTPUT],
1255 [: ${CONFIG_LT=./config.lt}
1256 AC_MSG_NOTICE([creating $CONFIG_LT])
1257 -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
1258 -[# Run this file to recreate a libtool stub with the current configuration.])
1259 +cat >"$CONFIG_LT" <<_LTEOF
1260 +#! $SHELL
1261 +# Generated by $as_me.
1262 +# Run this file to recreate a libtool stub with the current configuration.
1264 -cat >>"$CONFIG_LT" <<\_LTEOF
1265 lt_cl_silent=false
1266 +SHELL=\${CONFIG_SHELL-$SHELL}
1267 +_LTEOF
1268 +
1269 +cat >>"$CONFIG_LT" <<\_LTEOF
1270 +AS_SHELL_SANITIZE
1271 +_AS_PREPARE
1272 +
1273 +exec AS_MESSAGE_FD>&1
1274 exec AS_MESSAGE_LOG_FD>>config.log
1275 {
1276 echo
1277 @@ -1660,7 +1625,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
1278 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
1279 configured by $[0], generated by m4_PACKAGE_STRING.
1281 -Copyright (C) 2010 Free Software Foundation, Inc.
1282 +Copyright (C) 2008 Free Software Foundation, Inc.
1283 This config.lt script is free software; the Free Software Foundation
1284 gives unlimited permision to copy, distribute and modify it."
1286 @@ -1705,13 +1670,15 @@ chmod +x "$CONFIG_LT"
1287 # appending to config.log, which fails on DOS, as config.log is still kept
1288 # open by configure. Here we exec the FD to /dev/null, effectively closing
1289 # config.log, so it can be properly (re)opened and appended to by config.lt.
1290 -lt_cl_success=:
1291 -test "$silent" = yes &&
1292 - lt_config_lt_args="$lt_config_lt_args --quiet"
1293 -exec AS_MESSAGE_LOG_FD>/dev/null
1294 -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
1295 -exec AS_MESSAGE_LOG_FD>>config.log
1296 -$lt_cl_success || AS_EXIT(1)
1297 +if test "$no_create" != yes; then
1298 + lt_cl_success=:
1299 + test "$silent" = yes &&
1300 + lt_config_lt_args="$lt_config_lt_args --quiet"
1301 + exec AS_MESSAGE_LOG_FD>/dev/null
1302 + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
1303 + exec AS_MESSAGE_LOG_FD>>config.log
1304 + $lt_cl_success || AS_EXIT(1)
1305 +fi
1306 ])# LT_OUTPUT
1309 @@ -1888,13 +1855,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)
1310 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
1311 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
1312 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
1313 -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
1314 dnl aclocal-1.4 backwards compatibility:
1315 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
1316 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
1317 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
1318 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
1319 -dnl AC_DEFUN([AC_LIBTOOL_RC], [])
1322 # _LT_TAG_COMPILER
1323 @@ -1999,31 +1964,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
1324 [lt_cv_ld_exported_symbols_list=no])
1325 LDFLAGS="$save_LDFLAGS"
1326 ])
1327 - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
1328 - [lt_cv_ld_force_load=no
1329 - cat > conftest.c << _LT_EOF
1330 -int forced_loaded() { return 2;}
1331 -_LT_EOF
1332 - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
1333 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
1334 - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1335 - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
1336 - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
1337 - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
1338 - cat > conftest.c << _LT_EOF
1339 -int main() { return 0;}
1340 -_LT_EOF
1341 - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
1342 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
1343 - _lt_result=$?
1344 - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1345 - lt_cv_ld_force_load=yes
1346 - else
1347 - cat conftest.err >&AS_MESSAGE_LOG_FD
1348 - fi
1349 - rm -f conftest.err libconftest.a conftest conftest.c
1350 - rm -rf conftest.dSYM
1351 - ])
1352 case $host_os in
1353 rhapsody* | darwin1.[[012]])
1354 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
1355 @@ -2051,7 +1991,7 @@ _LT_EOF
1356 else
1357 _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
1358 fi
1359 - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
1360 + if test "$DSYMUTIL" != ":"; then
1361 _lt_dsymutil='~$DSYMUTIL $lib || :'
1362 else
1363 _lt_dsymutil=
1364 @@ -2071,11 +2011,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
1365 _LT_TAGVAR(hardcode_direct, $1)=no
1366 _LT_TAGVAR(hardcode_automatic, $1)=yes
1367 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1368 - if test "$lt_cv_ld_force_load" = "yes"; then
1369 - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
1370 - else
1371 - _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1372 - fi
1373 + _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1374 _LT_TAGVAR(link_all_deplibs, $1)=yes
1375 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
1376 case $cc_basename in
1377 @@ -2083,7 +2019,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
1378 *) _lt_dar_can_shared=$GCC ;;
1379 esac
1380 if test "$_lt_dar_can_shared" = "yes"; then
1381 - output_verbose_link_cmd=func_echo_all
1382 + output_verbose_link_cmd=echo
1383 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
1384 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1385 _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
1386 @@ -2129,65 +2065,170 @@ if test -z "$aix_libpath"; then aix_libp
1387 # _LT_SHELL_INIT(ARG)
1388 # -------------------
1389 m4_define([_LT_SHELL_INIT],
1390 -[m4_divert_text([M4SH-INIT], [$1
1391 -])])# _LT_SHELL_INIT
1392 -
1393 +[ifdef([AC_DIVERSION_NOTICE],
1394 + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
1395 + [AC_DIVERT_PUSH(NOTICE)])
1396 +$1
1397 +AC_DIVERT_POP
1398 +])# _LT_SHELL_INIT
1401 # _LT_PROG_ECHO_BACKSLASH
1402 # -----------------------
1403 -# Find how we can fake an echo command that does not interpret backslash.
1404 -# In particular, with Autoconf 2.60 or later we add some code to the start
1405 -# of the generated configure script which will find a shell with a builtin
1406 -# printf (which we can use as an echo command).
1407 +# Add some code to the start of the generated configure script which
1408 +# will find an echo command which doesn't interpret backslashes.
1409 m4_defun([_LT_PROG_ECHO_BACKSLASH],
1410 -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1411 -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
1412 -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1413 -
1414 -AC_MSG_CHECKING([how to print strings])
1415 -# Test print first, because it will be a builtin if present.
1416 -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
1417 - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1418 - ECHO='print -r --'
1419 -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
1420 - ECHO='printf %s\n'
1421 +[_LT_SHELL_INIT([
1422 +# Check that we are running under the correct shell.
1423 +SHELL=${CONFIG_SHELL-/bin/sh}
1424 +
1425 +case X$lt_ECHO in
1426 +X*--fallback-echo)
1427 + # Remove one level of quotation (which was required for Make).
1428 + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
1429 + ;;
1430 +esac
1431 +
1432 +ECHO=${lt_ECHO-echo}
1433 +if test "X[$]1" = X--no-reexec; then
1434 + # Discard the --no-reexec flag, and continue.
1435 + shift
1436 +elif test "X[$]1" = X--fallback-echo; then
1437 + # Avoid inline document here, it may be left over
1438 + :
1439 +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
1440 + # Yippee, $ECHO works!
1441 + :
1442 else
1443 - # Use this function as a fallback that always works.
1444 - func_fallback_echo ()
1445 - {
1446 - eval 'cat <<_LTECHO_EOF
1447 -$[]1
1448 -_LTECHO_EOF'
1449 - }
1450 - ECHO='func_fallback_echo'
1451 + # Restart under the correct shell.
1452 + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
1453 fi
1455 -# func_echo_all arg...
1456 -# Invoke $ECHO with all args, space-separated.
1457 -func_echo_all ()
1458 -{
1459 - $ECHO "$*"
1460 -}
1461 +if test "X[$]1" = X--fallback-echo; then
1462 + # used as fallback echo
1463 + shift
1464 + cat <<_LT_EOF
1465 +[$]*
1466 +_LT_EOF
1467 + exit 0
1468 +fi
1470 -case "$ECHO" in
1471 - printf*) AC_MSG_RESULT([printf]) ;;
1472 - print*) AC_MSG_RESULT([print -r]) ;;
1473 - *) AC_MSG_RESULT([cat]) ;;
1474 -esac
1475 +# The HP-UX ksh and POSIX shell print the target directory to stdout
1476 +# if CDPATH is set.
1477 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1478 +
1479 +if test -z "$lt_ECHO"; then
1480 + if test "X${echo_test_string+set}" != Xset; then
1481 + # find a string as large as possible, as long as the shell can cope with it
1482 + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
1483 + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
1484 + if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
1485 + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
1486 + then
1487 + break
1488 + fi
1489 + done
1490 + fi
1491 +
1492 + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1493 + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1494 + test "X$echo_testing_string" = "X$echo_test_string"; then
1495 + :
1496 + else
1497 + # The Solaris, AIX, and Digital Unix default echo programs unquote
1498 + # backslashes. This makes it impossible to quote backslashes using
1499 + # echo "$something" | sed 's/\\/\\\\/g'
1500 + #
1501 + # So, first we look for a working echo in the user's PATH.
1502 +
1503 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1504 + for dir in $PATH /usr/ucb; do
1505 + IFS="$lt_save_ifs"
1506 + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
1507 + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
1508 + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
1509 + test "X$echo_testing_string" = "X$echo_test_string"; then
1510 + ECHO="$dir/echo"
1511 + break
1512 + fi
1513 + done
1514 + IFS="$lt_save_ifs"
1515 +
1516 + if test "X$ECHO" = Xecho; then
1517 + # We didn't find a better echo, so look for alternatives.
1518 + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
1519 + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
1520 + test "X$echo_testing_string" = "X$echo_test_string"; then
1521 + # This shell has a builtin print -r that does the trick.
1522 + ECHO='print -r'
1523 + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
1524 + test "X$CONFIG_SHELL" != X/bin/ksh; then
1525 + # If we have ksh, try running configure again with it.
1526 + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
1527 + export ORIGINAL_CONFIG_SHELL
1528 + CONFIG_SHELL=/bin/ksh
1529 + export CONFIG_SHELL
1530 + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
1531 + else
1532 + # Try using printf.
1533 + ECHO='printf %s\n'
1534 + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1535 + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1536 + test "X$echo_testing_string" = "X$echo_test_string"; then
1537 + # Cool, printf works
1538 + :
1539 + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1540 + test "X$echo_testing_string" = 'X\t' &&
1541 + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1542 + test "X$echo_testing_string" = "X$echo_test_string"; then
1543 + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
1544 + export CONFIG_SHELL
1545 + SHELL="$CONFIG_SHELL"
1546 + export SHELL
1547 + ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1548 + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1549 + test "X$echo_testing_string" = 'X\t' &&
1550 + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1551 + test "X$echo_testing_string" = "X$echo_test_string"; then
1552 + ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1553 + else
1554 + # maybe with a smaller string...
1555 + prev=:
1556 +
1557 + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
1558 + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
1559 + then
1560 + break
1561 + fi
1562 + prev="$cmd"
1563 + done
1564 +
1565 + if test "$prev" != 'sed 50q "[$]0"'; then
1566 + echo_test_string=`eval $prev`
1567 + export echo_test_string
1568 + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
1569 + else
1570 + # Oops. We lost completely, so just stick with echo.
1571 + ECHO=echo
1572 + fi
1573 + fi
1574 + fi
1575 + fi
1576 + fi
1577 +fi
1579 -m4_ifdef([_AS_DETECT_SUGGESTED],
1580 -[_AS_DETECT_SUGGESTED([
1581 - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
1582 - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1583 - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
1584 - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1585 - PATH=/empty FPATH=/empty; export PATH FPATH
1586 - test "X`printf %s $ECHO`" = "X$ECHO" \
1587 - || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
1588 +# Copy echo and quote the copy suitably for passing to libtool from
1589 +# the Makefile, instead of quoting the original, which is used later.
1590 +lt_ECHO=$ECHO
1591 +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
1592 + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
1593 +fi
1595 +AC_SUBST(lt_ECHO)
1596 +])
1597 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
1598 -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
1599 +_LT_DECL([], [ECHO], [1],
1600 + [An echo program that does not interpret backslashes])
1601 ])# _LT_PROG_ECHO_BACKSLASH
1604 @@ -2219,7 +2260,7 @@ ia64-*-hpux*)
1605 ;;
1606 *-*-irix6*)
1607 # Find out which ABI we are using.
1608 - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
1609 + echo '[#]line __oline__ "configure"' > conftest.$ac_ext
1610 if AC_TRY_EVAL(ac_compile); then
1611 if test "$lt_cv_prog_gnu_ld" = yes; then
1612 case `/usr/bin/file conftest.$ac_objext` in
1613 @@ -2371,19 +2412,10 @@ if test -n "$RANLIB"; then
1614 esac
1615 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1616 fi
1617 -
1618 -case $host_os in
1619 - darwin*)
1620 - lock_old_archive_extraction=yes ;;
1621 - *)
1622 - lock_old_archive_extraction=no ;;
1623 -esac
1624 _LT_DECL([], [old_postinstall_cmds], [2])
1625 _LT_DECL([], [old_postuninstall_cmds], [2])
1626 _LT_TAGDECL([], [old_archive_cmds], [2],
1627 [Commands used to build an old-style archive])
1628 -_LT_DECL([], [lock_old_archive_extraction], [0],
1629 - [Whether to use a lock for old archive extraction])
1630 ])# _LT_CMD_OLD_ARCHIVE
1633 @@ -2408,15 +2440,15 @@ AC_CACHE_CHECK([$1], [$2],
1634 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1635 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1636 -e 's:$: $lt_compiler_flag:'`
1637 - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1638 + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1639 (eval "$lt_compile" 2>conftest.err)
1640 ac_status=$?
1641 cat conftest.err >&AS_MESSAGE_LOG_FD
1642 - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1643 + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1644 if (exit $ac_status) && test -s "$ac_outfile"; then
1645 # The compiler can only warn and ignore the option if not recognized
1646 # So say no if there are warnings other than the usual output.
1647 - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
1648 + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1649 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1650 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1651 $2=yes
1652 @@ -2456,7 +2488,7 @@ AC_CACHE_CHECK([$1], [$2],
1653 if test -s conftest.err; then
1654 # Append any errors to the config.log.
1655 cat conftest.err 1>&AS_MESSAGE_LOG_FD
1656 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
1657 + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1658 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1659 if diff conftest.exp conftest.er2 >/dev/null; then
1660 $2=yes
1661 @@ -2519,11 +2551,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
1662 lt_cv_sys_max_cmd_len=8192;
1663 ;;
1665 - mint*)
1666 - # On MiNT this can take a long time and run out of memory.
1667 - lt_cv_sys_max_cmd_len=8192;
1668 - ;;
1669 -
1670 amigaos*)
1671 # On AmigaOS with pdksh, this test takes hours, literally.
1672 # So we just punt and use a minimum line length of 8192.
1673 @@ -2588,8 +2615,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
1674 # If test is not a shell built-in, we'll probably end up computing a
1675 # maximum length that is only half of the actual maximum length, but
1676 # we can't tell.
1677 - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
1678 - = "X$teststring$teststring"; } >/dev/null 2>&1 &&
1679 + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
1680 + = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
1681 test $i != 17 # 1/2 MB should be enough
1682 do
1683 i=`expr $i + 1`
1684 @@ -2640,7 +2667,7 @@ else
1685 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1686 lt_status=$lt_dlunknown
1687 cat > conftest.$ac_ext <<_LT_EOF
1688 -[#line $LINENO "configure"
1689 +[#line __oline__ "configure"
1690 #include "confdefs.h"
1692 #if HAVE_DLFCN_H
1693 @@ -2681,13 +2708,7 @@ else
1694 # endif
1695 #endif
1697 -/* When -fvisbility=hidden is used, assume the code has been annotated
1698 - correspondingly for the symbols needed. */
1699 -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1700 -void fnord () __attribute__((visibility("default")));
1701 -#endif
1702 -
1703 -void fnord () { int i=42; }
1704 +void fnord() { int i=42;}
1705 int main ()
1706 {
1707 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1708 @@ -2696,11 +2717,7 @@ int main ()
1709 if (self)
1710 {
1711 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
1712 - else
1713 - {
1714 - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1715 - else puts (dlerror ());
1716 - }
1717 + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1718 /* dlclose (self); */
1719 }
1720 else
1721 @@ -2876,16 +2893,16 @@ AC_CACHE_CHECK([if $compiler supports -c
1722 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1723 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1724 -e 's:$: $lt_compiler_flag:'`
1725 - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1726 + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1727 (eval "$lt_compile" 2>out/conftest.err)
1728 ac_status=$?
1729 cat out/conftest.err >&AS_MESSAGE_LOG_FD
1730 - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1731 + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1732 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1733 then
1734 # The compiler can only warn and ignore the option if not recognized
1735 # So say no if there are warnings
1736 - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
1737 + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
1738 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
1739 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
1740 _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
1741 @@ -3044,7 +3061,6 @@ m4_require([_LT_DECL_EGREP])dnl
1742 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1743 m4_require([_LT_DECL_OBJDUMP])dnl
1744 m4_require([_LT_DECL_SED])dnl
1745 -m4_require([_LT_CHECK_SHELL_FEATURES])dnl
1746 AC_MSG_CHECKING([dynamic linker characteristics])
1747 m4_if([$1],
1748 [], [
1749 @@ -3053,23 +3069,16 @@ if test "$GCC" = yes; then
1750 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
1751 *) lt_awk_arg="/^libraries:/" ;;
1752 esac
1753 - case $host_os in
1754 - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
1755 - *) lt_sed_strip_eq="s,=/,/,g" ;;
1756 - esac
1757 - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
1758 - case $lt_search_path_spec in
1759 - *\;*)
1760 + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
1761 + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
1762 # if the path contains ";" then we assume it to be the separator
1763 # otherwise default to the standard path separator (i.e. ":") - it is
1764 # assumed that no part of a normal pathname contains ";" but that should
1765 # okay in the real world where ";" in dirpaths is itself problematic.
1766 - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
1767 - ;;
1768 - *)
1769 - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
1770 - ;;
1771 - esac
1772 + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
1773 + else
1774 + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1775 + fi
1776 # Ok, now we have the path, separated by spaces, we can step through it
1777 # and add multilib dir if necessary.
1778 lt_tmp_lt_search_path_spec=
1779 @@ -3082,7 +3091,7 @@ if test "$GCC" = yes; then
1780 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
1781 fi
1782 done
1783 - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
1784 + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
1785 BEGIN {RS=" "; FS="/|\n";} {
1786 lt_foo="";
1787 lt_count=0;
1788 @@ -3102,13 +3111,7 @@ BEGIN {RS=" "; FS="/|\n";} {
1789 if (lt_foo != "") { lt_freq[[lt_foo]]++; }
1790 if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
1791 }'`
1792 - # AWK program above erroneously prepends '/' to C:/dos/paths
1793 - # for these hosts.
1794 - case $host_os in
1795 - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
1796 - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
1797 - esac
1798 - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
1799 + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
1800 else
1801 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
1802 fi])
1803 @@ -3196,7 +3199,7 @@ amigaos*)
1804 m68k)
1805 library_names_spec='$libname.ixlibrary $libname.a'
1806 # Create ${libname}_ixlibrary.a entries in /sys/libs.
1807 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
1808 + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
1809 ;;
1810 esac
1811 ;;
1812 @@ -3249,12 +3252,23 @@ cygwin* | mingw* | pw32* | cegcc*)
1813 cygwin*)
1814 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
1815 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1816 -m4_if([$1], [],[
1817 - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
1818 + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
1819 ;;
1820 mingw* | cegcc*)
1821 # MinGW DLLs use traditional 'lib' prefix
1822 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1823 + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
1824 + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
1825 + # It is most probably a Windows format PATH printed by
1826 + # mingw gcc, but we are running on Cygwin. Gcc prints its search
1827 + # path with ; separators, and with drive letters. We can handle the
1828 + # drive letters (cygwin fileutils understands them), so leave them,
1829 + # especially as we might pass files found there to a mingw objdump,
1830 + # which wouldn't understand a cygwinified path. Ahh.
1831 + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1832 + else
1833 + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1834 + fi
1835 ;;
1836 pw32*)
1837 # pw32 DLLs use 'pw' prefix rather than 'lib'
1838 @@ -3354,19 +3368,6 @@ gnu*)
1839 hardcode_into_libs=yes
1840 ;;
1842 -haiku*)
1843 - version_type=linux
1844 - need_lib_prefix=no
1845 - need_version=no
1846 - dynamic_linker="$host_os runtime_loader"
1847 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1848 - soname_spec='${libname}${release}${shared_ext}$major'
1849 - shlibpath_var=LIBRARY_PATH
1850 - shlibpath_overrides_runpath=yes
1851 - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1852 - hardcode_into_libs=yes
1853 - ;;
1854 -
1855 hpux9* | hpux10* | hpux11*)
1856 # Give a soname corresponding to the major version so that dld.sl refuses to
1857 # link against other versions.
1858 @@ -3409,10 +3410,8 @@ hpux9* | hpux10* | hpux11*)
1859 soname_spec='${libname}${release}${shared_ext}$major'
1860 ;;
1861 esac
1862 - # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
1863 + # HP-UX runs *really* slowly unless shared libraries are mode 555.
1864 postinstall_cmds='chmod 555 $lib'
1865 - # or fails outright, so override atomically:
1866 - install_override_mode=555
1867 ;;
1869 interix[[3-9]]*)
1870 @@ -3479,21 +3478,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1871 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
1872 shlibpath_var=LD_LIBRARY_PATH
1873 shlibpath_overrides_runpath=no
1874 -
1875 # Some binutils ld are patched to set DT_RUNPATH
1876 - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
1877 - [lt_cv_shlibpath_overrides_runpath=no
1878 - save_LDFLAGS=$LDFLAGS
1879 - save_libdir=$libdir
1880 - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
1881 - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
1882 - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
1883 - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
1884 - [lt_cv_shlibpath_overrides_runpath=yes])])
1885 - LDFLAGS=$save_LDFLAGS
1886 - libdir=$save_libdir
1887 - ])
1888 - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
1889 + save_LDFLAGS=$LDFLAGS
1890 + save_libdir=$libdir
1891 + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
1892 + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
1893 + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
1894 + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
1895 + [shlibpath_overrides_runpath=yes])])
1896 + LDFLAGS=$save_LDFLAGS
1897 + libdir=$save_libdir
1899 # This implies no fast_install, which is unacceptable.
1900 # Some rework will be needed to allow for fast_install
1901 @@ -3502,7 +3496,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1903 # Append ld.so.conf contents to the search path
1904 if test -f /etc/ld.so.conf; then
1905 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
1906 + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1907 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1908 fi
1910 @@ -3515,6 +3509,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1911 dynamic_linker='GNU/Linux ld.so'
1912 ;;
1914 +netbsdelf*-gnu)
1915 + version_type=linux
1916 + need_lib_prefix=no
1917 + need_version=no
1918 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1919 + soname_spec='${libname}${release}${shared_ext}$major'
1920 + shlibpath_var=LD_LIBRARY_PATH
1921 + shlibpath_overrides_runpath=no
1922 + hardcode_into_libs=yes
1923 + dynamic_linker='NetBSD ld.elf_so'
1924 + ;;
1925 +
1926 netbsd*)
1927 version_type=sunos
1928 need_lib_prefix=no
1929 @@ -3735,8 +3741,6 @@ _LT_DECL([], [library_names_spec], [1],
1930 The last name is the one that the linker finds with -lNAME]])
1931 _LT_DECL([], [soname_spec], [1],
1932 [[The coded name of the library, if different from the real name]])
1933 -_LT_DECL([], [install_override_mode], [1],
1934 - [Permission mode override for installation of shared libraries])
1935 _LT_DECL([], [postinstall_cmds], [2],
1936 [Command to use after installation of a shared archive])
1937 _LT_DECL([], [postuninstall_cmds], [2],
1938 @@ -3849,7 +3853,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
1939 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1940 m4_require([_LT_DECL_SED])dnl
1941 m4_require([_LT_DECL_EGREP])dnl
1942 -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
1944 AC_ARG_WITH([gnu-ld],
1945 [AS_HELP_STRING([--with-gnu-ld],
1946 @@ -3979,8 +3982,8 @@ case $host_os in
1947 fi
1948 ;;
1949 esac
1950 -_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
1951 -_LT_TAGDECL([], [reload_cmds], [2])dnl
1952 +_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
1953 +_LT_DECL([], [reload_cmds], [2])dnl
1954 ])# _LT_CMD_RELOAD
1957 @@ -4032,18 +4035,16 @@ mingw* | pw32*)
1958 # Base MSYS/MinGW do not provide the 'file' command needed by
1959 # func_win32_libid shell function, so use a weaker test based on 'objdump',
1960 # unless we find 'file', for example because we are cross-compiling.
1961 - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
1962 - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
1963 + if ( file / ) >/dev/null 2>&1; then
1964 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
1965 lt_cv_file_magic_cmd='func_win32_libid'
1966 else
1967 - # Keep this pattern in sync with the one in func_win32_libid.
1968 - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
1969 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
1970 lt_cv_file_magic_cmd='$OBJDUMP -f'
1971 fi
1972 ;;
1974 -cegcc*)
1975 +cegcc)
1976 # use the weaker test based on 'objdump'. See mingw*.
1977 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
1978 lt_cv_file_magic_cmd='$OBJDUMP -f'
1979 @@ -4073,10 +4074,6 @@ gnu*)
1980 lt_cv_deplibs_check_method=pass_all
1981 ;;
1983 -haiku*)
1984 - lt_cv_deplibs_check_method=pass_all
1985 - ;;
1986 -
1987 hpux10.20* | hpux11*)
1988 lt_cv_file_magic_cmd=/usr/bin/file
1989 case $host_cpu in
1990 @@ -4085,11 +4082,11 @@ hpux10.20* | hpux11*)
1991 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
1992 ;;
1993 hppa*64*)
1994 - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
1995 + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
1996 lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
1997 ;;
1998 *)
1999 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
2000 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
2001 lt_cv_file_magic_test_file=/usr/lib/libc.sl
2002 ;;
2003 esac
2004 @@ -4115,7 +4112,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2005 lt_cv_deplibs_check_method=pass_all
2006 ;;
2008 -netbsd*)
2009 +netbsd* | netbsdelf*-gnu)
2010 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
2011 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
2012 else
2013 @@ -4253,19 +4250,7 @@ if test "$lt_cv_path_NM" != "no"; then
2014 NM="$lt_cv_path_NM"
2015 else
2016 # Didn't find any BSD compatible name lister, look for dumpbin.
2017 - if test -n "$DUMPBIN"; then :
2018 - # Let the user override the test.
2019 - else
2020 - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
2021 - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
2022 - *COFF*)
2023 - DUMPBIN="$DUMPBIN -symbols"
2024 - ;;
2025 - *)
2026 - DUMPBIN=:
2027 - ;;
2028 - esac
2029 - fi
2030 + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
2031 AC_SUBST([DUMPBIN])
2032 if test "$DUMPBIN" != ":"; then
2033 NM="$DUMPBIN"
2034 @@ -4278,13 +4263,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-co
2035 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
2036 [lt_cv_nm_interface="BSD nm"
2037 echo "int some_variable = 0;" > conftest.$ac_ext
2038 - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
2039 + (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
2040 (eval "$ac_compile" 2>conftest.err)
2041 cat conftest.err >&AS_MESSAGE_LOG_FD
2042 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
2043 + (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
2044 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
2045 cat conftest.err >&AS_MESSAGE_LOG_FD
2046 - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
2047 + (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
2048 cat conftest.out >&AS_MESSAGE_LOG_FD
2049 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
2050 lt_cv_nm_interface="MS dumpbin"
2051 @@ -4307,7 +4292,7 @@ AC_DEFUN([LT_LIB_M],
2052 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
2053 LIBM=
2054 case $host in
2055 -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
2056 +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
2057 # These system don't have libm, or don't need it
2058 ;;
2059 *-ncr-sysv4.3*)
2060 @@ -4335,12 +4320,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
2061 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
2063 if test "$GCC" = yes; then
2064 - case $cc_basename in
2065 - nvcc*)
2066 - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
2067 - *)
2068 - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
2069 - esac
2070 + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
2072 _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
2073 lt_cv_prog_compiler_rtti_exceptions,
2074 @@ -4357,7 +4337,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_
2075 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
2076 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
2077 AC_REQUIRE([AC_PROG_CC])dnl
2078 -AC_REQUIRE([AC_PROG_AWK])dnl
2079 AC_REQUIRE([LT_PATH_NM])dnl
2080 AC_REQUIRE([LT_PATH_LD])dnl
2081 m4_require([_LT_DECL_SED])dnl
2082 @@ -4483,7 +4462,7 @@ _LT_EOF
2083 if AC_TRY_EVAL(ac_compile); then
2084 # Now try to grab the symbols.
2085 nlist=conftest.nm
2086 - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
2087 + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
2088 # Try sorting and uniquifying the output.
2089 if sort "$nlist" | uniq > "$nlist"T; then
2090 mv -f "$nlist"T "$nlist"
2091 @@ -4645,11 +4624,6 @@ m4_if([$1], [CXX], [
2092 # DJGPP does not support shared libraries at all
2093 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
2094 ;;
2095 - haiku*)
2096 - # PIC is the default for Haiku.
2097 - # The "-static" flag exists, but is broken.
2098 - _LT_TAGVAR(lt_prog_compiler_static, $1)=
2099 - ;;
2100 interix[[3-9]]*)
2101 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
2102 # Instead, we relocate shared libraries at runtime.
2103 @@ -4788,8 +4762,8 @@ m4_if([$1], [CXX], [
2104 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
2105 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
2106 ;;
2107 - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
2108 - # IBM XL 8.0, 9.0 on PPC and BlueGene
2109 + xlc* | xlC*)
2110 + # IBM XL 8.0 on PPC
2111 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2112 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
2113 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
2114 @@ -4819,7 +4793,7 @@ m4_if([$1], [CXX], [
2115 ;;
2116 esac
2117 ;;
2118 - netbsd*)
2119 + netbsd* | netbsdelf*-gnu)
2120 ;;
2121 *qnx* | *nto*)
2122 # QNX uses GNU C++, but need to define -shared option too, otherwise
2123 @@ -4851,7 +4825,7 @@ m4_if([$1], [CXX], [
2124 ;;
2125 solaris*)
2126 case $cc_basename in
2127 - CC* | sunCC*)
2128 + CC*)
2129 # Sun C++ 4.2, 5.x and Centerline C++
2130 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2131 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2132 @@ -4955,12 +4929,6 @@ m4_if([$1], [CXX], [
2133 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
2134 ;;
2136 - haiku*)
2137 - # PIC is the default for Haiku.
2138 - # The "-static" flag exists, but is broken.
2139 - _LT_TAGVAR(lt_prog_compiler_static, $1)=
2140 - ;;
2141 -
2142 hpux*)
2143 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
2144 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
2145 @@ -5003,13 +4971,6 @@ m4_if([$1], [CXX], [
2146 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
2147 ;;
2148 esac
2149 -
2150 - case $cc_basename in
2151 - nvcc*) # Cuda Compiler Driver 2.2
2152 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
2153 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
2154 - ;;
2155 - esac
2156 else
2157 # PORTME Check for flag to pass linker flags through the system compiler.
2158 case $host_os in
2159 @@ -5073,7 +5034,7 @@ m4_if([$1], [CXX], [
2160 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
2161 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
2162 ;;
2163 - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2164 + pgcc* | pgf77* | pgf90* | pgf95*)
2165 # Portland Group compilers (*not* the Pentium gcc compiler,
2166 # which looks to be a dead project)
2167 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2168 @@ -5085,26 +5046,26 @@ m4_if([$1], [CXX], [
2169 # All Alpha code is PIC.
2170 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
2171 ;;
2172 - xl* | bgxl* | bgf* | mpixl*)
2173 - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
2174 + xl*)
2175 + # IBM XL C 8.0/Fortran 10.1 on PPC
2176 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2177 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
2178 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
2179 ;;
2180 *)
2181 case `$CC -V 2>&1 | sed 5q` in
2182 - *Sun\ F* | *Sun*Fortran*)
2183 - # Sun Fortran 8.3 passes all unrecognized flags to the linker
2184 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2185 - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2186 - _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
2187 - ;;
2188 *Sun\ C*)
2189 # Sun C 5.9
2190 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2191 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2192 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2193 ;;
2194 + *Sun\ F*)
2195 + # Sun Fortran 8.3 passes all unrecognized flags to the linker
2196 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2197 + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2198 + _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
2199 + ;;
2200 esac
2201 ;;
2202 esac
2203 @@ -5135,7 +5096,7 @@ m4_if([$1], [CXX], [
2204 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2205 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2206 case $cc_basename in
2207 - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2208 + f77* | f90* | f95*)
2209 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
2210 *)
2211 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
2212 @@ -5245,10 +5206,8 @@ m4_if([$1], [CXX], [
2213 aix[[4-9]]*)
2214 # If we're using GNU nm, then we don't want the "-C" option.
2215 # -C means demangle to AIX nm, but means don't demangle with GNU nm
2216 - # Also, AIX nm treats weak defined symbols like other global defined
2217 - # symbols, whereas GNU nm marks them as "W".
2218 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
2219 - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2220 + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2221 else
2222 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2223 fi
2224 @@ -5259,6 +5218,9 @@ m4_if([$1], [CXX], [
2225 cygwin* | mingw* | cegcc*)
2226 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
2227 ;;
2228 + linux* | k*bsd*-gnu)
2229 + _LT_TAGVAR(link_all_deplibs, $1)=no
2230 + ;;
2231 *)
2232 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
2233 ;;
2234 @@ -5323,36 +5285,13 @@ dnl Note also adjust exclude_expsyms for
2235 openbsd*)
2236 with_gnu_ld=no
2237 ;;
2238 + linux* | k*bsd*-gnu)
2239 + _LT_TAGVAR(link_all_deplibs, $1)=no
2240 + ;;
2241 esac
2243 _LT_TAGVAR(ld_shlibs, $1)=yes
2244 -
2245 - # On some targets, GNU ld is compatible enough with the native linker
2246 - # that we're better off using the native interface for both.
2247 - lt_use_gnu_ld_interface=no
2248 if test "$with_gnu_ld" = yes; then
2249 - case $host_os in
2250 - aix*)
2251 - # The AIX port of GNU ld has always aspired to compatibility
2252 - # with the native linker. However, as the warning in the GNU ld
2253 - # block says, versions before 2.19.5* couldn't really create working
2254 - # shared libraries, regardless of the interface used.
2255 - case `$LD -v 2>&1` in
2256 - *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
2257 - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
2258 - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
2259 - *)
2260 - lt_use_gnu_ld_interface=yes
2261 - ;;
2262 - esac
2263 - ;;
2264 - *)
2265 - lt_use_gnu_ld_interface=yes
2266 - ;;
2267 - esac
2268 - fi
2269 -
2270 - if test "$lt_use_gnu_ld_interface" = yes; then
2271 # If archive_cmds runs LD, not CC, wlarc should be empty
2272 wlarc='${wl}'
2274 @@ -5386,12 +5325,11 @@ dnl Note also adjust exclude_expsyms for
2275 _LT_TAGVAR(ld_shlibs, $1)=no
2276 cat <<_LT_EOF 1>&2
2278 -*** Warning: the GNU linker, at least up to release 2.19, is reported
2279 +*** Warning: the GNU linker, at least up to release 2.9.1, is reported
2280 *** to be unable to reliably create shared libraries on AIX.
2281 *** Therefore, libtool is disabling shared libraries support. If you
2282 -*** really care for shared libraries, you may want to install binutils
2283 -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
2284 -*** You will then need to restart the configuration process.
2285 +*** really care for shared libraries, you may want to modify your PATH
2286 +*** so that a non-GNU linker is found, and then restart.
2288 _LT_EOF
2289 fi
2290 @@ -5427,7 +5365,6 @@ _LT_EOF
2291 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
2292 # as there is no search path for DLLs.
2293 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2294 - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
2295 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2296 _LT_TAGVAR(always_export_symbols, $1)=no
2297 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2298 @@ -5449,11 +5386,6 @@ _LT_EOF
2299 fi
2300 ;;
2302 - haiku*)
2303 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2304 - _LT_TAGVAR(link_all_deplibs, $1)=yes
2305 - ;;
2306 -
2307 interix[[3-9]]*)
2308 _LT_TAGVAR(hardcode_direct, $1)=no
2309 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
2310 @@ -5483,12 +5415,11 @@ _LT_EOF
2311 tmp_sharedflag='-shared'
2312 case $cc_basename,$host_cpu in
2313 pgcc*) # Portland Group C compiler
2314 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2315 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
2316 tmp_addflag=' $pic_flag'
2317 ;;
2318 - pgf77* | pgf90* | pgf95* | pgfortran*)
2319 - # Portland Group f77 and f90 compilers
2320 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2321 + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
2322 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
2323 tmp_addflag=' $pic_flag -Mnomain' ;;
2324 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
2325 tmp_addflag=' -i_dynamic' ;;
2326 @@ -5499,17 +5430,13 @@ _LT_EOF
2327 lf95*) # Lahey Fortran 8.1
2328 _LT_TAGVAR(whole_archive_flag_spec, $1)=
2329 tmp_sharedflag='--shared' ;;
2330 - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
2331 + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
2332 tmp_sharedflag='-qmkshrobj'
2333 tmp_addflag= ;;
2334 - nvcc*) # Cuda Compiler Driver 2.2
2335 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2336 - _LT_TAGVAR(compiler_needs_object, $1)=yes
2337 - ;;
2338 esac
2339 case `$CC -V 2>&1 | sed 5q` in
2340 *Sun\ C*) # Sun C 5.9
2341 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2342 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
2343 _LT_TAGVAR(compiler_needs_object, $1)=yes
2344 tmp_sharedflag='-G' ;;
2345 *Sun\ F*) # Sun Fortran 8.3
2346 @@ -5525,17 +5452,17 @@ _LT_EOF
2347 fi
2349 case $cc_basename in
2350 - xlf* | bgf* | bgxlf* | mpixlf*)
2351 + xlf*)
2352 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
2353 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
2354 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
2355 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
2356 - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2357 + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2358 if test "x$supports_anon_versioning" = xyes; then
2359 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
2360 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2361 echo "local: *; };" >> $output_objdir/$libname.ver~
2362 - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2363 + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2364 fi
2365 ;;
2366 esac
2367 @@ -5544,7 +5471,7 @@ _LT_EOF
2368 fi
2369 ;;
2371 - netbsd*)
2372 + netbsd* | netbsdelf*-gnu)
2373 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
2374 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2375 wlarc=
2376 @@ -5656,10 +5583,8 @@ _LT_EOF
2377 else
2378 # If we're using GNU nm, then we don't want the "-C" option.
2379 # -C means demangle to AIX nm, but means don't demangle with GNU nm
2380 - # Also, AIX nm treats weak defined symbols like other global
2381 - # defined symbols, whereas GNU nm marks them as "W".
2382 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
2383 - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2384 + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2385 else
2386 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2387 fi
2388 @@ -5721,6 +5646,7 @@ _LT_EOF
2389 if test "$aix_use_runtimelinking" = yes; then
2390 shared_flag="$shared_flag "'${wl}-G'
2391 fi
2392 + _LT_TAGVAR(link_all_deplibs, $1)=no
2393 else
2394 # not using gcc
2395 if test "$host_cpu" = ia64; then
2396 @@ -5748,7 +5674,7 @@ _LT_EOF
2397 # empty executable.
2398 _LT_SYS_MODULE_PATH_AIX
2399 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2400 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2401 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2402 else
2403 if test "$host_cpu" = ia64; then
2404 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2405 @@ -5763,13 +5689,8 @@ _LT_EOF
2406 # -berok will link without error, but may produce a broken library.
2407 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
2408 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
2409 - if test "$with_gnu_ld" = yes; then
2410 - # We only use this code for GNU lds that support --whole-archive.
2411 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2412 - else
2413 - # Exported symbols can be pulled into shared objects from archives
2414 - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2415 - fi
2416 + # Exported symbols can be pulled into shared objects from archives
2417 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2418 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2419 # This is similar to how AIX traditionally builds its shared libraries.
2420 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
2421 @@ -5808,7 +5729,7 @@ _LT_EOF
2422 # Tell ltmain to make .dll files, not .so files.
2423 shrext_cmds=".dll"
2424 # FIXME: Setting linknames here is a bad hack.
2425 - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2426 + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
2427 # The linker will automatically build a .lib file if we build a DLL.
2428 _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
2429 # FIXME: Should let the user specify the lib program.
2430 @@ -5875,7 +5796,7 @@ _LT_EOF
2431 ;;
2433 hpux10*)
2434 - if test "$GCC" = yes && test "$with_gnu_ld" = no; then
2435 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
2436 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2437 else
2438 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
2439 @@ -5894,7 +5815,7 @@ _LT_EOF
2440 ;;
2442 hpux11*)
2443 - if test "$GCC" = yes && test "$with_gnu_ld" = no; then
2444 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
2445 case $host_cpu in
2446 hppa*64*)
2447 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
2448 @@ -5915,14 +5836,7 @@ _LT_EOF
2449 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
2450 ;;
2451 *)
2452 - m4_if($1, [], [
2453 - # Older versions of the 11.00 compiler do not understand -b yet
2454 - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
2455 - _LT_LINKER_OPTION([if $CC understands -b],
2456 - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
2457 - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
2458 - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
2459 - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
2460 + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2461 ;;
2462 esac
2463 fi
2464 @@ -5950,19 +5864,19 @@ _LT_EOF
2466 irix5* | irix6* | nonstopux*)
2467 if test "$GCC" = yes; then
2468 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2469 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2470 # Try to use the -exported_symbol ld option, if it does not
2471 # work, assume that -exports_file does not work either and
2472 # implicitly export all symbols.
2473 save_LDFLAGS="$LDFLAGS"
2474 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
2475 AC_LINK_IFELSE(int foo(void) {},
2476 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
2477 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
2478 )
2479 LDFLAGS="$save_LDFLAGS"
2480 else
2481 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2482 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
2483 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2484 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
2485 fi
2486 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
2487 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2488 @@ -5971,7 +5885,7 @@ _LT_EOF
2489 _LT_TAGVAR(link_all_deplibs, $1)=yes
2490 ;;
2492 - netbsd*)
2493 + netbsd* | netbsdelf*-gnu)
2494 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
2495 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
2496 else
2497 @@ -6024,17 +5938,17 @@ _LT_EOF
2498 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2499 _LT_TAGVAR(hardcode_minus_L, $1)=yes
2500 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2501 - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
2502 + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
2503 _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
2504 ;;
2506 osf3*)
2507 if test "$GCC" = yes; then
2508 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2509 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2510 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2511 else
2512 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2513 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2514 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2515 fi
2516 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
2517 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2518 @@ -6044,13 +5958,13 @@ _LT_EOF
2519 osf4* | osf5*) # as osf3* with the addition of -msym flag
2520 if test "$GCC" = yes; then
2521 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2522 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2523 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2524 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2525 else
2526 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2527 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2528 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2529 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
2530 - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
2531 + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
2533 # Both c and cxx compiler support -rpath directly
2534 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
2535 @@ -6241,38 +6155,36 @@ x|xyes)
2536 # Test whether the compiler implicitly links with -lc since on some
2537 # systems, -lgcc has to come before -lc. If gcc already passes -lc
2538 # to ld, don't add -lc before -lgcc.
2539 - AC_CACHE_CHECK([whether -lc should be explicitly linked in],
2540 - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
2541 - [$RM conftest*
2542 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2543 -
2544 - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
2545 - soname=conftest
2546 - lib=conftest
2547 - libobjs=conftest.$ac_objext
2548 - deplibs=
2549 - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
2550 - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
2551 - compiler_flags=-v
2552 - linker_flags=-v
2553 - verstring=
2554 - output_objdir=.
2555 - libname=conftest
2556 - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
2557 - _LT_TAGVAR(allow_undefined_flag, $1)=
2558 - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
2559 - then
2560 - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2561 - else
2562 - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2563 - fi
2564 - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
2565 - else
2566 - cat conftest.err 1>&5
2567 - fi
2568 - $RM conftest*
2569 - ])
2570 - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
2571 + AC_MSG_CHECKING([whether -lc should be explicitly linked in])
2572 + $RM conftest*
2573 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2574 +
2575 + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
2576 + soname=conftest
2577 + lib=conftest
2578 + libobjs=conftest.$ac_objext
2579 + deplibs=
2580 + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
2581 + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
2582 + compiler_flags=-v
2583 + linker_flags=-v
2584 + verstring=
2585 + output_objdir=.
2586 + libname=conftest
2587 + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
2588 + _LT_TAGVAR(allow_undefined_flag, $1)=
2589 + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
2590 + then
2591 + _LT_TAGVAR(archive_cmds_need_lc, $1)=no
2592 + else
2593 + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2594 + fi
2595 + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
2596 + else
2597 + cat conftest.err 1>&5
2598 + fi
2599 + $RM conftest*
2600 + AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
2601 ;;
2602 esac
2603 fi
2604 @@ -6438,14 +6350,14 @@ CC="$lt_save_CC"
2605 ])# _LT_LANG_C_CONFIG
2608 -# _LT_LANG_CXX_CONFIG([TAG])
2609 -# --------------------------
2610 -# Ensure that the configuration variables for a C++ compiler are suitably
2611 -# defined. These variables are subsequently used by _LT_CONFIG to write
2612 -# the compiler configuration to `libtool'.
2613 -m4_defun([_LT_LANG_CXX_CONFIG],
2614 -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2615 -m4_require([_LT_DECL_EGREP])dnl
2616 +# _LT_PROG_CXX
2617 +# ------------
2618 +# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
2619 +# compiler, we have our own version here.
2620 +m4_defun([_LT_PROG_CXX],
2621 +[
2622 +pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
2623 +AC_PROG_CXX
2624 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
2625 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
2626 (test "X$CXX" != "Xg++"))) ; then
2627 @@ -6453,6 +6365,22 @@ if test -n "$CXX" && ( test "X$CXX" != "
2628 else
2629 _lt_caught_CXX_error=yes
2630 fi
2631 +popdef([AC_MSG_ERROR])
2632 +])# _LT_PROG_CXX
2633 +
2634 +dnl aclocal-1.4 backwards compatibility:
2635 +dnl AC_DEFUN([_LT_PROG_CXX], [])
2636 +
2637 +
2638 +# _LT_LANG_CXX_CONFIG([TAG])
2639 +# --------------------------
2640 +# Ensure that the configuration variables for a C++ compiler are suitably
2641 +# defined. These variables are subsequently used by _LT_CONFIG to write
2642 +# the compiler configuration to `libtool'.
2643 +m4_defun([_LT_LANG_CXX_CONFIG],
2644 +[AC_REQUIRE([_LT_PROG_CXX])dnl
2645 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2646 +m4_require([_LT_DECL_EGREP])dnl
2648 AC_LANG_PUSH(C++)
2649 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
2650 @@ -6474,8 +6402,6 @@ _LT_TAGVAR(module_cmds, $1)=
2651 _LT_TAGVAR(module_expsym_cmds, $1)=
2652 _LT_TAGVAR(link_all_deplibs, $1)=unknown
2653 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2654 -_LT_TAGVAR(reload_flag, $1)=$reload_flag
2655 -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2656 _LT_TAGVAR(no_undefined_flag, $1)=
2657 _LT_TAGVAR(whole_archive_flag_spec, $1)=
2658 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
2659 @@ -6578,7 +6504,7 @@ if test "$_lt_caught_CXX_error" != yes;
2660 # Commands to make compiler produce verbose output that lists
2661 # what "hidden" libraries, object files and flags are used when
2662 # linking a shared library.
2663 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2664 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2666 else
2667 GXX=no
2668 @@ -6690,7 +6616,7 @@ if test "$_lt_caught_CXX_error" != yes;
2669 _LT_SYS_MODULE_PATH_AIX
2670 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2672 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2673 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2674 else
2675 if test "$host_cpu" = ia64; then
2676 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2677 @@ -6705,13 +6631,8 @@ if test "$_lt_caught_CXX_error" != yes;
2678 # -berok will link without error, but may produce a broken library.
2679 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
2680 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
2681 - if test "$with_gnu_ld" = yes; then
2682 - # We only use this code for GNU lds that support --whole-archive.
2683 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2684 - else
2685 - # Exported symbols can be pulled into shared objects from archives
2686 - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2687 - fi
2688 + # Exported symbols can be pulled into shared objects from archives
2689 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2690 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2691 # This is similar to how AIX traditionally builds its shared
2692 # libraries.
2693 @@ -6744,7 +6665,6 @@ if test "$_lt_caught_CXX_error" != yes;
2694 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
2695 # as there is no search path for DLLs.
2696 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2697 - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
2698 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2699 _LT_TAGVAR(always_export_symbols, $1)=no
2700 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2701 @@ -6805,11 +6725,6 @@ if test "$_lt_caught_CXX_error" != yes;
2702 gnu*)
2703 ;;
2705 - haiku*)
2706 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2707 - _LT_TAGVAR(link_all_deplibs, $1)=yes
2708 - ;;
2709 -
2710 hpux9*)
2711 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
2712 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
2713 @@ -6834,7 +6749,7 @@ if test "$_lt_caught_CXX_error" != yes;
2714 # explicitly linking system object files so we need to strip them
2715 # from the output so that they don't get included in the library
2716 # dependencies.
2717 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
2718 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2719 ;;
2720 *)
2721 if test "$GXX" = yes; then
2722 @@ -6899,7 +6814,7 @@ if test "$_lt_caught_CXX_error" != yes;
2723 # explicitly linking system object files so we need to strip them
2724 # from the output so that they don't get included in the library
2725 # dependencies.
2726 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
2727 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2728 ;;
2729 *)
2730 if test "$GXX" = yes; then
2731 @@ -6942,7 +6857,7 @@ if test "$_lt_caught_CXX_error" != yes;
2732 case $cc_basename in
2733 CC*)
2734 # SGI C++
2735 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2736 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2738 # Archives containing C++ object files must be created using
2739 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
2740 @@ -6953,9 +6868,9 @@ if test "$_lt_caught_CXX_error" != yes;
2741 *)
2742 if test "$GXX" = yes; then
2743 if test "$with_gnu_ld" = no; then
2744 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2745 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2746 else
2747 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
2748 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
2749 fi
2750 fi
2751 _LT_TAGVAR(link_all_deplibs, $1)=yes
2752 @@ -6984,7 +6899,7 @@ if test "$_lt_caught_CXX_error" != yes;
2753 # explicitly linking system object files so we need to strip them
2754 # from the output so that they don't get included in the library
2755 # dependencies.
2756 - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
2757 + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2759 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
2760 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2761 @@ -7021,26 +6936,26 @@ if test "$_lt_caught_CXX_error" != yes;
2762 pgCC* | pgcpp*)
2763 # Portland Group C++ compiler
2764 case `$CC -V` in
2765 - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
2766 + *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
2767 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
2768 rm -rf $tpldir~
2769 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
2770 - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
2771 + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
2772 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
2773 rm -rf $tpldir~
2774 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
2775 - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
2776 + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
2777 $RANLIB $oldlib'
2778 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
2779 rm -rf $tpldir~
2780 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
2781 - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2782 + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2783 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
2784 rm -rf $tpldir~
2785 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
2786 - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2787 + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2788 ;;
2789 - *) # Version 6 and above use weak symbols
2790 + *) # Version 6 will use weak symbols
2791 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2792 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2793 ;;
2794 @@ -7048,7 +6963,7 @@ if test "$_lt_caught_CXX_error" != yes;
2796 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
2797 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2798 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2799 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
2800 ;;
2801 cxx*)
2802 # Compaq C++
2803 @@ -7067,9 +6982,9 @@ if test "$_lt_caught_CXX_error" != yes;
2804 # explicitly linking system object files so we need to strip them
2805 # from the output so that they don't get included in the library
2806 # dependencies.
2807 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
2808 + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2809 ;;
2810 - xl* | mpixl* | bgxl*)
2811 + xl*)
2812 # IBM XL 8.0 on PPC, with GNU ld
2813 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2814 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2815 @@ -7089,13 +7004,13 @@ if test "$_lt_caught_CXX_error" != yes;
2816 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2817 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
2818 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
2819 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2820 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
2821 _LT_TAGVAR(compiler_needs_object, $1)=yes
2823 # Not sure whether something based on
2824 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
2825 # would be better.
2826 - output_verbose_link_cmd='func_echo_all'
2827 + output_verbose_link_cmd='echo'
2829 # Archives containing C++ object files must be created using
2830 # "CC -xar", where "CC" is the Sun C++ compiler. This is
2831 @@ -7164,7 +7079,7 @@ if test "$_lt_caught_CXX_error" != yes;
2832 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
2833 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
2834 fi
2835 - output_verbose_link_cmd=func_echo_all
2836 + output_verbose_link_cmd=echo
2837 else
2838 _LT_TAGVAR(ld_shlibs, $1)=no
2839 fi
2840 @@ -7199,15 +7114,15 @@ if test "$_lt_caught_CXX_error" != yes;
2841 case $host in
2842 osf3*)
2843 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2844 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2845 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2846 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2847 ;;
2848 *)
2849 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2850 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2851 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2852 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
2853 echo "-hidden">> $lib.exp~
2854 - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
2855 + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
2856 $RM $lib.exp'
2857 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
2858 ;;
2859 @@ -7223,17 +7138,17 @@ if test "$_lt_caught_CXX_error" != yes;
2860 # explicitly linking system object files so we need to strip them
2861 # from the output so that they don't get included in the library
2862 # dependencies.
2863 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
2864 + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2865 ;;
2866 *)
2867 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
2868 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2869 case $host in
2870 osf3*)
2871 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2872 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2873 ;;
2874 *)
2875 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2876 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2877 ;;
2878 esac
2880 @@ -7243,7 +7158,7 @@ if test "$_lt_caught_CXX_error" != yes;
2881 # Commands to make compiler produce verbose output that lists
2882 # what "hidden" libraries, object files and flags are used when
2883 # linking a shared library.
2884 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2885 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2887 else
2888 # FIXME: insert proper C++ library support
2889 @@ -7279,7 +7194,7 @@ if test "$_lt_caught_CXX_error" != yes;
2891 solaris*)
2892 case $cc_basename in
2893 - CC* | sunCC*)
2894 + CC*)
2895 # Sun C++ 4.2, 5.x and Centerline C++
2896 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
2897 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
2898 @@ -7300,7 +7215,7 @@ if test "$_lt_caught_CXX_error" != yes;
2899 esac
2900 _LT_TAGVAR(link_all_deplibs, $1)=yes
2902 - output_verbose_link_cmd='func_echo_all'
2903 + output_verbose_link_cmd='echo'
2905 # Archives containing C++ object files must be created using
2906 # "CC -xar", where "CC" is the Sun C++ compiler. This is
2907 @@ -7327,7 +7242,7 @@ if test "$_lt_caught_CXX_error" != yes;
2908 # Commands to make compiler produce verbose output that lists
2909 # what "hidden" libraries, object files and flags are used when
2910 # linking a shared library.
2911 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2912 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2913 else
2914 # g++ 2.7 appears to require `-G' NOT `-shared' on this
2915 # platform.
2916 @@ -7338,7 +7253,7 @@ if test "$_lt_caught_CXX_error" != yes;
2917 # Commands to make compiler produce verbose output that lists
2918 # what "hidden" libraries, object files and flags are used when
2919 # linking a shared library.
2920 - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2921 + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2922 fi
2924 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
2925 @@ -7392,10 +7307,6 @@ if test "$_lt_caught_CXX_error" != yes;
2926 CC*)
2927 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2928 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2929 - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
2930 - '"$_LT_TAGVAR(old_archive_cmds, $1)"
2931 - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
2932 - '"$_LT_TAGVAR(reload_cmds, $1)"
2933 ;;
2934 *)
2935 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2936 @@ -7642,7 +7553,7 @@ linux*)
2938 solaris*)
2939 case $cc_basename in
2940 - CC* | sunCC*)
2941 + CC*)
2942 # The more standards-conforming stlport4 library is
2943 # incompatible with the Cstd library. Avoid specifying
2944 # it if it's in CXXFLAGS. Ignore libCrun as
2945 @@ -7686,16 +7597,32 @@ _LT_TAGDECL([], [compiler_lib_search_pat
2946 ])# _LT_SYS_HIDDEN_LIBDEPS
2949 +# _LT_PROG_F77
2950 +# ------------
2951 +# Since AC_PROG_F77 is broken, in that it returns the empty string
2952 +# if there is no fortran compiler, we have our own version here.
2953 +m4_defun([_LT_PROG_F77],
2954 +[
2955 +pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
2956 +AC_PROG_F77
2957 +if test -z "$F77" || test "X$F77" = "Xno"; then
2958 + _lt_disable_F77=yes
2959 +fi
2960 +popdef([AC_MSG_ERROR])
2961 +])# _LT_PROG_F77
2962 +
2963 +dnl aclocal-1.4 backwards compatibility:
2964 +dnl AC_DEFUN([_LT_PROG_F77], [])
2965 +
2966 +
2967 # _LT_LANG_F77_CONFIG([TAG])
2968 # --------------------------
2969 # Ensure that the configuration variables for a Fortran 77 compiler are
2970 # suitably defined. These variables are subsequently used by _LT_CONFIG
2971 # to write the compiler configuration to `libtool'.
2972 m4_defun([_LT_LANG_F77_CONFIG],
2973 -[AC_LANG_PUSH(Fortran 77)
2974 -if test -z "$F77" || test "X$F77" = "Xno"; then
2975 - _lt_disable_F77=yes
2976 -fi
2977 +[AC_REQUIRE([_LT_PROG_F77])dnl
2978 +AC_LANG_PUSH(Fortran 77)
2980 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
2981 _LT_TAGVAR(allow_undefined_flag, $1)=
2982 @@ -7714,8 +7641,6 @@ _LT_TAGVAR(module_cmds, $1)=
2983 _LT_TAGVAR(module_expsym_cmds, $1)=
2984 _LT_TAGVAR(link_all_deplibs, $1)=unknown
2985 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2986 -_LT_TAGVAR(reload_flag, $1)=$reload_flag
2987 -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2988 _LT_TAGVAR(no_undefined_flag, $1)=
2989 _LT_TAGVAR(whole_archive_flag_spec, $1)=
2990 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
2991 @@ -7815,17 +7740,32 @@ AC_LANG_POP
2992 ])# _LT_LANG_F77_CONFIG
2995 +# _LT_PROG_FC
2996 +# -----------
2997 +# Since AC_PROG_FC is broken, in that it returns the empty string
2998 +# if there is no fortran compiler, we have our own version here.
2999 +m4_defun([_LT_PROG_FC],
3000 +[
3001 +pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
3002 +AC_PROG_FC
3003 +if test -z "$FC" || test "X$FC" = "Xno"; then
3004 + _lt_disable_FC=yes
3005 +fi
3006 +popdef([AC_MSG_ERROR])
3007 +])# _LT_PROG_FC
3008 +
3009 +dnl aclocal-1.4 backwards compatibility:
3010 +dnl AC_DEFUN([_LT_PROG_FC], [])
3011 +
3012 +
3013 # _LT_LANG_FC_CONFIG([TAG])
3014 # -------------------------
3015 # Ensure that the configuration variables for a Fortran compiler are
3016 # suitably defined. These variables are subsequently used by _LT_CONFIG
3017 # to write the compiler configuration to `libtool'.
3018 m4_defun([_LT_LANG_FC_CONFIG],
3019 -[AC_LANG_PUSH(Fortran)
3020 -
3021 -if test -z "$FC" || test "X$FC" = "Xno"; then
3022 - _lt_disable_FC=yes
3023 -fi
3024 +[AC_REQUIRE([_LT_PROG_FC])dnl
3025 +AC_LANG_PUSH(Fortran)
3027 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
3028 _LT_TAGVAR(allow_undefined_flag, $1)=
3029 @@ -7844,8 +7784,6 @@ _LT_TAGVAR(module_cmds, $1)=
3030 _LT_TAGVAR(module_expsym_cmds, $1)=
3031 _LT_TAGVAR(link_all_deplibs, $1)=unknown
3032 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3033 -_LT_TAGVAR(reload_flag, $1)=$reload_flag
3034 -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3035 _LT_TAGVAR(no_undefined_flag, $1)=
3036 _LT_TAGVAR(whole_archive_flag_spec, $1)=
3037 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
3038 @@ -7991,8 +7929,6 @@ _LT_CC_BASENAME([$compiler])
3039 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
3041 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3042 -_LT_TAGVAR(reload_flag, $1)=$reload_flag
3043 -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3045 if test -n "$compiler"; then
3046 _LT_COMPILER_NO_RTTI($1)
3047 @@ -8354,7 +8290,7 @@ _LT_EOF
3048 func_dirname ()
3049 {
3050 # Extract subdirectory from the argument.
3051 - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3052 + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
3053 if test "X$func_dirname_result" = "X${1}"; then
3054 func_dirname_result="${3}"
3055 else
3056 @@ -8365,7 +8301,7 @@ func_dirname ()
3057 # func_basename file
3058 func_basename ()
3059 {
3060 - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3061 + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
3062 }
3064 dnl func_dirname_and_basename
3065 @@ -8381,8 +8317,10 @@ dnl so there is no need for it here.
3066 func_stripname ()
3067 {
3068 case ${2} in
3069 - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3070 - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3071 + .*) func_stripname_result=`$ECHO "X${3}" \
3072 + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
3073 + *) func_stripname_result=`$ECHO "X${3}" \
3074 + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
3075 esac
3076 }
3078 @@ -8393,20 +8331,20 @@ my_sed_long_arg='1s/^-[[^=]]*=//'
3079 # func_opt_split
3080 func_opt_split ()
3081 {
3082 - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3083 - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3084 + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
3085 + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
3086 }
3088 # func_lo2o object
3089 func_lo2o ()
3090 {
3091 - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3092 + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
3093 }
3095 # func_xform libobj-or-source
3096 func_xform ()
3097 {
3098 - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
3099 + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
3100 }
3102 # func_arith arithmetic-term...
3103 @@ -8454,15 +8392,14 @@ _LT_EOF
3105 # Helper functions for option handling. -*- Autoconf -*-
3106 #
3107 -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
3108 -# Inc.
3109 +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
3110 # Written by Gary V. Vaughan, 2004
3111 #
3112 # This file is free software; the Free Software Foundation gives
3113 # unlimited permission to copy and/or distribute it, with or without
3114 # modifications, as long as this notice is preserved.
3116 -# serial 7 ltoptions.m4
3117 +# serial 6 ltoptions.m4
3119 # This is to help aclocal find these macros, as it can't see m4_define.
3120 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
3121 @@ -8577,7 +8514,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
3122 [enable_win32_dll=yes
3124 case $host in
3125 -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
3126 +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
3127 AC_CHECK_TOOL(AS, as, false)
3128 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
3129 AC_CHECK_TOOL(OBJDUMP, objdump, false)
3130 @@ -8585,13 +8522,13 @@ case $host in
3131 esac
3133 test -z "$AS" && AS=as
3134 -_LT_DECL([], [AS], [1], [Assembler program])dnl
3135 +_LT_DECL([], [AS], [0], [Assembler program])dnl
3137 test -z "$DLLTOOL" && DLLTOOL=dlltool
3138 -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
3139 +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
3141 test -z "$OBJDUMP" && OBJDUMP=objdump
3142 -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
3143 +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
3144 ])# win32-dll
3146 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
3147 @@ -8951,29 +8888,29 @@ m4_define([lt_dict_filter],
3149 # Generated from ltversion.in.
3151 -# serial 3175 ltversion.m4
3152 +# serial 3017 ltversion.m4
3153 # This file is part of GNU Libtool
3155 -m4_define([LT_PACKAGE_VERSION], [2.2.10])
3156 -m4_define([LT_PACKAGE_REVISION], [1.3175])
3157 +m4_define([LT_PACKAGE_VERSION], [2.2.6b])
3158 +m4_define([LT_PACKAGE_REVISION], [1.3017])
3160 AC_DEFUN([LTVERSION_VERSION],
3161 -[macro_version='2.2.10'
3162 -macro_revision='1.3175'
3163 +[macro_version='2.2.6b'
3164 +macro_revision='1.3017'
3165 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
3166 _LT_DECL(, macro_revision, 0)
3167 ])
3169 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
3170 #
3171 -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
3172 +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
3173 # Written by Scott James Remnant, 2004.
3174 #
3175 # This file is free software; the Free Software Foundation gives
3176 # unlimited permission to copy and/or distribute it, with or without
3177 # modifications, as long as this notice is preserved.
3179 -# serial 5 lt~obsolete.m4
3180 +# serial 4 lt~obsolete.m4
3182 # These exist entirely to fool aclocal when bootstrapping libtool.
3183 #
3184 @@ -9043,6 +8980,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC
3185 m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
3186 m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
3187 m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
3188 +m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
3189 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
3190 m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
3191 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
3192 @@ -9055,17 +8993,9 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [
3193 m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
3194 m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
3195 m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
3196 -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
3197 -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
3198 -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
3199 -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
3200 -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
3201 -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
3202 -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
3203 -
3204 -# nls.m4 serial 5 (gettext-0.18)
3205 -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
3206 -dnl Inc.
3207 +
3208 +# nls.m4 serial 3 (gettext-0.15)
3209 +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
3210 dnl This file is free software; the Free Software Foundation
3211 dnl gives unlimited permission to copy and/or distribute it,
3212 dnl with or without modifications, as long as this notice is preserved.
3213 @@ -9083,21 +9013,20 @@ dnl Authors:
3214 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
3215 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
3217 -AC_PREREQ([2.50])
3218 +AC_PREREQ(2.50)
3220 AC_DEFUN([AM_NLS],
3221 [
3222 AC_MSG_CHECKING([whether NLS is requested])
3223 dnl Default is enabled NLS
3224 - AC_ARG_ENABLE([nls],
3225 + AC_ARG_ENABLE(nls,
3226 [ --disable-nls do not use Native Language Support],
3227 USE_NLS=$enableval, USE_NLS=yes)
3228 - AC_MSG_RESULT([$USE_NLS])
3229 - AC_SUBST([USE_NLS])
3230 + AC_MSG_RESULT($USE_NLS)
3231 + AC_SUBST(USE_NLS)
3232 ])
3234 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
3235 -# serial 1 (pkg-config-0.24)
3236 #
3237 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
3238 #
3239 @@ -9125,10 +9054,7 @@ AC_DEFUN([AM_NLS],
3240 AC_DEFUN([PKG_PROG_PKG_CONFIG],
3241 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
3242 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
3243 -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
3244 -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
3245 -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
3246 -
3247 +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
3248 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
3249 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
3250 fi
3251 @@ -9141,6 +9067,7 @@ if test -n "$PKG_CONFIG"; then
3252 AC_MSG_RESULT([no])
3253 PKG_CONFIG=""
3254 fi
3255 +
3256 fi[]dnl
3257 ])# PKG_PROG_PKG_CONFIG
3259 @@ -9149,31 +9076,34 @@ fi[]dnl
3260 # Check to see whether a particular set of modules exists. Similar
3261 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
3262 #
3263 -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
3264 -# only at the first occurence in configure.ac, so if the first place
3265 -# it's called might be skipped (such as if it is within an "if", you
3266 -# have to call PKG_CHECK_EXISTS manually
3267 +#
3268 +# Similar to PKG_CHECK_MODULES, make sure that the first instance of
3269 +# this or PKG_CHECK_MODULES is called, or make sure to call
3270 +# PKG_CHECK_EXISTS manually
3271 # --------------------------------------------------------------
3272 AC_DEFUN([PKG_CHECK_EXISTS],
3273 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
3274 if test -n "$PKG_CONFIG" && \
3275 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
3276 - m4_default([$2], [:])
3277 + m4_ifval([$2], [$2], [:])
3278 m4_ifvaln([$3], [else
3279 $3])dnl
3280 fi])
3282 +
3283 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
3284 # ---------------------------------------------
3285 m4_define([_PKG_CONFIG],
3286 -[if test -n "$$1"; then
3287 - pkg_cv_[]$1="$$1"
3288 - elif test -n "$PKG_CONFIG"; then
3289 - PKG_CHECK_EXISTS([$3],
3290 - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
3291 - [pkg_failed=yes])
3292 - else
3293 - pkg_failed=untried
3294 +[if test -n "$PKG_CONFIG"; then
3295 + if test -n "$$1"; then
3296 + pkg_cv_[]$1="$$1"
3297 + else
3298 + PKG_CHECK_EXISTS([$3],
3299 + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
3300 + [pkg_failed=yes])
3301 + fi
3302 +else
3303 + pkg_failed=untried
3304 fi[]dnl
3305 ])# _PKG_CONFIG
3307 @@ -9215,17 +9145,16 @@ and $1[]_LIBS to avoid the need to call
3308 See the pkg-config man page for more details.])
3310 if test $pkg_failed = yes; then
3311 - AC_MSG_RESULT([no])
3312 _PKG_SHORT_ERRORS_SUPPORTED
3313 if test $_pkg_short_errors_supported = yes; then
3314 - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
3315 + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
3316 else
3317 - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
3318 + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
3319 fi
3320 # Put the nasty error message in config.log where it belongs
3321 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
3323 - m4_default([$4], [AC_MSG_ERROR(
3324 + ifelse([$4], , [AC_MSG_ERROR(dnl
3325 [Package requirements ($2) were not met:
3327 $$1_PKG_ERRORS
3328 @@ -9233,24 +9162,25 @@ $$1_PKG_ERRORS
3329 Consider adjusting the PKG_CONFIG_PATH environment variable if you
3330 installed software in a non-standard prefix.
3332 -_PKG_TEXT])dnl
3333 - ])
3334 +_PKG_TEXT
3335 +])],
3336 + [AC_MSG_RESULT([no])
3337 + $4])
3338 elif test $pkg_failed = untried; then
3339 - AC_MSG_RESULT([no])
3340 - m4_default([$4], [AC_MSG_FAILURE(
3341 + ifelse([$4], , [AC_MSG_FAILURE(dnl
3342 [The pkg-config script could not be found or is too old. Make sure it
3343 is in your PATH or set the PKG_CONFIG environment variable to the full
3344 path to pkg-config.
3346 _PKG_TEXT
3348 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
3349 - ])
3350 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
3351 + [$4])
3352 else
3353 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
3354 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
3355 AC_MSG_RESULT([yes])
3356 - $3
3357 + ifelse([$3], , :, [$3])
3358 fi[]dnl
3359 ])# PKG_CHECK_MODULES
3361 --- lxpanel-0.5.6.orig/config.guess
3362 +++ lxpanel-0.5.6/config.guess
3363 @@ -4,7 +4,7 @@
3364 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
3365 # Free Software Foundation, Inc.
3367 -timestamp='2009-11-20'
3368 +timestamp='2009-06-10'
3370 # This file is free software; you can redistribute it and/or modify it
3371 # under the terms of the GNU General Public License as published by
3372 @@ -27,16 +27,16 @@ timestamp='2009-11-20'
3373 # the same distribution terms that you use for the rest of that program.
3376 -# Originally written by Per Bothner. Please send patches (context
3377 -# diff format) to <config-patches@gnu.org> and include a ChangeLog
3378 -# entry.
3379 +# Originally written by Per Bothner <per@bothner.com>.
3380 +# Please send patches to <config-patches@gnu.org>. Submit a context
3381 +# diff and a properly formatted ChangeLog entry.
3382 #
3383 # This script attempts to guess a canonical system name similar to
3384 # config.sub. If it succeeds, it prints the system name on stdout, and
3385 # exits with 0. Otherwise, it exits with 1.
3386 #
3387 -# You can get the latest version of this script from:
3388 -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
3389 +# The plan is that this can be called by configure scripts if you
3390 +# don't specify an explicit build system type.
3392 me=`echo "$0" | sed -e 's,.*/,,'`
3394 @@ -333,9 +333,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
3395 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
3396 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3397 exit ;;
3398 - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
3399 - echo i386-pc-auroraux${UNAME_RELEASE}
3400 - exit ;;
3401 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
3402 eval $set_cc_for_build
3403 SUN_ARCH="i386"
3404 @@ -810,12 +807,12 @@ EOF
3405 i*:PW*:*)
3406 echo ${UNAME_MACHINE}-pc-pw32
3407 exit ;;
3408 - *:Interix*:*)
3409 + *:Interix*:[3456]*)
3410 case ${UNAME_MACHINE} in
3411 x86)
3412 echo i586-pc-interix${UNAME_RELEASE}
3413 exit ;;
3414 - authenticamd | genuineintel | EM64T)
3415 + EM64T | authenticamd | genuineintel)
3416 echo x86_64-unknown-interix${UNAME_RELEASE}
3417 exit ;;
3418 IA64)
3419 @@ -857,20 +854,6 @@ EOF
3420 i*86:Minix:*:*)
3421 echo ${UNAME_MACHINE}-pc-minix
3422 exit ;;
3423 - alpha:Linux:*:*)
3424 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
3425 - EV5) UNAME_MACHINE=alphaev5 ;;
3426 - EV56) UNAME_MACHINE=alphaev56 ;;
3427 - PCA56) UNAME_MACHINE=alphapca56 ;;
3428 - PCA57) UNAME_MACHINE=alphapca56 ;;
3429 - EV6) UNAME_MACHINE=alphaev6 ;;
3430 - EV67) UNAME_MACHINE=alphaev67 ;;
3431 - EV68*) UNAME_MACHINE=alphaev68 ;;
3432 - esac
3433 - objdump --private-headers /bin/sh | grep -q ld.so.1
3434 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
3435 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
3436 - exit ;;
3437 arm*:Linux:*:*)
3438 eval $set_cc_for_build
3439 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
3440 @@ -893,17 +876,6 @@ EOF
3441 frv:Linux:*:*)
3442 echo frv-unknown-linux-gnu
3443 exit ;;
3444 - i*86:Linux:*:*)
3445 - LIBC=gnu
3446 - eval $set_cc_for_build
3447 - sed 's/^ //' << EOF >$dummy.c
3448 - #ifdef __dietlibc__
3449 - LIBC=dietlibc
3450 - #endif
3451 -EOF
3452 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
3453 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
3454 - exit ;;
3455 ia64:Linux:*:*)
3456 echo ${UNAME_MACHINE}-unknown-linux-gnu
3457 exit ;;
3458 @@ -929,18 +901,39 @@ EOF
3459 #endif
3460 #endif
3461 EOF
3462 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
3463 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
3464 + /^CPU/{
3465 + s: ::g
3466 + p
3467 + }'`"
3468 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
3469 ;;
3470 or32:Linux:*:*)
3471 echo or32-unknown-linux-gnu
3472 exit ;;
3473 + ppc:Linux:*:*)
3474 + echo powerpc-unknown-linux-gnu
3475 + exit ;;
3476 + ppc64:Linux:*:*)
3477 + echo powerpc64-unknown-linux-gnu
3478 + exit ;;
3479 + alpha:Linux:*:*)
3480 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
3481 + EV5) UNAME_MACHINE=alphaev5 ;;
3482 + EV56) UNAME_MACHINE=alphaev56 ;;
3483 + PCA56) UNAME_MACHINE=alphapca56 ;;
3484 + PCA57) UNAME_MACHINE=alphapca56 ;;
3485 + EV6) UNAME_MACHINE=alphaev6 ;;
3486 + EV67) UNAME_MACHINE=alphaev67 ;;
3487 + EV68*) UNAME_MACHINE=alphaev68 ;;
3488 + esac
3489 + objdump --private-headers /bin/sh | grep -q ld.so.1
3490 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
3491 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
3492 + exit ;;
3493 padre:Linux:*:*)
3494 echo sparc-unknown-linux-gnu
3495 exit ;;
3496 - parisc64:Linux:*:* | hppa64:Linux:*:*)
3497 - echo hppa64-unknown-linux-gnu
3498 - exit ;;
3499 parisc:Linux:*:* | hppa:Linux:*:*)
3500 # Look for CPU level
3501 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
3502 @@ -949,11 +942,8 @@ EOF
3503 *) echo hppa-unknown-linux-gnu ;;
3504 esac
3505 exit ;;
3506 - ppc64:Linux:*:*)
3507 - echo powerpc64-unknown-linux-gnu
3508 - exit ;;
3509 - ppc:Linux:*:*)
3510 - echo powerpc-unknown-linux-gnu
3511 + parisc64:Linux:*:* | hppa64:Linux:*:*)
3512 + echo hppa64-unknown-linux-gnu
3513 exit ;;
3514 s390:Linux:*:* | s390x:Linux:*:*)
3515 echo ${UNAME_MACHINE}-ibm-linux
3516 @@ -976,6 +966,58 @@ EOF
3517 xtensa*:Linux:*:*)
3518 echo ${UNAME_MACHINE}-unknown-linux-gnu
3519 exit ;;
3520 + i*86:Linux:*:*)
3521 + # The BFD linker knows what the default object file format is, so
3522 + # first see if it will tell us. cd to the root directory to prevent
3523 + # problems with other programs or directories called `ld' in the path.
3524 + # Set LC_ALL=C to ensure ld outputs messages in English.
3525 + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
3526 + | sed -ne '/supported targets:/!d
3527 + s/[ ][ ]*/ /g
3528 + s/.*supported targets: *//
3529 + s/ .*//
3530 + p'`
3531 + case "$ld_supported_targets" in
3532 + elf32-i386)
3533 + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
3534 + ;;
3535 + esac
3536 + # Determine whether the default compiler is a.out or elf
3537 + eval $set_cc_for_build
3538 + sed 's/^ //' << EOF >$dummy.c
3539 + #include <features.h>
3540 + #ifdef __ELF__
3541 + # ifdef __GLIBC__
3542 + # if __GLIBC__ >= 2
3543 + LIBC=gnu
3544 + # else
3545 + LIBC=gnulibc1
3546 + # endif
3547 + # else
3548 + LIBC=gnulibc1
3549 + # endif
3550 + #else
3551 + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
3552 + LIBC=gnu
3553 + #else
3554 + LIBC=gnuaout
3555 + #endif
3556 + #endif
3557 + #ifdef __dietlibc__
3558 + LIBC=dietlibc
3559 + #endif
3560 +EOF
3561 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
3562 + /^LIBC/{
3563 + s: ::g
3564 + p
3565 + }'`"
3566 + test x"${LIBC}" != x && {
3567 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
3568 + exit
3569 + }
3570 + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
3571 + ;;
3572 i*86:DYNIX/ptx:4*:*)
3573 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
3574 # earlier versions are messed up and put the nodename in both
3575 @@ -1205,16 +1247,6 @@ EOF
3576 *:Darwin:*:*)
3577 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
3578 case $UNAME_PROCESSOR in
3579 - i386)
3580 - eval $set_cc_for_build
3581 - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
3582 - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
3583 - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
3584 - grep IS_64BIT_ARCH >/dev/null
3585 - then
3586 - UNAME_PROCESSOR="x86_64"
3587 - fi
3588 - fi ;;
3589 unknown) UNAME_PROCESSOR=powerpc ;;
3590 esac
3591 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
3592 --- lxpanel-0.5.6.orig/configure
3593 +++ lxpanel-0.5.6/configure
3594 @@ -173,14 +173,6 @@ test x\$exitcode = x0 || exit 1"
3595 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
3596 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
3597 test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
3598 -
3599 - test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
3600 - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3601 - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
3602 - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
3603 - PATH=/empty FPATH=/empty; export PATH FPATH
3604 - test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
3605 - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
3606 test \$(( 1 + 1 )) = 2 || exit 1"
3607 if (eval "$as_required") 2>/dev/null; then :
3608 as_have_required=yes
3609 @@ -536,8 +528,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
3610 # Sed expression to map a string onto a valid variable name.
3611 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
3613 +
3614 +
3615 +# Check that we are running under the correct shell.
3616 SHELL=${CONFIG_SHELL-/bin/sh}
3618 +case X$lt_ECHO in
3619 +X*--fallback-echo)
3620 + # Remove one level of quotation (which was required for Make).
3621 + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
3622 + ;;
3623 +esac
3624 +
3625 +ECHO=${lt_ECHO-echo}
3626 +if test "X$1" = X--no-reexec; then
3627 + # Discard the --no-reexec flag, and continue.
3628 + shift
3629 +elif test "X$1" = X--fallback-echo; then
3630 + # Avoid inline document here, it may be left over
3631 + :
3632 +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
3633 + # Yippee, $ECHO works!
3634 + :
3635 +else
3636 + # Restart under the correct shell.
3637 + exec $SHELL "$0" --no-reexec ${1+"$@"}
3638 +fi
3639 +
3640 +if test "X$1" = X--fallback-echo; then
3641 + # used as fallback echo
3642 + shift
3643 + cat <<_LT_EOF
3644 +$*
3645 +_LT_EOF
3646 + exit 0
3647 +fi
3648 +
3649 +# The HP-UX ksh and POSIX shell print the target directory to stdout
3650 +# if CDPATH is set.
3651 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
3652 +
3653 +if test -z "$lt_ECHO"; then
3654 + if test "X${echo_test_string+set}" != Xset; then
3655 + # find a string as large as possible, as long as the shell can cope with it
3656 + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
3657 + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
3658 + if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
3659 + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
3660 + then
3661 + break
3662 + fi
3663 + done
3664 + fi
3665 +
3666 + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
3667 + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
3668 + test "X$echo_testing_string" = "X$echo_test_string"; then
3669 + :
3670 + else
3671 + # The Solaris, AIX, and Digital Unix default echo programs unquote
3672 + # backslashes. This makes it impossible to quote backslashes using
3673 + # echo "$something" | sed 's/\\/\\\\/g'
3674 + #
3675 + # So, first we look for a working echo in the user's PATH.
3676 +
3677 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3678 + for dir in $PATH /usr/ucb; do
3679 + IFS="$lt_save_ifs"
3680 + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3681 + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3682 + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
3683 + test "X$echo_testing_string" = "X$echo_test_string"; then
3684 + ECHO="$dir/echo"
3685 + break
3686 + fi
3687 + done
3688 + IFS="$lt_save_ifs"
3689 +
3690 + if test "X$ECHO" = Xecho; then
3691 + # We didn't find a better echo, so look for alternatives.
3692 + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
3693 + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
3694 + test "X$echo_testing_string" = "X$echo_test_string"; then
3695 + # This shell has a builtin print -r that does the trick.
3696 + ECHO='print -r'
3697 + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
3698 + test "X$CONFIG_SHELL" != X/bin/ksh; then
3699 + # If we have ksh, try running configure again with it.
3700 + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
3701 + export ORIGINAL_CONFIG_SHELL
3702 + CONFIG_SHELL=/bin/ksh
3703 + export CONFIG_SHELL
3704 + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
3705 + else
3706 + # Try using printf.
3707 + ECHO='printf %s\n'
3708 + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
3709 + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
3710 + test "X$echo_testing_string" = "X$echo_test_string"; then
3711 + # Cool, printf works
3712 + :
3713 + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
3714 + test "X$echo_testing_string" = 'X\t' &&
3715 + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3716 + test "X$echo_testing_string" = "X$echo_test_string"; then
3717 + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
3718 + export CONFIG_SHELL
3719 + SHELL="$CONFIG_SHELL"
3720 + export SHELL
3721 + ECHO="$CONFIG_SHELL $0 --fallback-echo"
3722 + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
3723 + test "X$echo_testing_string" = 'X\t' &&
3724 + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3725 + test "X$echo_testing_string" = "X$echo_test_string"; then
3726 + ECHO="$CONFIG_SHELL $0 --fallback-echo"
3727 + else
3728 + # maybe with a smaller string...
3729 + prev=:
3730 +
3731 + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
3732 + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
3733 + then
3734 + break
3735 + fi
3736 + prev="$cmd"
3737 + done
3738 +
3739 + if test "$prev" != 'sed 50q "$0"'; then
3740 + echo_test_string=`eval $prev`
3741 + export echo_test_string
3742 + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
3743 + else
3744 + # Oops. We lost completely, so just stick with echo.
3745 + ECHO=echo
3746 + fi
3747 + fi
3748 + fi
3749 + fi
3750 + fi
3751 +fi
3752 +
3753 +# Copy echo and quote the copy suitably for passing to libtool from
3754 +# the Makefile, instead of quoting the original, which is used later.
3755 +lt_ECHO=$ECHO
3756 +if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
3757 + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
3758 +fi
3759 +
3760 +
3761 +
3763 test -n "$DJDIR" || exec 7<&0 </dev/null
3764 exec 6>&1
3765 @@ -642,10 +781,14 @@ MENU_CACHE_LIBS
3766 MENU_CACHE_CFLAGS
3767 X11_LIBS
3768 X11_CFLAGS
3769 +INDICATORICONSDIR
3770 +INDICATORDIR
3771 +APPLET_LIBS
3772 +APPLET_CFLAGS
3773 +ENABLE_INDICATOR_SUPPORT_FALSE
3774 +ENABLE_INDICATOR_SUPPORT_TRUE
3775 PACKAGE_LIBS
3776 PACKAGE_CFLAGS
3777 -PKG_CONFIG_LIBDIR
3778 -PKG_CONFIG_PATH
3779 PKG_CONFIG
3780 DATADIRNAME
3781 ALL_LINGUAS
3782 @@ -683,6 +826,7 @@ OTOOL
3783 LIPO
3784 NMEDIT
3785 DSYMUTIL
3786 +lt_ECHO
3787 RANLIB
3788 AR
3789 OBJDUMP
3790 @@ -792,6 +936,7 @@ enable_fast_install
3791 with_gnu_ld
3792 enable_libtool_lock
3793 enable_nls
3794 +enable_indicator_support
3795 enable_man
3796 enable_cast_checks
3797 enable_alsa
3798 @@ -810,10 +955,10 @@ LIBS
3799 CPPFLAGS
3800 CPP
3801 PKG_CONFIG
3802 -PKG_CONFIG_PATH
3803 -PKG_CONFIG_LIBDIR
3804 PACKAGE_CFLAGS
3805 PACKAGE_LIBS
3806 +APPLET_CFLAGS
3807 +APPLET_LIBS
3808 X11_CFLAGS
3809 X11_LIBS
3810 MENU_CACHE_CFLAGS
3811 @@ -1450,6 +1595,8 @@ Optional Features:
3812 optimize for fast installation [default=yes]
3813 --disable-libtool-lock avoid locking (might break parallel builds)
3814 --disable-nls do not use Native Language Support
3815 + --enable-indicator-support
3816 + enable plugin loading (default: disable)
3817 --enable-man regenerate roff man pages from Docbook [default=no]
3818 --enable-cast-checks enable Glib casting checks (default: disable)
3819 --disable-alsa compile ALSA providers (default: enable)
3820 @@ -1481,14 +1628,13 @@ Some influential environment variables:
3821 you have headers in a nonstandard directory <include dir>
3822 CPP C preprocessor
3823 PKG_CONFIG path to pkg-config utility
3824 - PKG_CONFIG_PATH
3825 - directories to add to pkg-config's search path
3826 - PKG_CONFIG_LIBDIR
3827 - path overriding pkg-config's built-in search path
3828 PACKAGE_CFLAGS
3829 C compiler flags for PACKAGE, overriding pkg-config
3830 PACKAGE_LIBS
3831 linker flags for PACKAGE, overriding pkg-config
3832 + APPLET_CFLAGS
3833 + C compiler flags for APPLET, overriding pkg-config
3834 + APPLET_LIBS linker flags for APPLET, overriding pkg-config
3835 X11_CFLAGS C compiler flags for X11, overriding pkg-config
3836 X11_LIBS linker flags for X11, overriding pkg-config
3837 MENU_CACHE_CFLAGS
3838 @@ -3820,8 +3966,8 @@ esac
3842 -macro_version='2.2.10'
3843 -macro_revision='1.3175'
3844 +macro_version='2.2.6b'
3845 +macro_revision='1.3017'
3849 @@ -3908,75 +4054,6 @@ IFS=$ac_save_IFS
3850 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
3853 -# Backslashify metacharacters that are still active within
3854 -# double-quoted strings.
3855 -sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
3856 -
3857 -# Same as above, but do not quote variable references.
3858 -double_quote_subst='s/\(["`\\]\)/\\\1/g'
3859 -
3860 -# Sed substitution to delay expansion of an escaped shell variable in a
3861 -# double_quote_subst'ed string.
3862 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
3863 -
3864 -# Sed substitution to delay expansion of an escaped single quote.
3865 -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
3866 -
3867 -# Sed substitution to avoid accidental globbing in evaled expressions
3868 -no_glob_subst='s/\*/\\\*/g'
3869 -
3870 -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3871 -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
3872 -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3873 -
3874 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3875 -$as_echo_n "checking how to print strings... " >&6; }
3876 -# Test print first, because it will be a builtin if present.
3877 -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
3878 - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3879 - ECHO='print -r --'
3880 -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3881 - ECHO='printf %s\n'
3882 -else
3883 - # Use this function as a fallback that always works.
3884 - func_fallback_echo ()
3885 - {
3886 - eval 'cat <<_LTECHO_EOF
3887 -$1
3888 -_LTECHO_EOF'
3889 - }
3890 - ECHO='func_fallback_echo'
3891 -fi
3892 -
3893 -# func_echo_all arg...
3894 -# Invoke $ECHO with all args, space-separated.
3895 -func_echo_all ()
3896 -{
3897 - $ECHO ""
3898 -}
3899 -
3900 -case "$ECHO" in
3901 - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
3902 -$as_echo "printf" >&6; } ;;
3903 - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
3904 -$as_echo "print -r" >&6; } ;;
3905 - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
3906 -$as_echo "cat" >&6; } ;;
3907 -esac
3908 -
3909 -
3910 -
3911 -
3912 -
3913 -
3914 -
3915 -
3916 -
3917 -
3918 -
3919 -
3920 -
3921 -
3922 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
3923 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
3924 if test "${ac_cv_path_SED+set}" = set; then :
3925 @@ -4442,11 +4519,8 @@ if test "$lt_cv_path_NM" != "no"; then
3926 NM="$lt_cv_path_NM"
3927 else
3928 # Didn't find any BSD compatible name lister, look for dumpbin.
3929 - if test -n "$DUMPBIN"; then :
3930 - # Let the user override the test.
3931 - else
3932 - if test -n "$ac_tool_prefix"; then
3933 - for ac_prog in dumpbin "link -dump"
3934 + if test -n "$ac_tool_prefix"; then
3935 + for ac_prog in "dumpbin -symbols" "link -dump -symbols"
3936 do
3937 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3938 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3939 @@ -4490,7 +4564,7 @@ fi
3940 fi
3941 if test -z "$DUMPBIN"; then
3942 ac_ct_DUMPBIN=$DUMPBIN
3943 - for ac_prog in dumpbin "link -dump"
3944 + for ac_prog in "dumpbin -symbols" "link -dump -symbols"
3945 do
3946 # Extract the first word of "$ac_prog", so it can be a program name with args.
3947 set dummy $ac_prog; ac_word=$2
3948 @@ -4545,15 +4619,6 @@ esac
3949 fi
3950 fi
3952 - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
3953 - *COFF*)
3954 - DUMPBIN="$DUMPBIN -symbols"
3955 - ;;
3956 - *)
3957 - DUMPBIN=:
3958 - ;;
3959 - esac
3960 - fi
3962 if test "$DUMPBIN" != ":"; then
3963 NM="$DUMPBIN"
3964 @@ -4573,13 +4638,13 @@ if test "${lt_cv_nm_interface+set}" = se
3965 else
3966 lt_cv_nm_interface="BSD nm"
3967 echo "int some_variable = 0;" > conftest.$ac_ext
3968 - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
3969 + (eval echo "\"\$as_me:4641: $ac_compile\"" >&5)
3970 (eval "$ac_compile" 2>conftest.err)
3971 cat conftest.err >&5
3972 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3973 + (eval echo "\"\$as_me:4644: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3974 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
3975 cat conftest.err >&5
3976 - (eval echo "\"\$as_me:$LINENO: output\"" >&5)
3977 + (eval echo "\"\$as_me:4647: output\"" >&5)
3978 cat conftest.out >&5
3979 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
3980 lt_cv_nm_interface="MS dumpbin"
3981 @@ -4625,11 +4690,6 @@ else
3982 lt_cv_sys_max_cmd_len=8192;
3983 ;;
3985 - mint*)
3986 - # On MiNT this can take a long time and run out of memory.
3987 - lt_cv_sys_max_cmd_len=8192;
3988 - ;;
3989 -
3990 amigaos*)
3991 # On AmigaOS with pdksh, this test takes hours, literally.
3992 # So we just punt and use a minimum line length of 8192.
3993 @@ -4694,8 +4754,8 @@ else
3994 # If test is not a shell built-in, we'll probably end up computing a
3995 # maximum length that is only half of the actual maximum length, but
3996 # we can't tell.
3997 - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
3998 - = "X$teststring$teststring"; } >/dev/null 2>&1 &&
3999 + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
4000 + = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
4001 test $i != 17 # 1/2 MB should be enough
4002 do
4003 i=`expr $i + 1`
4004 @@ -4966,18 +5026,16 @@ mingw* | pw32*)
4005 # Base MSYS/MinGW do not provide the 'file' command needed by
4006 # func_win32_libid shell function, so use a weaker test based on 'objdump',
4007 # unless we find 'file', for example because we are cross-compiling.
4008 - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
4009 - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
4010 + if ( file / ) >/dev/null 2>&1; then
4011 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4012 lt_cv_file_magic_cmd='func_win32_libid'
4013 else
4014 - # Keep this pattern in sync with the one in func_win32_libid.
4015 - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4016 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4017 lt_cv_file_magic_cmd='$OBJDUMP -f'
4018 fi
4019 ;;
4021 -cegcc*)
4022 +cegcc)
4023 # use the weaker test based on 'objdump'. See mingw*.
4024 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
4025 lt_cv_file_magic_cmd='$OBJDUMP -f'
4026 @@ -5007,10 +5065,6 @@ gnu*)
4027 lt_cv_deplibs_check_method=pass_all
4028 ;;
4030 -haiku*)
4031 - lt_cv_deplibs_check_method=pass_all
4032 - ;;
4033 -
4034 hpux10.20* | hpux11*)
4035 lt_cv_file_magic_cmd=/usr/bin/file
4036 case $host_cpu in
4037 @@ -5019,11 +5073,11 @@ hpux10.20* | hpux11*)
4038 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
4039 ;;
4040 hppa*64*)
4041 - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
4042 + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
4043 lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
4044 ;;
4045 *)
4046 - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
4047 + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
4048 lt_cv_file_magic_test_file=/usr/lib/libc.sl
4049 ;;
4050 esac
4051 @@ -5049,7 +5103,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
4052 lt_cv_deplibs_check_method=pass_all
4053 ;;
4055 -netbsd*)
4056 +netbsd* | netbsdelf*-gnu)
4057 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
4058 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
4059 else
4060 @@ -5461,18 +5515,6 @@ if test -n "$RANLIB"; then
4061 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
4062 fi
4064 -case $host_os in
4065 - darwin*)
4066 - lock_old_archive_extraction=yes ;;
4067 - *)
4068 - lock_old_archive_extraction=no ;;
4069 -esac
4070 -
4071 -
4072 -
4073 -
4074 -
4075 -
4079 @@ -5642,8 +5684,8 @@ _LT_EOF
4080 test $ac_status = 0; }; then
4081 # Now try to grab the symbols.
4082 nlist=conftest.nm
4083 - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
4084 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
4085 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
4086 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
4087 ac_status=$?
4088 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4089 test $ac_status = 0; } && test -s "$nlist"; then
4090 @@ -5797,7 +5839,7 @@ ia64-*-hpux*)
4091 ;;
4092 *-*-irix6*)
4093 # Find out which ABI we are using.
4094 - echo '#line '$LINENO' "configure"' > conftest.$ac_ext
4095 + echo '#line 5842 "configure"' > conftest.$ac_ext
4096 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4097 (eval $ac_compile) 2>&5
4098 ac_status=$?
4099 @@ -6509,38 +6551,6 @@ rm -f core conftest.err conftest.$ac_obj
4100 fi
4101 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
4102 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
4103 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
4104 -$as_echo_n "checking for -force_load linker flag... " >&6; }
4105 -if test "${lt_cv_ld_force_load+set}" = set; then :
4106 - $as_echo_n "(cached) " >&6
4107 -else
4108 - lt_cv_ld_force_load=no
4109 - cat > conftest.c << _LT_EOF
4110 -int forced_loaded() { return 2;}
4111 -_LT_EOF
4112 - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
4113 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4114 - echo "$AR cru libconftest.a conftest.o" >&5
4115 - $AR cru libconftest.a conftest.o 2>&5
4116 - echo "$RANLIB libconftest.a" >&5
4117 - $RANLIB libconftest.a 2>&5
4118 - cat > conftest.c << _LT_EOF
4119 -int main() { return 0;}
4120 -_LT_EOF
4121 - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
4122 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
4123 - _lt_result=$?
4124 - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
4125 - lt_cv_ld_force_load=yes
4126 - else
4127 - cat conftest.err >&5
4128 - fi
4129 - rm -f conftest.err libconftest.a conftest conftest.c
4130 - rm -rf conftest.dSYM
4131 -
4132 -fi
4133 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
4134 -$as_echo "$lt_cv_ld_force_load" >&6; }
4135 case $host_os in
4136 rhapsody* | darwin1.[012])
4137 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
4138 @@ -6568,7 +6578,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
4139 else
4140 _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
4141 fi
4142 - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
4143 + if test "$DSYMUTIL" != ":"; then
4144 _lt_dsymutil='~$DSYMUTIL $lib || :'
4145 else
4146 _lt_dsymutil=
4147 @@ -6859,8 +6869,6 @@ done
4151 -
4152 -
4153 # Set options
4156 @@ -6983,7 +6991,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
4160 -
4161 test -z "$LN_S" && LN_S="ln -s"
4164 @@ -7033,6 +7040,19 @@ _ACEOF
4168 +
4169 +
4170 +
4171 +
4172 +
4173 +
4174 +
4175 +
4176 +
4177 +
4178 +
4179 +
4180 +
4181 case $host_os in
4182 aix3*)
4183 # AIX sometimes has problems with the GCC collect2 program. For some
4184 @@ -7045,6 +7065,23 @@ aix3*)
4185 ;;
4186 esac
4188 +# Sed substitution that helps us do robust quoting. It backslashifies
4189 +# metacharacters that are still active within double-quoted strings.
4190 +sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
4191 +
4192 +# Same as above, but do not quote variable references.
4193 +double_quote_subst='s/\(["`\\]\)/\\\1/g'
4194 +
4195 +# Sed substitution to delay expansion of an escaped shell variable in a
4196 +# double_quote_subst'ed string.
4197 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
4198 +
4199 +# Sed substitution to delay expansion of an escaped single quote.
4200 +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
4201 +
4202 +# Sed substitution to avoid accidental globbing in evaled expressions
4203 +no_glob_subst='s/\*/\\\*/g'
4204 +
4205 # Global variables:
4206 ofile=libtool
4207 can_build_shared=yes
4208 @@ -7073,7 +7110,7 @@ for cc_temp in $compiler""; do
4209 *) break;;
4210 esac
4211 done
4212 -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
4213 +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
4216 # Only perform the check for file, if the check method requires it
4217 @@ -7278,12 +7315,7 @@ if test -n "$compiler"; then
4218 lt_prog_compiler_no_builtin_flag=
4220 if test "$GCC" = yes; then
4221 - case $cc_basename in
4222 - nvcc*)
4223 - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
4224 - *)
4225 - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
4226 - esac
4227 + lt_prog_compiler_no_builtin_flag=' -fno-builtin'
4229 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
4230 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
4231 @@ -7303,15 +7335,15 @@ else
4232 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4233 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4234 -e 's:$: $lt_compiler_flag:'`
4235 - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
4236 + (eval echo "\"\$as_me:7338: $lt_compile\"" >&5)
4237 (eval "$lt_compile" 2>conftest.err)
4238 ac_status=$?
4239 cat conftest.err >&5
4240 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4241 + echo "$as_me:7342: \$? = $ac_status" >&5
4242 if (exit $ac_status) && test -s "$ac_outfile"; then
4243 # The compiler can only warn and ignore the option if not recognized
4244 # So say no if there are warnings other than the usual output.
4245 - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
4246 + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
4247 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4248 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
4249 lt_cv_prog_compiler_rtti_exceptions=yes
4250 @@ -7389,12 +7421,6 @@ $as_echo_n "checking for $compiler optio
4251 lt_prog_compiler_pic='-fno-common'
4252 ;;
4254 - haiku*)
4255 - # PIC is the default for Haiku.
4256 - # The "-static" flag exists, but is broken.
4257 - lt_prog_compiler_static=
4258 - ;;
4259 -
4260 hpux*)
4261 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
4262 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
4263 @@ -7437,13 +7463,6 @@ $as_echo_n "checking for $compiler optio
4264 lt_prog_compiler_pic='-fPIC'
4265 ;;
4266 esac
4267 -
4268 - case $cc_basename in
4269 - nvcc*) # Cuda Compiler Driver 2.2
4270 - lt_prog_compiler_wl='-Xlinker '
4271 - lt_prog_compiler_pic='-Xcompiler -fPIC'
4272 - ;;
4273 - esac
4274 else
4275 # PORTME Check for flag to pass linker flags through the system compiler.
4276 case $host_os in
4277 @@ -7506,7 +7525,7 @@ $as_echo_n "checking for $compiler optio
4278 lt_prog_compiler_pic='--shared'
4279 lt_prog_compiler_static='--static'
4280 ;;
4281 - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4282 + pgcc* | pgf77* | pgf90* | pgf95*)
4283 # Portland Group compilers (*not* the Pentium gcc compiler,
4284 # which looks to be a dead project)
4285 lt_prog_compiler_wl='-Wl,'
4286 @@ -7518,26 +7537,26 @@ $as_echo_n "checking for $compiler optio
4287 # All Alpha code is PIC.
4288 lt_prog_compiler_static='-non_shared'
4289 ;;
4290 - xl* | bgxl* | bgf* | mpixl*)
4291 - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
4292 + xl*)
4293 + # IBM XL C 8.0/Fortran 10.1 on PPC
4294 lt_prog_compiler_wl='-Wl,'
4295 lt_prog_compiler_pic='-qpic'
4296 lt_prog_compiler_static='-qstaticlink'
4297 ;;
4298 *)
4299 case `$CC -V 2>&1 | sed 5q` in
4300 - *Sun\ F* | *Sun*Fortran*)
4301 - # Sun Fortran 8.3 passes all unrecognized flags to the linker
4302 - lt_prog_compiler_pic='-KPIC'
4303 - lt_prog_compiler_static='-Bstatic'
4304 - lt_prog_compiler_wl=''
4305 - ;;
4306 *Sun\ C*)
4307 # Sun C 5.9
4308 lt_prog_compiler_pic='-KPIC'
4309 lt_prog_compiler_static='-Bstatic'
4310 lt_prog_compiler_wl='-Wl,'
4311 ;;
4312 + *Sun\ F*)
4313 + # Sun Fortran 8.3 passes all unrecognized flags to the linker
4314 + lt_prog_compiler_pic='-KPIC'
4315 + lt_prog_compiler_static='-Bstatic'
4316 + lt_prog_compiler_wl=''
4317 + ;;
4318 esac
4319 ;;
4320 esac
4321 @@ -7568,7 +7587,7 @@ $as_echo_n "checking for $compiler optio
4322 lt_prog_compiler_pic='-KPIC'
4323 lt_prog_compiler_static='-Bstatic'
4324 case $cc_basename in
4325 - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4326 + f77* | f90* | f95*)
4327 lt_prog_compiler_wl='-Qoption ld ';;
4328 *)
4329 lt_prog_compiler_wl='-Wl,';;
4330 @@ -7655,15 +7674,15 @@ else
4331 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4332 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4333 -e 's:$: $lt_compiler_flag:'`
4334 - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
4335 + (eval echo "\"\$as_me:7677: $lt_compile\"" >&5)
4336 (eval "$lt_compile" 2>conftest.err)
4337 ac_status=$?
4338 cat conftest.err >&5
4339 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4340 + echo "$as_me:7681: \$? = $ac_status" >&5
4341 if (exit $ac_status) && test -s "$ac_outfile"; then
4342 # The compiler can only warn and ignore the option if not recognized
4343 # So say no if there are warnings other than the usual output.
4344 - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
4345 + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
4346 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4347 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
4348 lt_cv_prog_compiler_pic_works=yes
4349 @@ -7711,7 +7730,7 @@ else
4350 if test -s conftest.err; then
4351 # Append any errors to the config.log.
4352 cat conftest.err 1>&5
4353 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
4354 + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
4355 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4356 if diff conftest.exp conftest.er2 >/dev/null; then
4357 lt_cv_prog_compiler_static_works=yes
4358 @@ -7760,16 +7779,16 @@ else
4359 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4360 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4361 -e 's:$: $lt_compiler_flag:'`
4362 - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
4363 + (eval echo "\"\$as_me:7782: $lt_compile\"" >&5)
4364 (eval "$lt_compile" 2>out/conftest.err)
4365 ac_status=$?
4366 cat out/conftest.err >&5
4367 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4368 + echo "$as_me:7786: \$? = $ac_status" >&5
4369 if (exit $ac_status) && test -s out/conftest2.$ac_objext
4370 then
4371 # The compiler can only warn and ignore the option if not recognized
4372 # So say no if there are warnings
4373 - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
4374 + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
4375 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
4376 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
4377 lt_cv_prog_compiler_c_o=yes
4378 @@ -7815,16 +7834,16 @@ else
4379 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4380 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
4381 -e 's:$: $lt_compiler_flag:'`
4382 - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
4383 + (eval echo "\"\$as_me:7837: $lt_compile\"" >&5)
4384 (eval "$lt_compile" 2>out/conftest.err)
4385 ac_status=$?
4386 cat out/conftest.err >&5
4387 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4388 + echo "$as_me:7841: \$? = $ac_status" >&5
4389 if (exit $ac_status) && test -s out/conftest2.$ac_objext
4390 then
4391 # The compiler can only warn and ignore the option if not recognized
4392 # So say no if there are warnings
4393 - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
4394 + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
4395 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
4396 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
4397 lt_cv_prog_compiler_c_o=yes
4398 @@ -7934,36 +7953,13 @@ $as_echo_n "checking whether the $compil
4399 openbsd*)
4400 with_gnu_ld=no
4401 ;;
4402 + linux* | k*bsd*-gnu)
4403 + link_all_deplibs=no
4404 + ;;
4405 esac
4407 ld_shlibs=yes
4408 -
4409 - # On some targets, GNU ld is compatible enough with the native linker
4410 - # that we're better off using the native interface for both.
4411 - lt_use_gnu_ld_interface=no
4412 if test "$with_gnu_ld" = yes; then
4413 - case $host_os in
4414 - aix*)
4415 - # The AIX port of GNU ld has always aspired to compatibility
4416 - # with the native linker. However, as the warning in the GNU ld
4417 - # block says, versions before 2.19.5* couldn't really create working
4418 - # shared libraries, regardless of the interface used.
4419 - case `$LD -v 2>&1` in
4420 - *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
4421 - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
4422 - *\ \(GNU\ Binutils\)\ [3-9]*) ;;
4423 - *)
4424 - lt_use_gnu_ld_interface=yes
4425 - ;;
4426 - esac
4427 - ;;
4428 - *)
4429 - lt_use_gnu_ld_interface=yes
4430 - ;;
4431 - esac
4432 - fi
4433 -
4434 - if test "$lt_use_gnu_ld_interface" = yes; then
4435 # If archive_cmds runs LD, not CC, wlarc should be empty
4436 wlarc='${wl}'
4438 @@ -7997,12 +7993,11 @@ $as_echo_n "checking whether the $compil
4439 ld_shlibs=no
4440 cat <<_LT_EOF 1>&2
4442 -*** Warning: the GNU linker, at least up to release 2.19, is reported
4443 +*** Warning: the GNU linker, at least up to release 2.9.1, is reported
4444 *** to be unable to reliably create shared libraries on AIX.
4445 *** Therefore, libtool is disabling shared libraries support. If you
4446 -*** really care for shared libraries, you may want to install binutils
4447 -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
4448 -*** You will then need to restart the configuration process.
4449 +*** really care for shared libraries, you may want to modify your PATH
4450 +*** so that a non-GNU linker is found, and then restart.
4452 _LT_EOF
4453 fi
4454 @@ -8038,7 +8033,6 @@ _LT_EOF
4455 # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
4456 # as there is no search path for DLLs.
4457 hardcode_libdir_flag_spec='-L$libdir'
4458 - export_dynamic_flag_spec='${wl}--export-all-symbols'
4459 allow_undefined_flag=unsupported
4460 always_export_symbols=no
4461 enable_shared_with_static_runtimes=yes
4462 @@ -8060,11 +8054,6 @@ _LT_EOF
4463 fi
4464 ;;
4466 - haiku*)
4467 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4468 - link_all_deplibs=yes
4469 - ;;
4470 -
4471 interix[3-9]*)
4472 hardcode_direct=no
4473 hardcode_shlibpath_var=no
4474 @@ -8094,12 +8083,11 @@ _LT_EOF
4475 tmp_sharedflag='-shared'
4476 case $cc_basename,$host_cpu in
4477 pgcc*) # Portland Group C compiler
4478 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4479 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4480 tmp_addflag=' $pic_flag'
4481 ;;
4482 - pgf77* | pgf90* | pgf95* | pgfortran*)
4483 - # Portland Group f77 and f90 compilers
4484 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4485 + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
4486 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4487 tmp_addflag=' $pic_flag -Mnomain' ;;
4488 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
4489 tmp_addflag=' -i_dynamic' ;;
4490 @@ -8110,17 +8098,13 @@ _LT_EOF
4491 lf95*) # Lahey Fortran 8.1
4492 whole_archive_flag_spec=
4493 tmp_sharedflag='--shared' ;;
4494 - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4495 + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4496 tmp_sharedflag='-qmkshrobj'
4497 tmp_addflag= ;;
4498 - nvcc*) # Cuda Compiler Driver 2.2
4499 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4500 - compiler_needs_object=yes
4501 - ;;
4502 esac
4503 case `$CC -V 2>&1 | sed 5q` in
4504 *Sun\ C*) # Sun C 5.9
4505 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4506 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4507 compiler_needs_object=yes
4508 tmp_sharedflag='-G' ;;
4509 *Sun\ F*) # Sun Fortran 8.3
4510 @@ -8136,17 +8120,17 @@ _LT_EOF
4511 fi
4513 case $cc_basename in
4514 - xlf* | bgf* | bgxlf* | mpixlf*)
4515 + xlf*)
4516 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
4517 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4518 hardcode_libdir_flag_spec=
4519 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4520 - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4521 + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4522 if test "x$supports_anon_versioning" = xyes; then
4523 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4524 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4525 echo "local: *; };" >> $output_objdir/$libname.ver~
4526 - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4527 + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4528 fi
4529 ;;
4530 esac
4531 @@ -8155,7 +8139,7 @@ _LT_EOF
4532 fi
4533 ;;
4535 - netbsd*)
4536 + netbsd* | netbsdelf*-gnu)
4537 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4538 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4539 wlarc=
4540 @@ -8267,10 +8251,8 @@ _LT_EOF
4541 else
4542 # If we're using GNU nm, then we don't want the "-C" option.
4543 # -C means demangle to AIX nm, but means don't demangle with GNU nm
4544 - # Also, AIX nm treats weak defined symbols like other global
4545 - # defined symbols, whereas GNU nm marks them as "W".
4546 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
4547 - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4548 + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4549 else
4550 export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4551 fi
4552 @@ -8332,6 +8314,7 @@ _LT_EOF
4553 if test "$aix_use_runtimelinking" = yes; then
4554 shared_flag="$shared_flag "'${wl}-G'
4555 fi
4556 + link_all_deplibs=no
4557 else
4558 # not using gcc
4559 if test "$host_cpu" = ia64; then
4560 @@ -8388,7 +8371,7 @@ rm -f core conftest.err conftest.$ac_obj
4561 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4563 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4564 - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4565 + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4566 else
4567 if test "$host_cpu" = ia64; then
4568 hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
4569 @@ -8432,13 +8415,8 @@ if test -z "$aix_libpath"; then aix_libp
4570 # -berok will link without error, but may produce a broken library.
4571 no_undefined_flag=' ${wl}-bernotok'
4572 allow_undefined_flag=' ${wl}-berok'
4573 - if test "$with_gnu_ld" = yes; then
4574 - # We only use this code for GNU lds that support --whole-archive.
4575 - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
4576 - else
4577 - # Exported symbols can be pulled into shared objects from archives
4578 - whole_archive_flag_spec='$convenience'
4579 - fi
4580 + # Exported symbols can be pulled into shared objects from archives
4581 + whole_archive_flag_spec='$convenience'
4582 archive_cmds_need_lc=yes
4583 # This is similar to how AIX traditionally builds its shared libraries.
4584 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
4585 @@ -8477,7 +8455,7 @@ if test -z "$aix_libpath"; then aix_libp
4586 # Tell ltmain to make .dll files, not .so files.
4587 shrext_cmds=".dll"
4588 # FIXME: Setting linknames here is a bad hack.
4589 - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4590 + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
4591 # The linker will automatically build a .lib file if we build a DLL.
4592 old_archive_from_new_cmds='true'
4593 # FIXME: Should let the user specify the lib program.
4594 @@ -8493,11 +8471,7 @@ if test -z "$aix_libpath"; then aix_libp
4595 hardcode_direct=no
4596 hardcode_automatic=yes
4597 hardcode_shlibpath_var=unsupported
4598 - if test "$lt_cv_ld_force_load" = "yes"; then
4599 - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
4600 - else
4601 - whole_archive_flag_spec=''
4602 - fi
4603 + whole_archive_flag_spec=''
4604 link_all_deplibs=yes
4605 allow_undefined_flag="$_lt_dar_allow_undefined"
4606 case $cc_basename in
4607 @@ -8505,7 +8479,7 @@ if test -z "$aix_libpath"; then aix_libp
4608 *) _lt_dar_can_shared=$GCC ;;
4609 esac
4610 if test "$_lt_dar_can_shared" = "yes"; then
4611 - output_verbose_link_cmd=func_echo_all
4612 + output_verbose_link_cmd=echo
4613 archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
4614 module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
4615 archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
4616 @@ -8571,7 +8545,7 @@ if test -z "$aix_libpath"; then aix_libp
4617 ;;
4619 hpux10*)
4620 - if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4621 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
4622 archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4623 else
4624 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4625 @@ -8590,7 +8564,7 @@ if test -z "$aix_libpath"; then aix_libp
4626 ;;
4628 hpux11*)
4629 - if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4630 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
4631 case $host_cpu in
4632 hppa*64*)
4633 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4634 @@ -8611,46 +8585,7 @@ if test -z "$aix_libpath"; then aix_libp
4635 archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4636 ;;
4637 *)
4638 -
4639 - # Older versions of the 11.00 compiler do not understand -b yet
4640 - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
4641 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
4642 -$as_echo_n "checking if $CC understands -b... " >&6; }
4643 -if test "${lt_cv_prog_compiler__b+set}" = set; then :
4644 - $as_echo_n "(cached) " >&6
4645 -else
4646 - lt_cv_prog_compiler__b=no
4647 - save_LDFLAGS="$LDFLAGS"
4648 - LDFLAGS="$LDFLAGS -b"
4649 - echo "$lt_simple_link_test_code" > conftest.$ac_ext
4650 - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
4651 - # The linker can only warn and ignore the option if not recognized
4652 - # So say no if there are warnings
4653 - if test -s conftest.err; then
4654 - # Append any errors to the config.log.
4655 - cat conftest.err 1>&5
4656 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
4657 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4658 - if diff conftest.exp conftest.er2 >/dev/null; then
4659 - lt_cv_prog_compiler__b=yes
4660 - fi
4661 - else
4662 - lt_cv_prog_compiler__b=yes
4663 - fi
4664 - fi
4665 - $RM -r conftest*
4666 - LDFLAGS="$save_LDFLAGS"
4667 -
4668 -fi
4669 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
4670 -$as_echo "$lt_cv_prog_compiler__b" >&6; }
4671 -
4672 -if test x"$lt_cv_prog_compiler__b" = xyes; then
4673 - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4674 -else
4675 - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4676 -fi
4677 -
4678 + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4679 ;;
4680 esac
4681 fi
4682 @@ -8678,7 +8613,7 @@ fi
4684 irix5* | irix6* | nonstopux*)
4685 if test "$GCC" = yes; then
4686 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4687 + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4688 # Try to use the -exported_symbol ld option, if it does not
4689 # work, assume that -exports_file does not work either and
4690 # implicitly export all symbols.
4691 @@ -8689,15 +8624,15 @@ fi
4692 int foo(void) {}
4693 _ACEOF
4694 if ac_fn_c_try_link "$LINENO"; then :
4695 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
4696 + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
4698 fi
4699 rm -f core conftest.err conftest.$ac_objext \
4700 conftest$ac_exeext conftest.$ac_ext
4701 LDFLAGS="$save_LDFLAGS"
4702 else
4703 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
4704 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
4705 + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
4706 + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
4707 fi
4708 archive_cmds_need_lc='no'
4709 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
4710 @@ -8706,7 +8641,7 @@ rm -f core conftest.err conftest.$ac_obj
4711 link_all_deplibs=yes
4712 ;;
4714 - netbsd*)
4715 + netbsd* | netbsdelf*-gnu)
4716 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4717 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
4718 else
4719 @@ -8759,17 +8694,17 @@ rm -f core conftest.err conftest.$ac_obj
4720 hardcode_libdir_flag_spec='-L$libdir'
4721 hardcode_minus_L=yes
4722 allow_undefined_flag=unsupported
4723 - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
4724 + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
4725 old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
4726 ;;
4728 osf3*)
4729 if test "$GCC" = yes; then
4730 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
4731 - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4732 + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4733 else
4734 allow_undefined_flag=' -expect_unresolved \*'
4735 - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
4736 + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
4737 fi
4738 archive_cmds_need_lc='no'
4739 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
4740 @@ -8779,13 +8714,13 @@ rm -f core conftest.err conftest.$ac_obj
4741 osf4* | osf5*) # as osf3* with the addition of -msym flag
4742 if test "$GCC" = yes; then
4743 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
4744 - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4745 + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4746 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
4747 else
4748 allow_undefined_flag=' -expect_unresolved \*'
4749 - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
4750 + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
4751 archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
4752 - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
4753 + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
4755 # Both c and cxx compiler support -rpath directly
4756 hardcode_libdir_flag_spec='-rpath $libdir'
4757 @@ -8988,50 +8923,44 @@ x|xyes)
4758 # to ld, don't add -lc before -lgcc.
4759 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
4760 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
4761 -if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
4762 - $as_echo_n "(cached) " >&6
4763 -else
4764 - $RM conftest*
4765 - echo "$lt_simple_compile_test_code" > conftest.$ac_ext
4766 + $RM conftest*
4767 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
4769 - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4770 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4771 (eval $ac_compile) 2>&5
4772 ac_status=$?
4773 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4774 test $ac_status = 0; } 2>conftest.err; then
4775 - soname=conftest
4776 - lib=conftest
4777 - libobjs=conftest.$ac_objext
4778 - deplibs=
4779 - wl=$lt_prog_compiler_wl
4780 - pic_flag=$lt_prog_compiler_pic
4781 - compiler_flags=-v
4782 - linker_flags=-v
4783 - verstring=
4784 - output_objdir=.
4785 - libname=conftest
4786 - lt_save_allow_undefined_flag=$allow_undefined_flag
4787 - allow_undefined_flag=
4788 - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
4789 + soname=conftest
4790 + lib=conftest
4791 + libobjs=conftest.$ac_objext
4792 + deplibs=
4793 + wl=$lt_prog_compiler_wl
4794 + pic_flag=$lt_prog_compiler_pic
4795 + compiler_flags=-v
4796 + linker_flags=-v
4797 + verstring=
4798 + output_objdir=.
4799 + libname=conftest
4800 + lt_save_allow_undefined_flag=$allow_undefined_flag
4801 + allow_undefined_flag=
4802 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
4803 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
4804 ac_status=$?
4805 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4806 test $ac_status = 0; }
4807 - then
4808 - lt_cv_archive_cmds_need_lc=no
4809 - else
4810 - lt_cv_archive_cmds_need_lc=yes
4811 - fi
4812 - allow_undefined_flag=$lt_save_allow_undefined_flag
4813 - else
4814 - cat conftest.err 1>&5
4815 - fi
4816 - $RM conftest*
4817 -
4818 -fi
4819 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
4820 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
4821 - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
4822 + then
4823 + archive_cmds_need_lc=no
4824 + else
4825 + archive_cmds_need_lc=yes
4826 + fi
4827 + allow_undefined_flag=$lt_save_allow_undefined_flag
4828 + else
4829 + cat conftest.err 1>&5
4830 + fi
4831 + $RM conftest*
4832 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
4833 +$as_echo "$archive_cmds_need_lc" >&6; }
4834 ;;
4835 esac
4836 fi
4837 @@ -9202,23 +9131,16 @@ if test "$GCC" = yes; then
4838 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
4839 *) lt_awk_arg="/^libraries:/" ;;
4840 esac
4841 - case $host_os in
4842 - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
4843 - *) lt_sed_strip_eq="s,=/,/,g" ;;
4844 - esac
4845 - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
4846 - case $lt_search_path_spec in
4847 - *\;*)
4848 + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4849 + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
4850 # if the path contains ";" then we assume it to be the separator
4851 # otherwise default to the standard path separator (i.e. ":") - it is
4852 # assumed that no part of a normal pathname contains ";" but that should
4853 # okay in the real world where ";" in dirpaths is itself problematic.
4854 - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
4855 - ;;
4856 - *)
4857 - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
4858 - ;;
4859 - esac
4860 + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
4861 + else
4862 + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4863 + fi
4864 # Ok, now we have the path, separated by spaces, we can step through it
4865 # and add multilib dir if necessary.
4866 lt_tmp_lt_search_path_spec=
4867 @@ -9231,7 +9153,7 @@ if test "$GCC" = yes; then
4868 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
4869 fi
4870 done
4871 - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
4872 + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
4873 BEGIN {RS=" "; FS="/|\n";} {
4874 lt_foo="";
4875 lt_count=0;
4876 @@ -9251,13 +9173,7 @@ BEGIN {RS=" "; FS="/|\n";} {
4877 if (lt_foo != "") { lt_freq[lt_foo]++; }
4878 if (lt_freq[lt_foo] == 1) { print lt_foo; }
4879 }'`
4880 - # AWK program above erroneously prepends '/' to C:/dos/paths
4881 - # for these hosts.
4882 - case $host_os in
4883 - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
4884 - $SED 's,/\([A-Za-z]:\),\1,g'` ;;
4885 - esac
4886 - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
4887 + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
4888 else
4889 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
4890 fi
4891 @@ -9345,7 +9261,7 @@ amigaos*)
4892 m68k)
4893 library_names_spec='$libname.ixlibrary $libname.a'
4894 # Create ${libname}_ixlibrary.a entries in /sys/libs.
4895 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
4896 + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
4897 ;;
4898 esac
4899 ;;
4900 @@ -9398,12 +9314,23 @@ cygwin* | mingw* | pw32* | cegcc*)
4901 cygwin*)
4902 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
4903 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
4904 -
4905 - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
4906 + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
4907 ;;
4908 mingw* | cegcc*)
4909 # MinGW DLLs use traditional 'lib' prefix
4910 soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
4911 + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4912 + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
4913 + # It is most probably a Windows format PATH printed by
4914 + # mingw gcc, but we are running on Cygwin. Gcc prints its search
4915 + # path with ; separators, and with drive letters. We can handle the
4916 + # drive letters (cygwin fileutils understands them), so leave them,
4917 + # especially as we might pass files found there to a mingw objdump,
4918 + # which wouldn't understand a cygwinified path. Ahh.
4919 + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
4920 + else
4921 + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4922 + fi
4923 ;;
4924 pw32*)
4925 # pw32 DLLs use 'pw' prefix rather than 'lib'
4926 @@ -9503,19 +9430,6 @@ gnu*)
4927 hardcode_into_libs=yes
4928 ;;
4930 -haiku*)
4931 - version_type=linux
4932 - need_lib_prefix=no
4933 - need_version=no
4934 - dynamic_linker="$host_os runtime_loader"
4935 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
4936 - soname_spec='${libname}${release}${shared_ext}$major'
4937 - shlibpath_var=LIBRARY_PATH
4938 - shlibpath_overrides_runpath=yes
4939 - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
4940 - hardcode_into_libs=yes
4941 - ;;
4942 -
4943 hpux9* | hpux10* | hpux11*)
4944 # Give a soname corresponding to the major version so that dld.sl refuses to
4945 # link against other versions.
4946 @@ -9558,10 +9472,8 @@ hpux9* | hpux10* | hpux11*)
4947 soname_spec='${libname}${release}${shared_ext}$major'
4948 ;;
4949 esac
4950 - # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
4951 + # HP-UX runs *really* slowly unless shared libraries are mode 555.
4952 postinstall_cmds='chmod 555 $lib'
4953 - # or fails outright, so override atomically:
4954 - install_override_mode=555
4955 ;;
4957 interix[3-9]*)
4958 @@ -9628,17 +9540,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
4959 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
4960 shlibpath_var=LD_LIBRARY_PATH
4961 shlibpath_overrides_runpath=no
4962 -
4963 # Some binutils ld are patched to set DT_RUNPATH
4964 - if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
4965 - $as_echo_n "(cached) " >&6
4966 -else
4967 - lt_cv_shlibpath_overrides_runpath=no
4968 - save_LDFLAGS=$LDFLAGS
4969 - save_libdir=$libdir
4970 - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
4971 - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
4972 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4973 + save_LDFLAGS=$LDFLAGS
4974 + save_libdir=$libdir
4975 + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
4976 + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
4977 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4978 /* end confdefs.h. */
4980 int
4981 @@ -9651,17 +9558,13 @@ main ()
4982 _ACEOF
4983 if ac_fn_c_try_link "$LINENO"; then :
4984 if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
4985 - lt_cv_shlibpath_overrides_runpath=yes
4986 + shlibpath_overrides_runpath=yes
4987 fi
4988 fi
4989 rm -f core conftest.err conftest.$ac_objext \
4990 conftest$ac_exeext conftest.$ac_ext
4991 - LDFLAGS=$save_LDFLAGS
4992 - libdir=$save_libdir
4993 -
4994 -fi
4995 -
4996 - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
4997 + LDFLAGS=$save_LDFLAGS
4998 + libdir=$save_libdir
5000 # This implies no fast_install, which is unacceptable.
5001 # Some rework will be needed to allow for fast_install
5002 @@ -9670,7 +9573,7 @@ fi
5004 # Append ld.so.conf contents to the search path
5005 if test -f /etc/ld.so.conf; then
5006 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
5007 + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
5008 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
5009 fi
5011 @@ -9683,6 +9586,18 @@ fi
5012 dynamic_linker='GNU/Linux ld.so'
5013 ;;
5015 +netbsdelf*-gnu)
5016 + version_type=linux
5017 + need_lib_prefix=no
5018 + need_version=no
5019 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
5020 + soname_spec='${libname}${release}${shared_ext}$major'
5021 + shlibpath_var=LD_LIBRARY_PATH
5022 + shlibpath_overrides_runpath=no
5023 + hardcode_into_libs=yes
5024 + dynamic_linker='NetBSD ld.elf_so'
5025 + ;;
5026 +
5027 netbsd*)
5028 version_type=sunos
5029 need_lib_prefix=no
5030 @@ -9973,11 +9888,6 @@ fi
5034 -
5035 -
5036 -
5037 -
5038 -
5039 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
5040 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
5041 hardcode_action=
5042 @@ -10308,7 +10218,7 @@ else
5043 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5044 lt_status=$lt_dlunknown
5045 cat > conftest.$ac_ext <<_LT_EOF
5046 -#line $LINENO "configure"
5047 +#line 10221 "configure"
5048 #include "confdefs.h"
5050 #if HAVE_DLFCN_H
5051 @@ -10349,13 +10259,7 @@ else
5052 # endif
5053 #endif
5055 -/* When -fvisbility=hidden is used, assume the code has been annotated
5056 - correspondingly for the symbols needed. */
5057 -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5058 -void fnord () __attribute__((visibility("default")));
5059 -#endif
5060 -
5061 -void fnord () { int i=42; }
5062 +void fnord() { int i=42;}
5063 int main ()
5064 {
5065 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5066 @@ -10364,11 +10268,7 @@ int main ()
5067 if (self)
5068 {
5069 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
5070 - else
5071 - {
5072 - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
5073 - else puts (dlerror ());
5074 - }
5075 + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
5076 /* dlclose (self); */
5077 }
5078 else
5079 @@ -10414,7 +10314,7 @@ else
5080 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5081 lt_status=$lt_dlunknown
5082 cat > conftest.$ac_ext <<_LT_EOF
5083 -#line $LINENO "configure"
5084 +#line 10317 "configure"
5085 #include "confdefs.h"
5087 #if HAVE_DLFCN_H
5088 @@ -10455,13 +10355,7 @@ else
5089 # endif
5090 #endif
5092 -/* When -fvisbility=hidden is used, assume the code has been annotated
5093 - correspondingly for the symbols needed. */
5094 -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5095 -void fnord () __attribute__((visibility("default")));
5096 -#endif
5097 -
5098 -void fnord () { int i=42; }
5099 +void fnord() { int i=42;}
5100 int main ()
5101 {
5102 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5103 @@ -10470,11 +10364,7 @@ int main ()
5104 if (self)
5105 {
5106 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
5107 - else
5108 - {
5109 - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
5110 - else puts (dlerror ());
5111 - }
5112 + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
5113 /* dlclose (self); */
5114 }
5115 else
5116 @@ -11343,10 +11233,6 @@ pkg_modules="gtk+-2.0 >= 2.12.0 \
5117 # libstartup-notification-1.0"
5120 -
5121 -
5122 -
5123 -
5124 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
5125 if test -n "$ac_tool_prefix"; then
5126 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
5127 @@ -11459,16 +11345,18 @@ $as_echo "yes" >&6; }
5128 $as_echo "no" >&6; }
5129 PKG_CONFIG=""
5130 fi
5131 +
5132 fi
5134 pkg_failed=no
5135 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGE" >&5
5136 $as_echo_n "checking for PACKAGE... " >&6; }
5138 -if test -n "$PACKAGE_CFLAGS"; then
5139 - pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS"
5140 - elif test -n "$PKG_CONFIG"; then
5141 - if test -n "$PKG_CONFIG" && \
5142 +if test -n "$PKG_CONFIG"; then
5143 + if test -n "$PACKAGE_CFLAGS"; then
5144 + pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS"
5145 + else
5146 + if test -n "$PKG_CONFIG" && \
5147 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5
5148 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
5149 ac_status=$?
5150 @@ -11478,13 +11366,15 @@ if test -n "$PACKAGE_CFLAGS"; then
5151 else
5152 pkg_failed=yes
5153 fi
5154 - else
5155 - pkg_failed=untried
5156 + fi
5157 +else
5158 + pkg_failed=untried
5159 fi
5160 -if test -n "$PACKAGE_LIBS"; then
5161 - pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS"
5162 - elif test -n "$PKG_CONFIG"; then
5163 - if test -n "$PKG_CONFIG" && \
5164 +if test -n "$PKG_CONFIG"; then
5165 + if test -n "$PACKAGE_LIBS"; then
5166 + pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS"
5167 + else
5168 + if test -n "$PKG_CONFIG" && \
5169 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5
5170 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
5171 ac_status=$?
5172 @@ -11494,15 +11384,14 @@ if test -n "$PACKAGE_LIBS"; then
5173 else
5174 pkg_failed=yes
5175 fi
5176 - else
5177 - pkg_failed=untried
5178 + fi
5179 +else
5180 + pkg_failed=untried
5181 fi
5185 if test $pkg_failed = yes; then
5186 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5187 -$as_echo "no" >&6; }
5189 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
5190 _pkg_short_errors_supported=yes
5191 @@ -11510,9 +11399,9 @@ else
5192 _pkg_short_errors_supported=no
5193 fi
5194 if test $_pkg_short_errors_supported = yes; then
5195 - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$pkg_modules" 2>&1`
5196 + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"`
5197 else
5198 - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$pkg_modules" 2>&1`
5199 + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
5200 fi
5201 # Put the nasty error message in config.log where it belongs
5202 echo "$PACKAGE_PKG_ERRORS" >&5
5203 @@ -11526,10 +11415,9 @@ installed software in a non-standard pre
5205 Alternatively, you may set the environment variables PACKAGE_CFLAGS
5206 and PACKAGE_LIBS to avoid the need to call pkg-config.
5207 -See the pkg-config man page for more details." "$LINENO" 5
5208 +See the pkg-config man page for more details.
5209 +" "$LINENO" 5
5210 elif test $pkg_failed = untried; then
5211 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5212 -$as_echo "no" >&6; }
5213 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5214 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5215 as_fn_error "The pkg-config script could not be found or is too old. Make sure it
5216 @@ -11547,10 +11435,136 @@ else
5217 PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
5218 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5219 $as_echo "yes" >&6; }
5220 + :
5221 +fi
5222 +
5223 +
5224 +
5225 +###########################
5226 +# Indicator Info
5227 +###########################
5228 +# Check whether --enable-indicator_support was given.
5229 +if test "${enable_indicator_support+set}" = set; then :
5230 + enableval=$enable_indicator_support; indicator_support=$enableval
5231 +else
5232 + indicator_support="no"
5233 +fi
5234 +
5235 + if test x"$indicator_support" = x"yes"; then
5236 + ENABLE_INDICATOR_SUPPORT_TRUE=
5237 + ENABLE_INDICATOR_SUPPORT_FALSE='#'
5238 +else
5239 + ENABLE_INDICATOR_SUPPORT_TRUE='#'
5240 + ENABLE_INDICATOR_SUPPORT_FALSE=
5241 +fi
5242 +
5243 +
5244 +if test "$indicator_support" != "no"; then
5245 + INDICATOR_REQUIRED_VERSION=0.3.0
5246 +
5247 +
5248 +pkg_failed=no
5249 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5
5250 +$as_echo_n "checking for APPLET... " >&6; }
5251 +
5252 +if test -n "$PKG_CONFIG"; then
5253 + if test -n "$APPLET_CFLAGS"; then
5254 + pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
5255 + else
5256 + if test -n "$PKG_CONFIG" && \
5257 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
5258 + ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION") 2>&5
5259 + ac_status=$?
5260 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5261 + test $ac_status = 0; }; then
5262 + pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "indicator >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
5263 +else
5264 + pkg_failed=yes
5265 +fi
5266 + fi
5267 +else
5268 + pkg_failed=untried
5269 +fi
5270 +if test -n "$PKG_CONFIG"; then
5271 + if test -n "$APPLET_LIBS"; then
5272 + pkg_cv_APPLET_LIBS="$APPLET_LIBS"
5273 + else
5274 + if test -n "$PKG_CONFIG" && \
5275 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
5276 + ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION") 2>&5
5277 + ac_status=$?
5278 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5279 + test $ac_status = 0; }; then
5280 + pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "indicator >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
5281 +else
5282 + pkg_failed=yes
5283 +fi
5284 + fi
5285 +else
5286 + pkg_failed=untried
5287 +fi
5288 +
5289 +
5290 +
5291 +if test $pkg_failed = yes; then
5292 +
5293 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
5294 + _pkg_short_errors_supported=yes
5295 +else
5296 + _pkg_short_errors_supported=no
5297 +fi
5298 + if test $_pkg_short_errors_supported = yes; then
5299 + APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION"`
5300 + else
5301 + APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION"`
5302 + fi
5303 + # Put the nasty error message in config.log where it belongs
5304 + echo "$APPLET_PKG_ERRORS" >&5
5305 +
5306 + as_fn_error "Package requirements (indicator >= $INDICATOR_REQUIRED_VERSION) were not met:
5307 +
5308 +$APPLET_PKG_ERRORS
5309 +
5310 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
5311 +installed software in a non-standard prefix.
5312 +
5313 +Alternatively, you may set the environment variables APPLET_CFLAGS
5314 +and APPLET_LIBS to avoid the need to call pkg-config.
5315 +See the pkg-config man page for more details.
5316 +" "$LINENO" 5
5317 +elif test $pkg_failed = untried; then
5318 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5319 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5320 +as_fn_error "The pkg-config script could not be found or is too old. Make sure it
5321 +is in your PATH or set the PKG_CONFIG environment variable to the full
5322 +path to pkg-config.
5323 +
5324 +Alternatively, you may set the environment variables APPLET_CFLAGS
5325 +and APPLET_LIBS to avoid the need to call pkg-config.
5326 +See the pkg-config man page for more details.
5327 +
5328 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
5329 +See \`config.log' for more details." "$LINENO" 5; }
5330 +else
5331 + APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
5332 + APPLET_LIBS=$pkg_cv_APPLET_LIBS
5333 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5334 +$as_echo "yes" >&6; }
5335 + :
5336 +fi
5337 +
5339 + if test "x$with_localinstall" = "xyes"; then
5340 + INDICATORDIR="${libdir}/indicators/2/"
5341 + INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
5342 + else
5343 + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
5344 + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
5345 fi
5348 +fi
5349 +
5351 pkg_modules="x11"
5353 @@ -11558,10 +11572,11 @@ pkg_failed=no
5354 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
5355 $as_echo_n "checking for X11... " >&6; }
5357 -if test -n "$X11_CFLAGS"; then
5358 - pkg_cv_X11_CFLAGS="$X11_CFLAGS"
5359 - elif test -n "$PKG_CONFIG"; then
5360 - if test -n "$PKG_CONFIG" && \
5361 +if test -n "$PKG_CONFIG"; then
5362 + if test -n "$X11_CFLAGS"; then
5363 + pkg_cv_X11_CFLAGS="$X11_CFLAGS"
5364 + else
5365 + if test -n "$PKG_CONFIG" && \
5366 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5
5367 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
5368 ac_status=$?
5369 @@ -11571,13 +11586,15 @@ if test -n "$X11_CFLAGS"; then
5370 else
5371 pkg_failed=yes
5372 fi
5373 - else
5374 - pkg_failed=untried
5375 + fi
5376 +else
5377 + pkg_failed=untried
5378 fi
5379 -if test -n "$X11_LIBS"; then
5380 - pkg_cv_X11_LIBS="$X11_LIBS"
5381 - elif test -n "$PKG_CONFIG"; then
5382 - if test -n "$PKG_CONFIG" && \
5383 +if test -n "$PKG_CONFIG"; then
5384 + if test -n "$X11_LIBS"; then
5385 + pkg_cv_X11_LIBS="$X11_LIBS"
5386 + else
5387 + if test -n "$PKG_CONFIG" && \
5388 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5
5389 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
5390 ac_status=$?
5391 @@ -11587,15 +11604,14 @@ if test -n "$X11_LIBS"; then
5392 else
5393 pkg_failed=yes
5394 fi
5395 - else
5396 - pkg_failed=untried
5397 + fi
5398 +else
5399 + pkg_failed=untried
5400 fi
5404 if test $pkg_failed = yes; then
5405 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5406 -$as_echo "no" >&6; }
5408 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
5409 _pkg_short_errors_supported=yes
5410 @@ -11603,9 +11619,9 @@ else
5411 _pkg_short_errors_supported=no
5412 fi
5413 if test $_pkg_short_errors_supported = yes; then
5414 - X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$pkg_modules" 2>&1`
5415 + X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"`
5416 else
5417 - X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "$pkg_modules" 2>&1`
5418 + X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
5419 fi
5420 # Put the nasty error message in config.log where it belongs
5421 echo "$X11_PKG_ERRORS" >&5
5422 @@ -11619,10 +11635,9 @@ installed software in a non-standard pre
5424 Alternatively, you may set the environment variables X11_CFLAGS
5425 and X11_LIBS to avoid the need to call pkg-config.
5426 -See the pkg-config man page for more details." "$LINENO" 5
5427 +See the pkg-config man page for more details.
5428 +" "$LINENO" 5
5429 elif test $pkg_failed = untried; then
5430 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5431 -$as_echo "no" >&6; }
5432 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5433 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5434 as_fn_error "The pkg-config script could not be found or is too old. Make sure it
5435 @@ -11640,7 +11655,7 @@ else
5436 X11_LIBS=$pkg_cv_X11_LIBS
5437 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5438 $as_echo "yes" >&6; }
5439 -
5440 + :
5441 fi
5444 @@ -11650,10 +11665,11 @@ pkg_failed=no
5445 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MENU_CACHE" >&5
5446 $as_echo_n "checking for MENU_CACHE... " >&6; }
5448 -if test -n "$MENU_CACHE_CFLAGS"; then
5449 - pkg_cv_MENU_CACHE_CFLAGS="$MENU_CACHE_CFLAGS"
5450 - elif test -n "$PKG_CONFIG"; then
5451 - if test -n "$PKG_CONFIG" && \
5452 +if test -n "$PKG_CONFIG"; then
5453 + if test -n "$MENU_CACHE_CFLAGS"; then
5454 + pkg_cv_MENU_CACHE_CFLAGS="$MENU_CACHE_CFLAGS"
5455 + else
5456 + if test -n "$PKG_CONFIG" && \
5457 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5
5458 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
5459 ac_status=$?
5460 @@ -11663,13 +11679,15 @@ if test -n "$MENU_CACHE_CFLAGS"; then
5461 else
5462 pkg_failed=yes
5463 fi
5464 - else
5465 - pkg_failed=untried
5466 + fi
5467 +else
5468 + pkg_failed=untried
5469 fi
5470 -if test -n "$MENU_CACHE_LIBS"; then
5471 - pkg_cv_MENU_CACHE_LIBS="$MENU_CACHE_LIBS"
5472 - elif test -n "$PKG_CONFIG"; then
5473 - if test -n "$PKG_CONFIG" && \
5474 +if test -n "$PKG_CONFIG"; then
5475 + if test -n "$MENU_CACHE_LIBS"; then
5476 + pkg_cv_MENU_CACHE_LIBS="$MENU_CACHE_LIBS"
5477 + else
5478 + if test -n "$PKG_CONFIG" && \
5479 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5
5480 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
5481 ac_status=$?
5482 @@ -11679,15 +11697,14 @@ if test -n "$MENU_CACHE_LIBS"; then
5483 else
5484 pkg_failed=yes
5485 fi
5486 - else
5487 - pkg_failed=untried
5488 + fi
5489 +else
5490 + pkg_failed=untried
5491 fi
5495 if test $pkg_failed = yes; then
5496 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5497 -$as_echo "no" >&6; }
5499 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
5500 _pkg_short_errors_supported=yes
5501 @@ -11695,17 +11712,17 @@ else
5502 _pkg_short_errors_supported=no
5503 fi
5504 if test $_pkg_short_errors_supported = yes; then
5505 - MENU_CACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$pkg_modules" 2>&1`
5506 + MENU_CACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"`
5507 else
5508 - MENU_CACHE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$pkg_modules" 2>&1`
5509 + MENU_CACHE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
5510 fi
5511 # Put the nasty error message in config.log where it belongs
5512 echo "$MENU_CACHE_PKG_ERRORS" >&5
5514 - enable_menu_cache=no
5515 -elif test $pkg_failed = untried; then
5516 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5517 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5518 $as_echo "no" >&6; }
5519 + enable_menu_cache=no
5520 +elif test $pkg_failed = untried; then
5521 enable_menu_cache=no
5522 else
5523 MENU_CACHE_CFLAGS=$pkg_cv_MENU_CACHE_CFLAGS
5524 @@ -11944,6 +11961,7 @@ plugin_xkb=
5525 plugin_kbled=
5526 plugin_thermal=
5527 plugin_cpufreq=
5528 +plugin_indicator=
5530 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which plugins should be built dynamically" >&5
5531 $as_echo_n "checking which plugins should be built dynamically... " >&6; }
5532 @@ -11977,6 +11995,7 @@ if test x"$plugins" = xall; then
5533 plugin_xkb=xkb
5534 plugin_thermal=thermal
5535 plugin_cpufreq=cpufreq
5536 + plugin_indicator=indicator
5538 { $as_echo "$as_me:${as_lineno-$LINENO}: result: all" >&5
5539 $as_echo "all" >&6; }
5540 @@ -12016,6 +12035,9 @@ else
5541 cpufreq)
5542 plugin_cpufreq=cpufreq
5543 ;;
5544 + cpufreq)
5545 + plugin_indicator=indicator
5546 + ;;
5547 *)
5548 echo "Unknown plugin $plugin."
5549 exit 1
5550 @@ -12036,6 +12058,11 @@ $as_echo "no ALSA headers/libraries foun
5551 else
5552 plugin_volume=
5553 fi
5554 +
5555 +if test x"$indicator_support" = "xno"; then
5556 + plugin_indicator=
5557 +fi
5558 +
5559 PLUGINS_LIST="\
5560 $plugin_netstatus \
5561 $plugin_volume \
5562 @@ -12046,7 +12073,8 @@ PLUGINS_LIST="\
5563 $plugin_kbled \
5564 $plugin_xkb \
5565 $plugin_thermal \
5566 - $plugin_cpufreq"
5567 + $plugin_cpufreq \
5568 + $plugin_indicator"
5572 @@ -13795,7 +13823,7 @@ else
5573 fi
5576 -ac_config_files="$ac_config_files lxpanel.pc Makefile src/Makefile src/plugins/Makefile src/plugins/netstatus/Makefile src/plugins/volume/Makefile src/plugins/volumealsa/Makefile src/plugins/cpu/Makefile src/plugins/deskno/Makefile src/plugins/batt/Makefile src/plugins/kbled/Makefile src/plugins/xkb/Makefile src/plugins/thermal/Makefile src/plugins/cpufreq/Makefile po/Makefile.in data/Makefile data/default/panels/panel man/Makefile"
5577 +ac_config_files="$ac_config_files lxpanel.pc Makefile src/Makefile src/plugins/Makefile src/plugins/netstatus/Makefile src/plugins/volume/Makefile src/plugins/volumealsa/Makefile src/plugins/cpu/Makefile src/plugins/deskno/Makefile src/plugins/batt/Makefile src/plugins/kbled/Makefile src/plugins/xkb/Makefile src/plugins/thermal/Makefile src/plugins/cpufreq/Makefile src/plugins/indicator/Makefile po/Makefile.in data/Makefile data/default/panels/panel man/Makefile"
5579 cat >confcache <<\_ACEOF
5580 # This file is a shell script that caches the results of configure
5581 @@ -13914,6 +13942,10 @@ fi
5582 ac_config_commands="$ac_config_commands po/stamp-it"
5585 +if test -z "${ENABLE_INDICATOR_SUPPORT_TRUE}" && test -z "${ENABLE_INDICATOR_SUPPORT_FALSE}"; then
5586 + as_fn_error "conditional \"ENABLE_INDICATOR_SUPPORT\" was never defined.
5587 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
5588 +fi
5589 if test -z "${ENABLE_MENU_CACHE_TRUE}" && test -z "${ENABLE_MENU_CACHE_FALSE}"; then
5590 as_fn_error "conditional \"ENABLE_MENU_CACHE\" was never defined.
5591 Usually this means the macro was only invoked conditionally." "$LINENO" 5
5592 @@ -14531,143 +14563,131 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
5593 sed_quote_subst='$sed_quote_subst'
5594 double_quote_subst='$double_quote_subst'
5595 delay_variable_subst='$delay_variable_subst'
5596 -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
5597 -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
5598 -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
5599 -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
5600 -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
5601 -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
5602 -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
5603 -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
5604 -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
5605 -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
5606 -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
5607 -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
5608 -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
5609 -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
5610 -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
5611 -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
5612 -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
5613 -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
5614 -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
5615 -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
5616 -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
5617 -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
5618 -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
5619 -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
5620 -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5621 -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5622 -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5623 -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5624 -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5625 -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5626 -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5627 -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5628 -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5629 -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5630 -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5631 -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5632 -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5633 -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5634 -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
5635 -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
5636 -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
5637 -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
5638 -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
5639 -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
5640 -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
5641 -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
5642 -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5643 -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5644 -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
5645 -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5646 -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5647 -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5648 -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5649 -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5650 -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5651 -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5652 -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5653 -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5654 -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5655 -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5656 -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
5657 -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
5658 -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
5659 -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
5660 -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
5661 -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
5662 -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
5663 -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
5664 -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
5665 -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
5666 -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
5667 -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
5668 -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
5669 -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
5670 -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
5671 -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
5672 -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
5673 -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
5674 -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
5675 -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
5676 -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
5677 -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
5678 -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
5679 -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
5680 -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
5681 -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
5682 -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5683 -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5684 -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5685 -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5686 -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5687 -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5688 -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5689 -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5690 -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5691 -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5692 -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5693 -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5694 -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
5695 -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
5696 -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
5697 -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
5698 -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
5699 -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
5700 -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
5701 -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
5702 -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
5703 -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5704 -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
5705 -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
5706 -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
5707 -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
5708 -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
5709 -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
5710 -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
5711 -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
5712 -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
5713 -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
5714 -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
5715 -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
5716 +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
5717 +macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
5718 +macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
5719 +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
5720 +pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
5721 +enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
5722 +host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
5723 +host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
5724 +host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
5725 +build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
5726 +build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
5727 +build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
5728 +SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
5729 +Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
5730 +GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
5731 +EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
5732 +FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
5733 +LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
5734 +NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
5735 +LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
5736 +max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
5737 +ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
5738 +exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
5739 +lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
5740 +lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
5741 +lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
5742 +reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
5743 +reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5744 +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
5745 +deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
5746 +file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
5747 +AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
5748 +AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
5749 +STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
5750 +RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
5751 +old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5752 +old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5753 +old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5754 +CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
5755 +CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
5756 +compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
5757 +GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
5758 +lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
5759 +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
5760 +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
5761 +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
5762 +objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
5763 +SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
5764 +ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
5765 +MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
5766 +lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
5767 +lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
5768 +lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
5769 +lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
5770 +lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
5771 +need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
5772 +DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
5773 +NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
5774 +LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
5775 +OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
5776 +OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
5777 +libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
5778 +shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5779 +extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5780 +archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
5781 +enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
5782 +export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
5783 +whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
5784 +compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
5785 +old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5786 +old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5787 +archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5788 +archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5789 +module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5790 +module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5791 +with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
5792 +allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
5793 +no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
5794 +hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
5795 +hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
5796 +hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
5797 +hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
5798 +hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
5799 +hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
5800 +hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
5801 +hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
5802 +inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
5803 +link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
5804 +fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
5805 +always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
5806 +export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5807 +exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
5808 +include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
5809 +prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5810 +file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
5811 +variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
5812 +need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
5813 +need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
5814 +version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
5815 +runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
5816 +shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
5817 +shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
5818 +libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
5819 +library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
5820 +soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
5821 +postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5822 +postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5823 +finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
5824 +finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
5825 +hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
5826 +sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
5827 +sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
5828 +hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
5829 +enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
5830 +enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
5831 +enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
5832 +old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
5833 +striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
5835 LTCC='$LTCC'
5836 LTCFLAGS='$LTCFLAGS'
5837 compiler='$compiler_DEFAULT'
5839 -# A function that is used when there is no print builtin or printf.
5840 -func_fallback_echo ()
5841 -{
5842 - eval 'cat <<_LTECHO_EOF
5843 -\$1
5844 -_LTECHO_EOF'
5845 -}
5846 -
5847 # Quote evaled strings.
5848 -for var in SHELL \
5849 -ECHO \
5850 -SED \
5851 +for var in SED \
5852 GREP \
5853 EGREP \
5854 FGREP \
5855 @@ -14691,6 +14711,8 @@ lt_cv_sys_global_symbol_pipe \
5856 lt_cv_sys_global_symbol_to_cdecl \
5857 lt_cv_sys_global_symbol_to_c_name_address \
5858 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5859 +SHELL \
5860 +ECHO \
5861 lt_prog_compiler_no_builtin_flag \
5862 lt_prog_compiler_wl \
5863 lt_prog_compiler_pic \
5864 @@ -14720,13 +14742,12 @@ variables_saved_for_relink \
5865 libname_spec \
5866 library_names_spec \
5867 soname_spec \
5868 -install_override_mode \
5869 finish_eval \
5870 old_striplib \
5871 striplib; do
5872 - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
5873 + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
5874 *[\\\\\\\`\\"\\\$]*)
5875 - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
5876 + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
5877 ;;
5878 *)
5879 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
5880 @@ -14753,9 +14774,9 @@ postuninstall_cmds \
5881 finish_cmds \
5882 sys_lib_search_path_spec \
5883 sys_lib_dlsearch_path_spec; do
5884 - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
5885 + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
5886 *[\\\\\\\`\\"\\\$]*)
5887 - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
5888 + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
5889 ;;
5890 *)
5891 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
5892 @@ -14763,6 +14784,12 @@ sys_lib_dlsearch_path_spec; do
5893 esac
5894 done
5896 +# Fix-up fallback echo if it was mangled by the above quoting rules.
5897 +case \$lt_ECHO in
5898 +*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
5899 + ;;
5900 +esac
5901 +
5902 ac_aux_dir='$ac_aux_dir'
5903 xsi_shell='$xsi_shell'
5904 lt_shell_append='$lt_shell_append'
5905 @@ -14810,6 +14837,7 @@ do
5906 "src/plugins/xkb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/xkb/Makefile" ;;
5907 "src/plugins/thermal/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/thermal/Makefile" ;;
5908 "src/plugins/cpufreq/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/cpufreq/Makefile" ;;
5909 + "src/plugins/indicator/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/indicator/Makefile" ;;
5910 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
5911 "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
5912 "data/default/panels/panel") CONFIG_FILES="$CONFIG_FILES data/default/panels/panel" ;;
5913 @@ -15515,8 +15543,7 @@ $as_echo X"$file" |
5914 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5915 #
5916 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5917 -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5918 -# Inc.
5919 +# 2006, 2007, 2008 Free Software Foundation, Inc.
5920 # Written by Gordon Matzigkeit, 1996
5921 #
5922 # This file is part of GNU Libtool.
5923 @@ -15564,12 +15591,6 @@ pic_mode=$pic_mode
5924 # Whether or not to optimize for fast installation.
5925 fast_install=$enable_fast_install
5927 -# Shell to use when invoking shell scripts.
5928 -SHELL=$lt_SHELL
5929 -
5930 -# An echo program that protects backslashes.
5931 -ECHO=$lt_ECHO
5932 -
5933 # The host system.
5934 host_alias=$host_alias
5935 host=$host
5936 @@ -15619,6 +15640,10 @@ SP2NL=$lt_lt_SP2NL
5937 # turn newlines into spaces.
5938 NL2SP=$lt_lt_NL2SP
5940 +# How to create reloadable object files.
5941 +reload_flag=$lt_reload_flag
5942 +reload_cmds=$lt_reload_cmds
5943 +
5944 # An object symbol dumper.
5945 OBJDUMP=$lt_OBJDUMP
5947 @@ -15640,9 +15665,6 @@ RANLIB=$lt_RANLIB
5948 old_postinstall_cmds=$lt_old_postinstall_cmds
5949 old_postuninstall_cmds=$lt_old_postuninstall_cmds
5951 -# Whether to use a lock for old archive extraction.
5952 -lock_old_archive_extraction=$lock_old_archive_extraction
5953 -
5954 # A C compiler.
5955 LTCC=$lt_CC
5957 @@ -15664,6 +15686,12 @@ global_symbol_to_c_name_address_lib_pref
5958 # The name of the directory that contains temporary libtool files.
5959 objdir=$objdir
5961 +# Shell to use when invoking shell scripts.
5962 +SHELL=$lt_SHELL
5963 +
5964 +# An echo program that does not interpret backslashes.
5965 +ECHO=$lt_ECHO
5966 +
5967 # Used to examine libraries when file_magic_cmd begins with "file".
5968 MAGIC_CMD=$MAGIC_CMD
5970 @@ -15726,9 +15754,6 @@ library_names_spec=$lt_library_names_spe
5971 # The coded name of the library, if different from the real name.
5972 soname_spec=$lt_soname_spec
5974 -# Permission mode override for installation of shared libraries.
5975 -install_override_mode=$lt_install_override_mode
5976 -
5977 # Command to use after installation of a shared archive.
5978 postinstall_cmds=$lt_postinstall_cmds
5980 @@ -15768,10 +15793,6 @@ striplib=$lt_striplib
5981 # The linker used to build libraries.
5982 LD=$lt_LD
5984 -# How to create reloadable object files.
5985 -reload_flag=$lt_reload_flag
5986 -reload_cmds=$lt_reload_cmds
5987 -
5988 # Commands used to build an old-style archive.
5989 old_archive_cmds=$lt_old_archive_cmds
5991 @@ -16031,7 +16052,7 @@ _LT_EOF
5992 func_dirname ()
5993 {
5994 # Extract subdirectory from the argument.
5995 - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5996 + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
5997 if test "X$func_dirname_result" = "X${1}"; then
5998 func_dirname_result="${3}"
5999 else
6000 @@ -16042,7 +16063,7 @@ func_dirname ()
6001 # func_basename file
6002 func_basename ()
6003 {
6004 - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
6005 + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
6006 }
6009 @@ -16055,8 +16076,10 @@ func_basename ()
6010 func_stripname ()
6011 {
6012 case ${2} in
6013 - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
6014 - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
6015 + .*) func_stripname_result=`$ECHO "X${3}" \
6016 + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
6017 + *) func_stripname_result=`$ECHO "X${3}" \
6018 + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
6019 esac
6020 }
6022 @@ -16067,20 +16090,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
6023 # func_opt_split
6024 func_opt_split ()
6025 {
6026 - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
6027 - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
6028 + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
6029 + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
6030 }
6032 # func_lo2o object
6033 func_lo2o ()
6034 {
6035 - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
6036 + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
6037 }
6039 # func_xform libobj-or-source
6040 func_xform ()
6041 {
6042 - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
6043 + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
6044 }
6046 # func_arith arithmetic-term...
6047 @@ -16242,6 +16265,10 @@ $as_echo " thermal - Temperature moni
6048 { $as_echo "$as_me:${as_lineno-$LINENO}: result: cpufreq - CpuFreq frontend" >&5
6049 $as_echo " cpufreq - CpuFreq frontend" >&6; }
6050 fi
6051 + if test x"$plugin_indicator" != x; then
6052 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: indicator - Indicator support" >&5
6053 +$as_echo " indicator - Indicator support" >&6; }
6054 + fi
6055 else
6056 echo Dynamic loader for plugins....... : disabled.
6057 fi
6058 --- lxpanel-0.5.6.orig/ltmain.sh
6059 +++ lxpanel-0.5.6/ltmain.sh
6060 @@ -1,10 +1,9 @@
6061 # Generated from ltmain.m4sh.
6063 -# libtool (GNU libtool) 2.2.10
6064 +# ltmain.sh (GNU libtool) 2.2.6b
6065 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
6067 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
6068 -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
6069 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
6070 # This is free software; see the source for copying conditions. There is NO
6071 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
6073 @@ -33,54 +32,50 @@
6074 #
6075 # Provide generalized library-building support services.
6076 #
6077 -# --config show all configuration variables
6078 -# --debug enable verbose shell tracing
6079 -# -n, --dry-run display commands without modifying any files
6080 -# --features display basic configuration information and exit
6081 -# --mode=MODE use operation mode MODE
6082 -# --preserve-dup-deps don't remove duplicate dependency libraries
6083 -# --quiet, --silent don't print informational messages
6084 -# --no-quiet, --no-silent
6085 -# print informational messages (default)
6086 -# --tag=TAG use configuration variables from tag TAG
6087 -# -v, --verbose print more informational messages than default
6088 -# --no-verbose don't print the extra informational messages
6089 -# --version print version information
6090 -# -h, --help, --help-all print short, long, or detailed help message
6091 +# --config show all configuration variables
6092 +# --debug enable verbose shell tracing
6093 +# -n, --dry-run display commands without modifying any files
6094 +# --features display basic configuration information and exit
6095 +# --mode=MODE use operation mode MODE
6096 +# --preserve-dup-deps don't remove duplicate dependency libraries
6097 +# --quiet, --silent don't print informational messages
6098 +# --tag=TAG use configuration variables from tag TAG
6099 +# -v, --verbose print informational messages (default)
6100 +# --version print version information
6101 +# -h, --help print short or long help message
6102 #
6103 # MODE must be one of the following:
6104 #
6105 -# clean remove files from the build directory
6106 -# compile compile a source file into a libtool object
6107 -# execute automatically set library path, then run a program
6108 -# finish complete the installation of libtool libraries
6109 -# install install libraries or executables
6110 -# link create a library or an executable
6111 -# uninstall remove libraries from an installed directory
6112 +# clean remove files from the build directory
6113 +# compile compile a source file into a libtool object
6114 +# execute automatically set library path, then run a program
6115 +# finish complete the installation of libtool libraries
6116 +# install install libraries or executables
6117 +# link create a library or an executable
6118 +# uninstall remove libraries from an installed directory
6119 #
6120 -# MODE-ARGS vary depending on the MODE. When passed as first option,
6121 -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
6122 +# MODE-ARGS vary depending on the MODE.
6123 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
6124 #
6125 # When reporting a bug, please describe a test case to reproduce it and
6126 # include the following information:
6127 #
6128 -# host-triplet: $host
6129 -# shell: $SHELL
6130 -# compiler: $LTCC
6131 -# compiler flags: $LTCFLAGS
6132 -# linker: $LD (gnu? $with_gnu_ld)
6133 -# $progname: (GNU libtool) 2.2.10
6134 -# automake: $automake_version
6135 -# autoconf: $autoconf_version
6136 +# host-triplet: $host
6137 +# shell: $SHELL
6138 +# compiler: $LTCC
6139 +# compiler flags: $LTCFLAGS
6140 +# linker: $LD (gnu? $with_gnu_ld)
6141 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
6142 +# automake: $automake_version
6143 +# autoconf: $autoconf_version
6144 #
6145 # Report bugs to <bug-libtool@gnu.org>.
6147 -PROGRAM=libtool
6148 +PROGRAM=ltmain.sh
6149 PACKAGE=libtool
6150 -VERSION=2.2.10
6151 +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
6152 TIMESTAMP=""
6153 -package_revision=1.3175
6154 +package_revision=1.3017
6156 # Be Bourne compatible
6157 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
6158 @@ -96,15 +91,10 @@ fi
6159 BIN_SH=xpg4; export BIN_SH # for Tru64
6160 DUALCASE=1; export DUALCASE # for MKS sh
6162 -# A function that is used when there is no print builtin or printf.
6163 -func_fallback_echo ()
6164 -{
6165 - eval 'cat <<_LTECHO_EOF
6166 -$1
6167 -_LTECHO_EOF'
6168 -}
6169 -
6170 # NLS nuisances: We save the old values to restore during execute mode.
6171 +# Only set LANG and LC_ALL to C if already set.
6172 +# These must not be set unconditionally because not all systems understand
6173 +# e.g. LANG=C (notably SCO).
6174 lt_user_locale=
6175 lt_safe_locale=
6176 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
6177 @@ -117,33 +107,24 @@ do
6178 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
6179 fi"
6180 done
6181 -LC_ALL=C
6182 -LANGUAGE=C
6183 -export LANGUAGE LC_ALL
6185 $lt_unset CDPATH
6188 -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
6189 -# is ksh but when the shell is invoked as "sh" and the current value of
6190 -# the _XPG environment variable is not equal to 1 (one), the special
6191 -# positional parameter $0, within a function call, is the name of the
6192 -# function.
6193 -progpath="$0"
6197 : ${CP="cp -f"}
6198 -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
6199 -: ${EGREP="grep -E"}
6200 -: ${FGREP="grep -F"}
6201 -: ${GREP="grep"}
6202 +: ${ECHO="echo"}
6203 +: ${EGREP="/bin/grep -E"}
6204 +: ${FGREP="/bin/grep -F"}
6205 +: ${GREP="/bin/grep"}
6206 : ${LN_S="ln -s"}
6207 : ${MAKE="make"}
6208 : ${MKDIR="mkdir"}
6209 : ${MV="mv -f"}
6210 : ${RM="rm -f"}
6211 -: ${SED="sed"}
6212 +: ${SED="/bin/sed"}
6213 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
6214 : ${Xsed="$SED -e 1s/^X//"}
6216 @@ -178,168 +159,32 @@ basename="s,^.*/,,"
6217 func_dirname_and_basename ()
6218 {
6219 # Extract subdirectory from the argument.
6220 - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
6221 + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
6222 if test "X$func_dirname_result" = "X${1}"; then
6223 func_dirname_result="${3}"
6224 else
6225 func_dirname_result="$func_dirname_result${2}"
6226 fi
6227 - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
6228 + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
6229 }
6231 # Generated shell functions inserted here.
6233 -# These SED scripts presuppose an absolute path with a trailing slash.
6234 -pathcar='s,^/\([^/]*\).*$,\1,'
6235 -pathcdr='s,^/[^/]*,,'
6236 -removedotparts=':dotsl
6237 - s@/\./@/@g
6238 - t dotsl
6239 - s,/\.$,/,'
6240 -collapseslashes='s@/\{1,\}@/@g'
6241 -finalslash='s,/*$,/,'
6242 -
6243 -# func_normal_abspath PATH
6244 -# Remove doubled-up and trailing slashes, "." path components,
6245 -# and cancel out any ".." path components in PATH after making
6246 -# it an absolute path.
6247 -# value returned in "$func_normal_abspath_result"
6248 -func_normal_abspath ()
6249 -{
6250 - # Start from root dir and reassemble the path.
6251 - func_normal_abspath_result=
6252 - func_normal_abspath_tpath=$1
6253 - func_normal_abspath_altnamespace=
6254 - case $func_normal_abspath_tpath in
6255 - "")
6256 - # Empty path, that just means $cwd.
6257 - func_stripname '' '/' "`pwd`"
6258 - func_normal_abspath_result=$func_stripname_result
6259 - return
6260 - ;;
6261 - # The next three entries are used to spot a run of precisely
6262 - # two leading slashes without using negated character classes;
6263 - # we take advantage of case's first-match behaviour.
6264 - ///*)
6265 - # Unusual form of absolute path, do nothing.
6266 - ;;
6267 - //*)
6268 - # Not necessarily an ordinary path; POSIX reserves leading '//'
6269 - # and for example Cygwin uses it to access remote file shares
6270 - # over CIFS/SMB, so we conserve a leading double slash if found.
6271 - func_normal_abspath_altnamespace=/
6272 - ;;
6273 - /*)
6274 - # Absolute path, do nothing.
6275 - ;;
6276 - *)
6277 - # Relative path, prepend $cwd.
6278 - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
6279 - ;;
6280 - esac
6281 - # Cancel out all the simple stuff to save iterations. We also want
6282 - # the path to end with a slash for ease of parsing, so make sure
6283 - # there is one (and only one) here.
6284 - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
6285 - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
6286 - while :; do
6287 - # Processed it all yet?
6288 - if test "$func_normal_abspath_tpath" = / ; then
6289 - # If we ascended to the root using ".." the result may be empty now.
6290 - if test -z "$func_normal_abspath_result" ; then
6291 - func_normal_abspath_result=/
6292 - fi
6293 - break
6294 - fi
6295 - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
6296 - -e "$pathcar"`
6297 - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
6298 - -e "$pathcdr"`
6299 - # Figure out what to do with it
6300 - case $func_normal_abspath_tcomponent in
6301 - "")
6302 - # Trailing empty path component, ignore it.
6303 - ;;
6304 - ..)
6305 - # Parent dir; strip last assembled component from result.
6306 - func_dirname "$func_normal_abspath_result"
6307 - func_normal_abspath_result=$func_dirname_result
6308 - ;;
6309 - *)
6310 - # Actual path component, append it.
6311 - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
6312 - ;;
6313 - esac
6314 - done
6315 - # Restore leading double-slash if one was found on entry.
6316 - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
6317 -}
6318 -
6319 -# func_relative_path SRCDIR DSTDIR
6320 -# generates a relative path from SRCDIR to DSTDIR, with a trailing
6321 -# slash if non-empty, suitable for immediately appending a filename
6322 -# without needing to append a separator.
6323 -# value returned in "$func_relative_path_result"
6324 -func_relative_path ()
6325 -{
6326 - func_relative_path_result=
6327 - func_normal_abspath "$1"
6328 - func_relative_path_tlibdir=$func_normal_abspath_result
6329 - func_normal_abspath "$2"
6330 - func_relative_path_tbindir=$func_normal_abspath_result
6331 -
6332 - # Ascend the tree starting from libdir
6333 - while :; do
6334 - # check if we have found a prefix of bindir
6335 - case $func_relative_path_tbindir in
6336 - $func_relative_path_tlibdir)
6337 - # found an exact match
6338 - func_relative_path_tcancelled=
6339 - break
6340 - ;;
6341 - $func_relative_path_tlibdir*)
6342 - # found a matching prefix
6343 - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
6344 - func_relative_path_tcancelled=$func_stripname_result
6345 - if test -z "$func_relative_path_result"; then
6346 - func_relative_path_result=.
6347 - fi
6348 - break
6349 - ;;
6350 - *)
6351 - func_dirname $func_relative_path_tlibdir
6352 - func_relative_path_tlibdir=${func_dirname_result}
6353 - if test "x$func_relative_path_tlibdir" = x ; then
6354 - # Have to descend all the way to the root!
6355 - func_relative_path_result=../$func_relative_path_result
6356 - func_relative_path_tcancelled=$func_relative_path_tbindir
6357 - break
6358 - fi
6359 - func_relative_path_result=../$func_relative_path_result
6360 - ;;
6361 - esac
6362 - done
6363 -
6364 - # Now calculate path; take care to avoid doubling-up slashes.
6365 - func_stripname '' '/' "$func_relative_path_result"
6366 - func_relative_path_result=$func_stripname_result
6367 - func_stripname '/' '/' "$func_relative_path_tcancelled"
6368 - if test "x$func_stripname_result" != x ; then
6369 - func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
6370 - fi
6371 -
6372 - # Normalisation. If bindir is libdir, return empty string,
6373 - # else relative path ending with a slash; either way, target
6374 - # file name can be directly appended.
6375 - if test ! -z "$func_relative_path_result"; then
6376 - func_stripname './' '' "$func_relative_path_result/"
6377 - func_relative_path_result=$func_stripname_result
6378 - fi
6379 -}
6380 +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
6381 +# is ksh but when the shell is invoked as "sh" and the current value of
6382 +# the _XPG environment variable is not equal to 1 (one), the special
6383 +# positional parameter $0, within a function call, is the name of the
6384 +# function.
6385 +progpath="$0"
6387 # The name of this program:
6388 +# In the unlikely event $progname began with a '-', it would play havoc with
6389 +# func_echo (imagine progname=-n), so we prepend ./ in that case:
6390 func_dirname_and_basename "$progpath"
6391 progname=$func_basename_result
6392 +case $progname in
6393 + -*) progname=./$progname ;;
6394 +esac
6396 # Make sure we have an absolute path for reexecution:
6397 case $progpath in
6398 @@ -413,13 +258,6 @@ func_verbose ()
6399 :
6400 }
6402 -# func_echo_all arg...
6403 -# Invoke $ECHO with all args, space-separated.
6404 -func_echo_all ()
6405 -{
6406 - $ECHO "$*"
6407 -}
6408 -
6409 # func_error arg...
6410 # Echo program name prefixed message to standard error.
6411 func_error ()
6412 @@ -488,9 +326,9 @@ func_mkdir_p ()
6413 case $my_directory_path in */*) ;; *) break ;; esac
6415 # ...otherwise throw away the child directory and loop
6416 - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
6417 + my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
6418 done
6419 - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
6420 + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
6422 save_mkdir_p_IFS="$IFS"; IFS=':'
6423 for my_dir in $my_dir_list; do
6424 @@ -540,7 +378,7 @@ func_mktempdir ()
6425 func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
6426 fi
6428 - $ECHO "$my_tmpdir"
6429 + $ECHO "X$my_tmpdir" | $Xsed
6430 }
6433 @@ -554,7 +392,7 @@ func_quote_for_eval ()
6434 {
6435 case $1 in
6436 *[\\\`\"\$]*)
6437 - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
6438 + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
6439 *)
6440 func_quote_for_eval_unquoted_result="$1" ;;
6441 esac
6442 @@ -581,7 +419,7 @@ func_quote_for_expand ()
6443 {
6444 case $1 in
6445 *[\\\`\"]*)
6446 - my_arg=`$ECHO "$1" | $SED \
6447 + my_arg=`$ECHO "X$1" | $Xsed \
6448 -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
6449 *)
6450 my_arg="$1" ;;
6451 @@ -651,19 +489,14 @@ func_show_eval_locale ()
6452 }
6455 +
6456 +
6457 +
6458 # func_version
6459 # Echo version message to standard output and exit.
6460 func_version ()
6461 {
6462 - $SED -n '/(C)/!b go
6463 - :more
6464 - /\./!{
6465 - N
6466 - s/\n# / /
6467 - b more
6468 - }
6469 - :go
6470 - /^# '$PROGRAM' (GNU /,/# warranty; / {
6471 + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
6472 s/^# //
6473 s/^# *$//
6474 s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
6475 @@ -676,20 +509,19 @@ func_version ()
6476 # Echo short help message to standard output and exit.
6477 func_usage ()
6478 {
6479 - $SED -n '/^# Usage:/,/^# *.*--help/ {
6480 + $SED -n '/^# Usage:/,/# -h/ {
6481 s/^# //
6482 s/^# *$//
6483 s/\$progname/'$progname'/
6484 p
6485 }' < "$progpath"
6486 - echo
6487 + $ECHO
6488 $ECHO "run \`$progname --help | more' for full usage"
6489 exit $?
6490 }
6492 -# func_help [NOEXIT]
6493 -# Echo long help message to standard output and exit,
6494 -# unless 'noexit' is passed as argument.
6495 +# func_help
6496 +# Echo long help message to standard output and exit.
6497 func_help ()
6498 {
6499 $SED -n '/^# Usage:/,/# Report bugs to/ {
6500 @@ -706,10 +538,7 @@ func_help ()
6501 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
6502 p
6503 }' < "$progpath"
6504 - ret=$?
6505 - if test -z "$1"; then
6506 - exit $ret
6507 - fi
6508 + exit $?
6509 }
6511 # func_missing_arg argname
6512 @@ -717,7 +546,7 @@ func_help ()
6513 # exit_cmd.
6514 func_missing_arg ()
6515 {
6516 - func_error "missing argument for $1."
6517 + func_error "missing argument for $1"
6518 exit_cmd=exit
6519 }
6521 @@ -727,6 +556,29 @@ exit_cmd=:
6525 +# Check that we have a working $ECHO.
6526 +if test "X$1" = X--no-reexec; then
6527 + # Discard the --no-reexec flag, and continue.
6528 + shift
6529 +elif test "X$1" = X--fallback-echo; then
6530 + # Avoid inline document here, it may be left over
6531 + :
6532 +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
6533 + # Yippee, $ECHO works!
6534 + :
6535 +else
6536 + # Restart under the correct shell, and then maybe $ECHO will work.
6537 + exec $SHELL "$progpath" --no-reexec ${1+"$@"}
6538 +fi
6539 +
6540 +if test "X$1" = X--fallback-echo; then
6541 + # used as fallback echo
6542 + shift
6543 + cat <<EOF
6544 +$*
6545 +EOF
6546 + exit $EXIT_SUCCESS
6547 +fi
6549 magic="%%%MAGIC variable%%%"
6550 magic_exe="%%%MAGIC EXE variable%%%"
6551 @@ -784,16 +636,16 @@ func_config ()
6552 # Display the features supported by this script.
6553 func_features ()
6554 {
6555 - echo "host: $host"
6556 + $ECHO "host: $host"
6557 if test "$build_libtool_libs" = yes; then
6558 - echo "enable shared libraries"
6559 + $ECHO "enable shared libraries"
6560 else
6561 - echo "disable shared libraries"
6562 + $ECHO "disable shared libraries"
6563 fi
6564 if test "$build_old_libs" = yes; then
6565 - echo "enable static libraries"
6566 + $ECHO "enable static libraries"
6567 else
6568 - echo "disable static libraries"
6569 + $ECHO "disable static libraries"
6570 fi
6572 exit $?
6573 @@ -920,21 +772,10 @@ func_enable_tag ()
6575 --quiet|--silent) preserve_args="$preserve_args $opt"
6576 opt_silent=:
6577 - opt_verbose=false
6578 - ;;
6579 -
6580 - --no-quiet|--no-silent)
6581 - preserve_args="$preserve_args $opt"
6582 - opt_silent=false
6583 ;;
6585 --verbose| -v) preserve_args="$preserve_args $opt"
6586 opt_silent=false
6587 - opt_verbose=:
6588 - ;;
6589 -
6590 - --no-verbose) preserve_args="$preserve_args $opt"
6591 - opt_verbose=false
6592 ;;
6594 --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
6595 @@ -952,7 +793,6 @@ func_enable_tag ()
6597 -\?|-h) func_usage ;;
6598 --help) opt_help=: ;;
6599 - --help-all) opt_help=': help-all' ;;
6600 --version) func_version ;;
6602 -*) func_fatal_help "unrecognized option \`$opt'" ;;
6603 @@ -1176,13 +1016,10 @@ func_infer_tag ()
6604 func_quote_for_eval "$arg"
6605 CC_quoted="$CC_quoted $func_quote_for_eval_result"
6606 done
6607 - CC_expanded=`func_echo_all $CC`
6608 - CC_quoted_expanded=`func_echo_all $CC_quoted`
6609 case $@ in
6610 # Blanks in the command may have been stripped by the calling shell,
6611 # but not from the CC environment variable when configure was run.
6612 - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
6613 - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
6614 + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
6615 # Blanks at the start of $base_compile will cause this to fail
6616 # if we don't check for them as well.
6617 *)
6618 @@ -1196,11 +1033,8 @@ func_infer_tag ()
6619 func_quote_for_eval "$arg"
6620 CC_quoted="$CC_quoted $func_quote_for_eval_result"
6621 done
6622 - CC_expanded=`func_echo_all $CC`
6623 - CC_quoted_expanded=`func_echo_all $CC_quoted`
6624 case "$@ " in
6625 - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
6626 - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
6627 + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
6628 # The compiler in the base compile command matches
6629 # the one in the tagged configuration.
6630 # Assume this is the tagged configuration we want.
6631 @@ -1379,7 +1213,7 @@ func_mode_compile ()
6632 *.[cCFSifmso] | \
6633 *.ada | *.adb | *.ads | *.asm | \
6634 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
6635 - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
6636 + *.[fF][09]? | *.for | *.java | *.obj | *.sx)
6637 func_xform "$libobj"
6638 libobj=$func_xform_result
6639 ;;
6640 @@ -1454,7 +1288,7 @@ func_mode_compile ()
6641 # Calculate the filename of the output object if compiler does
6642 # not support -o with -c
6643 if test "$compiler_c_o" = no; then
6644 - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
6645 + output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
6646 lockfile="$output_obj.lock"
6647 else
6648 output_obj=
6649 @@ -1611,7 +1445,7 @@ compiler."
6650 }
6652 $opt_help || {
6653 - test "$mode" = compile && func_mode_compile ${1+"$@"}
6654 +test "$mode" = compile && func_mode_compile ${1+"$@"}
6655 }
6657 func_mode_help ()
6658 @@ -1648,11 +1482,10 @@ This mode accepts the following addition
6660 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
6661 -no-suppress do not suppress compiler output for multiple passes
6662 - -prefer-pic try to build PIC objects only
6663 - -prefer-non-pic try to build non-PIC objects only
6664 + -prefer-pic try to building PIC objects only
6665 + -prefer-non-pic try to building non-PIC objects only
6666 -shared do not build a \`.o' file suitable for static linking
6667 -static only build a \`.o' file suitable for static linking
6668 - -Wc,FLAG pass FLAG directly to the compiler
6670 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
6671 from the given SOURCEFILE.
6672 @@ -1705,7 +1538,7 @@ either the \`install' or \`cp' program.
6674 The following components of INSTALL-COMMAND are treated specially:
6676 - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
6677 + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
6679 The rest of the components are interpreted as arguments to that command (only
6680 BSD-compatible install options are recognized)."
6681 @@ -1725,8 +1558,6 @@ The following components of LINK-COMMAND
6683 -all-static do not do any dynamic linking at all
6684 -avoid-version do not add a version suffix if possible
6685 - -bindir BINDIR specify path to binaries directory (for systems where
6686 - libraries must be found in the PATH setting at runtime)
6687 -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
6688 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
6689 -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
6690 @@ -1755,11 +1586,6 @@ The following components of LINK-COMMAND
6691 -version-info CURRENT[:REVISION[:AGE]]
6692 specify library version info [each variable defaults to 0]
6693 -weak LIBNAME declare that the target provides the LIBNAME interface
6694 - -Wc,FLAG
6695 - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
6696 - -Wl,FLAG
6697 - -Xlinker FLAG pass linker-specific FLAG directly to the linker
6698 - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
6700 All other options (arguments beginning with \`-') are ignored.
6702 @@ -1797,40 +1623,14 @@ Otherwise, only FILE itself is deleted u
6703 ;;
6704 esac
6706 - echo
6707 + $ECHO
6708 $ECHO "Try \`$progname --help' for more information about other modes."
6709 +
6710 + exit $?
6711 }
6713 -# Now that we've collected a possible --mode arg, show help if necessary
6714 -if $opt_help; then
6715 - if test "$opt_help" = :; then
6716 - func_mode_help
6717 - else
6718 - {
6719 - func_help noexit
6720 - for mode in compile link execute install finish uninstall clean; do
6721 - func_mode_help
6722 - done
6723 - } | sed -n '1p; 2,$s/^Usage:/ or: /p'
6724 - {
6725 - func_help noexit
6726 - for mode in compile link execute install finish uninstall clean; do
6727 - echo
6728 - func_mode_help
6729 - done
6730 - } |
6731 - sed '1d
6732 - /^When reporting/,/^Report/{
6733 - H
6734 - d
6735 - }
6736 - $x
6737 - /information about other modes/d
6738 - /more detailed .*MODE/d
6739 - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
6740 - fi
6741 - exit $?
6742 -fi
6743 + # Now that we've collected a possible --mode arg, show help if necessary
6744 + $opt_help && func_mode_help
6747 # func_mode_execute arg...
6748 @@ -1912,7 +1712,7 @@ func_mode_execute ()
6749 for file
6750 do
6751 case $file in
6752 - -* | *.la | *.lo ) ;;
6753 + -*) ;;
6754 *)
6755 # Do a test to see if this is really a libtool program.
6756 if func_ltwrapper_script_p "$file"; then
6757 @@ -1954,7 +1754,7 @@ func_mode_execute ()
6758 # Display what would be done.
6759 if test -n "$shlibpath_var"; then
6760 eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
6761 - echo "export $shlibpath_var"
6762 + $ECHO "export $shlibpath_var"
6763 fi
6764 $ECHO "$cmd$args"
6765 exit $EXIT_SUCCESS
6766 @@ -1995,23 +1795,23 @@ func_mode_finish ()
6767 # Exit here if they wanted silent mode.
6768 $opt_silent && exit $EXIT_SUCCESS
6770 - echo "----------------------------------------------------------------------"
6771 - echo "Libraries have been installed in:"
6772 + $ECHO "X----------------------------------------------------------------------" | $Xsed
6773 + $ECHO "Libraries have been installed in:"
6774 for libdir in $libdirs; do
6775 $ECHO " $libdir"
6776 done
6777 - echo
6778 - echo "If you ever happen to want to link against installed libraries"
6779 - echo "in a given directory, LIBDIR, you must either use libtool, and"
6780 - echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
6781 - echo "flag during linking and do at least one of the following:"
6782 + $ECHO
6783 + $ECHO "If you ever happen to want to link against installed libraries"
6784 + $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
6785 + $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
6786 + $ECHO "flag during linking and do at least one of the following:"
6787 if test -n "$shlibpath_var"; then
6788 - echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
6789 - echo " during execution"
6790 + $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
6791 + $ECHO " during execution"
6792 fi
6793 if test -n "$runpath_var"; then
6794 - echo " - add LIBDIR to the \`$runpath_var' environment variable"
6795 - echo " during linking"
6796 + $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
6797 + $ECHO " during linking"
6798 fi
6799 if test -n "$hardcode_libdir_flag_spec"; then
6800 libdir=LIBDIR
6801 @@ -2023,21 +1823,21 @@ func_mode_finish ()
6802 $ECHO " - have your system administrator run these commands:$admincmds"
6803 fi
6804 if test -f /etc/ld.so.conf; then
6805 - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
6806 + $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
6807 fi
6808 - echo
6809 + $ECHO
6811 - echo "See any operating system documentation about shared libraries for"
6812 + $ECHO "See any operating system documentation about shared libraries for"
6813 case $host in
6814 solaris2.[6789]|solaris2.1[0-9])
6815 - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
6816 - echo "pages."
6817 + $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
6818 + $ECHO "pages."
6819 ;;
6820 *)
6821 - echo "more information, such as the ld(1) and ld.so(8) manual pages."
6822 + $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
6823 ;;
6824 esac
6825 - echo "----------------------------------------------------------------------"
6826 + $ECHO "X----------------------------------------------------------------------" | $Xsed
6827 exit $EXIT_SUCCESS
6828 }
6830 @@ -2052,7 +1852,7 @@ func_mode_install ()
6831 # install_prog (especially on Windows NT).
6832 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
6833 # Allow the use of GNU shtool's install command.
6834 - case $nonopt in *shtool*) :;; *) false;; esac; then
6835 + $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
6836 # Aesthetically quote it.
6837 func_quote_for_eval "$nonopt"
6838 install_prog="$func_quote_for_eval_result "
6839 @@ -2067,11 +1867,6 @@ func_mode_install ()
6840 # Aesthetically quote it.
6841 func_quote_for_eval "$arg"
6842 install_prog="$install_prog$func_quote_for_eval_result"
6843 - install_shared_prog=$install_prog
6844 - case " $install_prog " in
6845 - *[\\\ /]cp\ *) install_cp=: ;;
6846 - *) install_cp=false ;;
6847 - esac
6849 # We need to accept at least all the BSD install flags.
6850 dest=
6851 @@ -2081,10 +1876,8 @@ func_mode_install ()
6852 install_type=
6853 isdir=no
6854 stripme=
6855 - no_mode=:
6856 for arg
6857 do
6858 - arg2=
6859 if test -n "$dest"; then
6860 files="$files $dest"
6861 dest=$arg
6862 @@ -2094,9 +1887,10 @@ func_mode_install ()
6863 case $arg in
6864 -d) isdir=yes ;;
6865 -f)
6866 - if $install_cp; then :; else
6867 - prev=$arg
6868 - fi
6869 + case " $install_prog " in
6870 + *[\\\ /]cp\ *) ;;
6871 + *) prev=$arg ;;
6872 + esac
6873 ;;
6874 -g | -m | -o)
6875 prev=$arg
6876 @@ -2110,10 +1904,6 @@ func_mode_install ()
6877 *)
6878 # If the previous option needed an argument, then skip it.
6879 if test -n "$prev"; then
6880 - if test "x$prev" = x-m && test -n "$install_override_mode"; then
6881 - arg2=$install_override_mode
6882 - no_mode=false
6883 - fi
6884 prev=
6885 else
6886 dest=$arg
6887 @@ -2125,10 +1915,6 @@ func_mode_install ()
6888 # Aesthetically quote the argument.
6889 func_quote_for_eval "$arg"
6890 install_prog="$install_prog $func_quote_for_eval_result"
6891 - if test -n "$arg2"; then
6892 - func_quote_for_eval "$arg2"
6893 - fi
6894 - install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
6895 done
6897 test -z "$install_prog" && \
6898 @@ -2137,13 +1923,6 @@ func_mode_install ()
6899 test -n "$prev" && \
6900 func_fatal_help "the \`$prev' option requires an argument"
6902 - if test -n "$install_override_mode" && $no_mode; then
6903 - if $install_cp; then :; else
6904 - func_quote_for_eval "$install_override_mode"
6905 - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
6906 - fi
6907 - fi
6908 -
6909 if test -z "$files"; then
6910 if test -z "$dest"; then
6911 func_fatal_help "no file or destination specified"
6912 @@ -2231,7 +2010,7 @@ func_mode_install ()
6914 if test -n "$relink_command"; then
6915 # Determine the prefix the user has applied to our future dir.
6916 - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
6917 + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
6919 # Don't allow the user to place us outside of our expected
6920 # location b/c this prevents finding dependent libraries that
6921 @@ -2244,9 +2023,9 @@ func_mode_install ()
6923 if test -n "$inst_prefix_dir"; then
6924 # Stick the inst_prefix_dir data into the link command.
6925 - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
6926 + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
6927 else
6928 - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
6929 + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
6930 fi
6932 func_warning "relinking \`$file'"
6933 @@ -2264,7 +2043,7 @@ func_mode_install ()
6934 test -n "$relink_command" && srcname="$realname"T
6936 # Install the shared library and build the symlinks.
6937 - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
6938 + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
6939 'exit $?'
6940 tstripme="$stripme"
6941 case $host_os in
6942 @@ -2404,7 +2183,7 @@ func_mode_install ()
6943 if test -f "$lib"; then
6944 func_source "$lib"
6945 fi
6946 - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
6947 + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
6948 if test -n "$libdir" && test ! -f "$libfile"; then
6949 func_warning "\`$lib' has not been installed in \`$libdir'"
6950 finalize=no
6951 @@ -2423,7 +2202,7 @@ func_mode_install ()
6952 file="$func_basename_result"
6953 outputname="$tmpdir/$file"
6954 # Replace the output file specification.
6955 - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
6956 + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
6958 $opt_silent || {
6959 func_quote_for_expand "$relink_command"
6960 @@ -2442,7 +2221,7 @@ func_mode_install ()
6961 }
6962 else
6963 # Install the binary that we compiled earlier.
6964 - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
6965 + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
6966 fi
6967 fi
6969 @@ -2544,10 +2323,6 @@ func_generate_dlsyms ()
6970 extern \"C\" {
6971 #endif
6973 -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
6974 -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
6975 -#endif
6976 -
6977 /* External symbol declarations for the compiler. */\
6978 "
6980 @@ -2557,7 +2332,7 @@ extern \"C\" {
6981 $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
6983 # Add our own program objects to the symbol list.
6984 - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
6985 + progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
6986 for progfile in $progfiles; do
6987 func_verbose "extracting global C symbols from \`$progfile'"
6988 $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
6989 @@ -2596,7 +2371,7 @@ extern \"C\" {
6990 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
6991 eval '$MV "$nlist"T "$nlist"'
6992 case $host in
6993 - *cygwin* | *mingw* | *cegcc* )
6994 + *cygwin | *mingw* | *cegcc* )
6995 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
6996 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
6997 ;;
6998 @@ -2640,10 +2415,10 @@ extern \"C\" {
6999 if test -f "$nlist"S; then
7000 eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
7001 else
7002 - echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
7003 + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
7004 fi
7006 - echo >> "$output_objdir/$my_dlsyms" "\
7007 + $ECHO >> "$output_objdir/$my_dlsyms" "\
7009 /* The mapping between symbol names and symbols. */
7010 typedef struct {
7011 @@ -2653,7 +2428,7 @@ typedef struct {
7012 "
7013 case $host in
7014 *cygwin* | *mingw* | *cegcc* )
7015 - echo >> "$output_objdir/$my_dlsyms" "\
7016 + $ECHO >> "$output_objdir/$my_dlsyms" "\
7017 /* DATA imports from DLLs on WIN32 con't be const, because
7018 runtime relocations are performed -- see ld's documentation
7019 on pseudo-relocs. */"
7020 @@ -2666,7 +2441,7 @@ typedef struct {
7021 lt_dlsym_const=const ;;
7022 esac
7024 - echo >> "$output_objdir/$my_dlsyms" "\
7025 + $ECHO >> "$output_objdir/$my_dlsyms" "\
7026 extern $lt_dlsym_const lt_dlsymlist
7027 lt_${my_prefix}_LTX_preloaded_symbols[];
7028 $lt_dlsym_const lt_dlsymlist
7029 @@ -2682,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[]
7030 eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
7031 ;;
7032 esac
7033 - echo >> "$output_objdir/$my_dlsyms" "\
7034 + $ECHO >> "$output_objdir/$my_dlsyms" "\
7035 {0, (void *) 0}
7036 };
7038 @@ -2740,16 +2515,16 @@ static const void *lt_preloaded_setup()
7039 case $host in
7040 *cygwin* | *mingw* | *cegcc* )
7041 if test -f "$output_objdir/$my_outputname.def"; then
7042 - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
7043 - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
7044 + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
7045 + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
7046 else
7047 - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
7048 - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
7049 + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
7050 + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
7051 fi
7052 ;;
7053 *)
7054 - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
7055 - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
7056 + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
7057 + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
7058 ;;
7059 esac
7060 ;;
7061 @@ -2763,8 +2538,8 @@ static const void *lt_preloaded_setup()
7062 # really was required.
7064 # Nullify the symbol file.
7065 - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
7066 - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
7067 + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
7068 + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
7069 fi
7070 }
7072 @@ -2774,7 +2549,6 @@ static const void *lt_preloaded_setup()
7073 # Need a lot of goo to handle *both* DLLs and import libs
7074 # Has to be a shell function in order to 'eat' the argument
7075 # that is supplied when $file_magic_command is called.
7076 -# Despite the name, also deal with 64 bit binaries.
7077 func_win32_libid ()
7078 {
7079 $opt_debug
7080 @@ -2785,9 +2559,8 @@ func_win32_libid ()
7081 win32_libid_type="x86 archive import"
7082 ;;
7083 *ar\ archive*) # could be an import, or static
7084 - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
7085 if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
7086 - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
7087 + $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
7088 win32_nmres=`eval $NM -f posix -A $1 |
7089 $SED -n -e '
7090 1,100{
7091 @@ -2825,18 +2598,7 @@ func_extract_an_archive ()
7092 $opt_debug
7093 f_ex_an_ar_dir="$1"; shift
7094 f_ex_an_ar_oldlib="$1"
7095 - if test "$lock_old_archive_extraction" = yes; then
7096 - lockfile=$f_ex_an_ar_oldlib.lock
7097 - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
7098 - func_echo "Waiting for $lockfile to be removed"
7099 - sleep 2
7100 - done
7101 - fi
7102 - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
7103 - 'stat=$?; rm -f "$lockfile"; exit $stat'
7104 - if test "$lock_old_archive_extraction" = yes; then
7105 - $opt_dry_run || rm -f "$lockfile"
7106 - fi
7107 + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
7108 if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
7109 :
7110 else
7111 @@ -2907,7 +2669,7 @@ func_extract_archives ()
7112 darwin_file=
7113 darwin_files=
7114 for darwin_file in $darwin_filelist; do
7115 - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
7116 + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
7117 $LIPO -create -output "$darwin_file" $darwin_files
7118 done # $darwin_filelist
7119 $RM -rf unfat-$$
7120 @@ -2922,30 +2684,25 @@ func_extract_archives ()
7121 func_extract_an_archive "$my_xdir" "$my_xabs"
7122 ;;
7123 esac
7124 - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
7125 + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
7126 done
7128 func_extract_archives_result="$my_oldobjs"
7129 }
7132 -# func_emit_wrapper [arg=no]
7133 -#
7134 -# Emit a libtool wrapper script on stdout.
7135 -# Don't directly open a file because we may want to
7136 -# incorporate the script contents within a cygwin/mingw
7137 -# wrapper executable. Must ONLY be called from within
7138 -# func_mode_link because it depends on a number of variables
7139 -# set therein.
7140 +
7141 +# func_emit_wrapper_part1 [arg=no]
7142 #
7143 -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
7144 -# variable will take. If 'yes', then the emitted script
7145 -# will assume that the directory in which it is stored is
7146 -# the $objdir directory. This is a cygwin/mingw-specific
7147 -# behavior.
7148 -func_emit_wrapper ()
7149 -{
7150 - func_emit_wrapper_arg1=${1-no}
7151 +# Emit the first part of a libtool wrapper script on stdout.
7152 +# For more information, see the description associated with
7153 +# func_emit_wrapper(), below.
7154 +func_emit_wrapper_part1 ()
7155 +{
7156 + func_emit_wrapper_part1_arg1=no
7157 + if test -n "$1" ; then
7158 + func_emit_wrapper_part1_arg1=$1
7159 + fi
7161 $ECHO "\
7162 #! $SHELL
7163 @@ -2961,6 +2718,7 @@ func_emit_wrapper ()
7165 # Sed substitution that helps us do robust quoting. It backslashifies
7166 # metacharacters that are still active within double-quoted strings.
7167 +Xsed='${SED} -e 1s/^X//'
7168 sed_quote_subst='$sed_quote_subst'
7170 # Be Bourne compatible
7171 @@ -2991,132 +2749,31 @@ if test \"\$libtool_install_magic\" = \"
7172 else
7173 # When we are sourced in execute mode, \$file and \$ECHO are already set.
7174 if test \"\$libtool_execute_magic\" != \"$magic\"; then
7175 - file=\"\$0\""
7176 -
7177 - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
7178 - $ECHO "\
7179 -
7180 -# A function that is used when there is no print builtin or printf.
7181 -func_fallback_echo ()
7182 -{
7183 - eval 'cat <<_LTECHO_EOF
7184 -\$1
7185 -_LTECHO_EOF'
7186 -}
7187 - ECHO=\"$qECHO\"
7188 - fi
7189 -
7190 -# Very basic option parsing. These options are (a) specific to
7191 -# the libtool wrapper, (b) are identical between the wrapper
7192 -# /script/ and the wrapper /executable/ which is used only on
7193 -# windows platforms, and (c) all begin with the string "--lt-"
7194 -# (application programs are unlikely to have options which match
7195 -# this pattern).
7196 -#
7197 -# There are only two supported options: --lt-debug and
7198 -# --lt-dump-script. There is, deliberately, no --lt-help.
7199 -#
7200 -# The first argument to this parsing function should be the
7201 -# script's $0 value, followed by "$@".
7202 -lt_option_debug=
7203 -func_parse_lt_options ()
7204 -{
7205 - lt_script_arg0=\$0
7206 - shift
7207 - for lt_opt
7208 - do
7209 - case \"\$lt_opt\" in
7210 - --lt-debug) lt_option_debug=1 ;;
7211 - --lt-dump-script)
7212 - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
7213 - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
7214 - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
7215 - cat \"\$lt_dump_D/\$lt_dump_F\"
7216 - exit 0
7217 - ;;
7218 - --lt-*)
7219 - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
7220 - exit 1
7221 - ;;
7222 - esac
7223 - done
7224 -
7225 - # Print the debug banner immediately:
7226 - if test -n \"\$lt_option_debug\"; then
7227 - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
7228 - fi
7229 -}
7230 -
7231 -# Used when --lt-debug. Prints its arguments to stdout
7232 -# (redirection is the responsibility of the caller)
7233 -func_lt_dump_args ()
7234 -{
7235 - lt_dump_args_N=1;
7236 - for lt_arg
7237 - do
7238 - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
7239 - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
7240 - done
7241 -}
7242 -
7243 -# Core function for launching the target application
7244 -func_exec_program_core ()
7245 -{
7246 -"
7247 - case $host in
7248 - # Backslashes separate directories on plain windows
7249 - *-*-mingw | *-*-os2* | *-cegcc*)
7250 - $ECHO "\
7251 - if test -n \"\$lt_option_debug\"; then
7252 - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
7253 - func_lt_dump_args \${1+\"\$@\"} 1>&2
7254 - fi
7255 - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
7256 -"
7257 - ;;
7258 -
7259 - *)
7260 - $ECHO "\
7261 - if test -n \"\$lt_option_debug\"; then
7262 - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
7263 - func_lt_dump_args \${1+\"\$@\"} 1>&2
7264 - fi
7265 - exec \"\$progdir/\$program\" \${1+\"\$@\"}
7266 + ECHO=\"$qecho\"
7267 + file=\"\$0\"
7268 + # Make sure echo works.
7269 + if test \"X\$1\" = X--no-reexec; then
7270 + # Discard the --no-reexec flag, and continue.
7271 + shift
7272 + elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
7273 + # Yippee, \$ECHO works!
7274 + :
7275 + else
7276 + # Restart under the correct shell, and then maybe \$ECHO will work.
7277 + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
7278 + fi
7279 + fi\
7280 "
7281 - ;;
7282 - esac
7283 - $ECHO "\
7284 - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
7285 - exit 1
7286 -}
7287 -
7288 -# A function to encapsulate launching the target application
7289 -# Strips options in the --lt-* namespace from \$@ and
7290 -# launches target application with the remaining arguments.
7291 -func_exec_program ()
7292 -{
7293 - for lt_wr_arg
7294 - do
7295 - case \$lt_wr_arg in
7296 - --lt-*) ;;
7297 - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
7298 - esac
7299 - shift
7300 - done
7301 - func_exec_program_core \${1+\"\$@\"}
7302 -}
7303 -
7304 - # Parse options
7305 - func_parse_lt_options \"\$0\" \${1+\"\$@\"}
7306 + $ECHO "\
7308 # Find the directory that this script lives in.
7309 - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
7310 + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
7311 test \"x\$thisdir\" = \"x\$file\" && thisdir=.
7313 # Follow symbolic links until we get to the real thisdir.
7314 - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
7315 + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
7316 while test -n \"\$file\"; do
7317 - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
7318 + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
7320 # If there was a directory component, then change thisdir.
7321 if test \"x\$destdir\" != \"x\$file\"; then
7322 @@ -3126,13 +2783,30 @@ func_exec_program ()
7323 esac
7324 fi
7326 - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
7327 - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
7328 + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
7329 + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
7330 done
7331 +"
7332 +}
7333 +# end: func_emit_wrapper_part1
7334 +
7335 +# func_emit_wrapper_part2 [arg=no]
7336 +#
7337 +# Emit the second part of a libtool wrapper script on stdout.
7338 +# For more information, see the description associated with
7339 +# func_emit_wrapper(), below.
7340 +func_emit_wrapper_part2 ()
7341 +{
7342 + func_emit_wrapper_part2_arg1=no
7343 + if test -n "$1" ; then
7344 + func_emit_wrapper_part2_arg1=$1
7345 + fi
7346 +
7347 + $ECHO "\
7349 # Usually 'no', except on cygwin/mingw when embedded into
7350 # the cwrapper.
7351 - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
7352 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
7353 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
7354 # special case for '.'
7355 if test \"\$thisdir\" = \".\"; then
7356 @@ -3140,7 +2814,7 @@ func_exec_program ()
7357 fi
7358 # remove .libs from thisdir
7359 case \"\$thisdir\" in
7360 - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
7361 + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
7362 $objdir ) thisdir=. ;;
7363 esac
7364 fi
7365 @@ -3203,7 +2877,7 @@ func_exec_program ()
7367 # Some systems cannot cope with colon-terminated $shlibpath_var
7368 # The second colon is a workaround for a bug in BeOS R4 sed
7369 - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
7370 + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
7372 export $shlibpath_var
7373 "
7374 @@ -3220,18 +2894,64 @@ func_exec_program ()
7375 $ECHO "\
7376 if test \"\$libtool_execute_magic\" != \"$magic\"; then
7377 # Run the actual program with our arguments.
7378 - func_exec_program \${1+\"\$@\"}
7379 +"
7380 + case $host in
7381 + # Backslashes separate directories on plain windows
7382 + *-*-mingw | *-*-os2* | *-cegcc*)
7383 + $ECHO "\
7384 + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
7385 +"
7386 + ;;
7387 +
7388 + *)
7389 + $ECHO "\
7390 + exec \"\$progdir/\$program\" \${1+\"\$@\"}
7391 +"
7392 + ;;
7393 + esac
7394 + $ECHO "\
7395 + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
7396 + exit 1
7397 fi
7398 else
7399 # The program doesn't exist.
7400 \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
7401 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
7402 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
7403 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
7404 exit 1
7405 fi
7406 fi\
7407 "
7408 }
7409 +# end: func_emit_wrapper_part2
7410 +
7411 +
7412 +# func_emit_wrapper [arg=no]
7413 +#
7414 +# Emit a libtool wrapper script on stdout.
7415 +# Don't directly open a file because we may want to
7416 +# incorporate the script contents within a cygwin/mingw
7417 +# wrapper executable. Must ONLY be called from within
7418 +# func_mode_link because it depends on a number of variables
7419 +# set therein.
7420 +#
7421 +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
7422 +# variable will take. If 'yes', then the emitted script
7423 +# will assume that the directory in which it is stored is
7424 +# the $objdir directory. This is a cygwin/mingw-specific
7425 +# behavior.
7426 +func_emit_wrapper ()
7427 +{
7428 + func_emit_wrapper_arg1=no
7429 + if test -n "$1" ; then
7430 + func_emit_wrapper_arg1=$1
7431 + fi
7432 +
7433 + # split this up so that func_emit_cwrapperexe_src
7434 + # can call each part independently.
7435 + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
7436 + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
7437 +}
7440 # func_to_host_path arg
7441 @@ -3258,19 +2978,23 @@ fi\
7442 func_to_host_path ()
7443 {
7444 func_to_host_path_result="$1"
7445 - if test -n "$1"; then
7446 + if test -n "$1" ; then
7447 case $host in
7448 *mingw* )
7449 lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
7450 case $build in
7451 *mingw* ) # actually, msys
7452 # awkward: cmd appends spaces to result
7453 - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
7454 - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
7455 + lt_sed_strip_trailing_spaces="s/[ ]*\$//"
7456 + func_to_host_path_tmp1=`( cmd //c echo "$1" |\
7457 + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
7458 + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
7459 + $SED -e "$lt_sed_naive_backslashify"`
7460 ;;
7461 *cygwin* )
7462 - func_to_host_path_result=`cygpath -w "$1" |
7463 - $SED -e "$lt_sed_naive_backslashify"`
7464 + func_to_host_path_tmp1=`cygpath -w "$1"`
7465 + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
7466 + $SED -e "$lt_sed_naive_backslashify"`
7467 ;;
7468 * )
7469 # Unfortunately, winepath does not exit with a non-zero
7470 @@ -3282,17 +3006,17 @@ func_to_host_path ()
7471 # the odd construction:
7472 func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
7473 if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
7474 - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
7475 + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
7476 $SED -e "$lt_sed_naive_backslashify"`
7477 else
7478 # Allow warning below.
7479 - func_to_host_path_result=
7480 + func_to_host_path_result=""
7481 fi
7482 ;;
7483 esac
7484 if test -z "$func_to_host_path_result" ; then
7485 func_error "Could not determine host path corresponding to"
7486 - func_error " \`$1'"
7487 + func_error " '$1'"
7488 func_error "Continuing, but uninstalled executables may not work."
7489 # Fallback:
7490 func_to_host_path_result="$1"
7491 @@ -3325,24 +3049,30 @@ func_to_host_path ()
7492 func_to_host_pathlist ()
7493 {
7494 func_to_host_pathlist_result="$1"
7495 - if test -n "$1"; then
7496 + if test -n "$1" ; then
7497 case $host in
7498 *mingw* )
7499 lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
7500 # Remove leading and trailing path separator characters from
7501 # ARG. msys behavior is inconsistent here, cygpath turns them
7502 # into '.;' and ';.', and winepath ignores them completely.
7503 - func_stripname : : "$1"
7504 - func_to_host_pathlist_tmp1=$func_stripname_result
7505 + func_to_host_pathlist_tmp2="$1"
7506 + # Once set for this call, this variable should not be
7507 + # reassigned. It is used in tha fallback case.
7508 + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
7509 + $SED -e 's|^:*||' -e 's|:*$||'`
7510 case $build in
7511 *mingw* ) # Actually, msys.
7512 # Awkward: cmd appends spaces to result.
7513 - func_to_host_pathlist_result=`
7514 - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
7515 - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
7516 + lt_sed_strip_trailing_spaces="s/[ ]*\$//"
7517 + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
7518 + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
7519 + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
7520 + $SED -e "$lt_sed_naive_backslashify"`
7521 ;;
7522 *cygwin* )
7523 - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
7524 + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
7525 + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
7526 $SED -e "$lt_sed_naive_backslashify"`
7527 ;;
7528 * )
7529 @@ -3358,17 +3088,18 @@ func_to_host_pathlist ()
7530 if test -z "$func_to_host_pathlist_result" ; then
7531 func_to_host_pathlist_result="$func_to_host_path_result"
7532 else
7533 - func_append func_to_host_pathlist_result ";$func_to_host_path_result"
7534 + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
7535 fi
7536 fi
7537 fi
7538 + IFS=:
7539 done
7540 IFS=$func_to_host_pathlist_oldIFS
7541 ;;
7542 esac
7543 - if test -z "$func_to_host_pathlist_result"; then
7544 + if test -z "$func_to_host_pathlist_result" ; then
7545 func_error "Could not determine the host path(s) corresponding to"
7546 - func_error " \`$1'"
7547 + func_error " '$1'"
7548 func_error "Continuing, but uninstalled executables may not work."
7549 # Fallback. This may break if $1 contains DOS-style drive
7550 # specifications. The fix is not to complicate the expression
7551 @@ -3385,7 +3116,7 @@ func_to_host_pathlist ()
7552 ;;
7553 esac
7554 case "$1" in
7555 - *: ) func_append func_to_host_pathlist_result ";"
7556 + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
7557 ;;
7558 esac
7559 ;;
7560 @@ -3410,23 +3141,31 @@ func_emit_cwrapperexe_src ()
7562 This wrapper executable should never be moved out of the build directory.
7563 If it is, it will not operate correctly.
7564 +
7565 + Currently, it simply execs the wrapper *script* "$SHELL $output",
7566 + but could eventually absorb all of the scripts functionality and
7567 + exec $objdir/$outputname directly.
7568 */
7569 EOF
7570 cat <<"EOF"
7571 -#ifdef _MSC_VER
7572 -# define _CRT_SECURE_NO_DEPRECATE 1
7573 -#endif
7574 #include <stdio.h>
7575 #include <stdlib.h>
7576 #ifdef _MSC_VER
7577 # include <direct.h>
7578 # include <process.h>
7579 # include <io.h>
7580 +# define setmode _setmode
7581 #else
7582 # include <unistd.h>
7583 # include <stdint.h>
7584 # ifdef __CYGWIN__
7585 # include <io.h>
7586 +# define HAVE_SETENV
7587 +# ifdef __STRICT_ANSI__
7588 +char *realpath (const char *, char *);
7589 +int putenv (char *);
7590 +int setenv (const char *, const char *, int);
7591 +# endif
7592 # endif
7593 #endif
7594 #include <malloc.h>
7595 @@ -3438,44 +3177,6 @@ EOF
7596 #include <fcntl.h>
7597 #include <sys/stat.h>
7599 -/* declarations of non-ANSI functions */
7600 -#if defined(__MINGW32__)
7601 -# ifdef __STRICT_ANSI__
7602 -int _putenv (const char *);
7603 -# endif
7604 -#elif defined(__CYGWIN__)
7605 -# ifdef __STRICT_ANSI__
7606 -char *realpath (const char *, char *);
7607 -int putenv (char *);
7608 -int setenv (const char *, const char *, int);
7609 -# endif
7610 -/* #elif defined (other platforms) ... */
7611 -#endif
7612 -
7613 -/* portability defines, excluding path handling macros */
7614 -#if defined(_MSC_VER)
7615 -# define setmode _setmode
7616 -# define stat _stat
7617 -# define chmod _chmod
7618 -# define getcwd _getcwd
7619 -# define putenv _putenv
7620 -# define S_IXUSR _S_IEXEC
7621 -# ifndef _INTPTR_T_DEFINED
7622 -# define _INTPTR_T_DEFINED
7623 -# define intptr_t int
7624 -# endif
7625 -#elif defined(__MINGW32__)
7626 -# define setmode _setmode
7627 -# define stat _stat
7628 -# define chmod _chmod
7629 -# define getcwd _getcwd
7630 -# define putenv _putenv
7631 -#elif defined(__CYGWIN__)
7632 -# define HAVE_SETENV
7633 -# define FOPEN_WB "wb"
7634 -/* #elif defined (other platforms) ... */
7635 -#endif
7636 -
7637 #if defined(PATH_MAX)
7638 # define LT_PATHMAX PATH_MAX
7639 #elif defined(MAXPATHLEN)
7640 @@ -3491,7 +3192,14 @@ int setenv (const char *, const char *,
7641 # define S_IXGRP 0
7642 #endif
7644 -/* path handling portability macros */
7645 +#ifdef _MSC_VER
7646 +# define S_IXUSR _S_IEXEC
7647 +# define stat _stat
7648 +# ifndef _INTPTR_T_DEFINED
7649 +# define intptr_t int
7650 +# endif
7651 +#endif
7652 +
7653 #ifndef DIR_SEPARATOR
7654 # define DIR_SEPARATOR '/'
7655 # define PATH_SEPARATOR ':'
7656 @@ -3522,6 +3230,10 @@ int setenv (const char *, const char *,
7657 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
7658 #endif /* PATH_SEPARATOR_2 */
7660 +#ifdef __CYGWIN__
7661 +# define FOPEN_WB "wb"
7662 +#endif
7663 +
7664 #ifndef FOPEN_WB
7665 # define FOPEN_WB "w"
7666 #endif
7667 @@ -3534,13 +3246,22 @@ int setenv (const char *, const char *,
7668 if (stale) { free ((void *) stale); stale = 0; } \
7669 } while (0)
7671 -#if defined(LT_DEBUGWRAPPER)
7672 -static int lt_debug = 1;
7673 +#undef LTWRAPPER_DEBUGPRINTF
7674 +#if defined DEBUGWRAPPER
7675 +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
7676 +static void
7677 +ltwrapper_debugprintf (const char *fmt, ...)
7678 +{
7679 + va_list args;
7680 + va_start (args, fmt);
7681 + (void) vfprintf (stderr, fmt, args);
7682 + va_end (args);
7683 +}
7684 #else
7685 -static int lt_debug = 0;
7686 +# define LTWRAPPER_DEBUGPRINTF(args)
7687 #endif
7689 -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
7690 +const char *program_name = NULL;
7692 void *xmalloc (size_t num);
7693 char *xstrdup (const char *string);
7694 @@ -3550,17 +3271,31 @@ char *chase_symlinks (const char *pathsp
7695 int make_executable (const char *path);
7696 int check_executable (const char *path);
7697 char *strendzap (char *str, const char *pat);
7698 -void lt_debugprintf (const char *file, int line, const char *fmt, ...);
7699 -void lt_fatal (const char *file, int line, const char *message, ...);
7700 -static const char *nonnull (const char *s);
7701 -static const char *nonempty (const char *s);
7702 +void lt_fatal (const char *message, ...);
7703 void lt_setenv (const char *name, const char *value);
7704 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
7705 +void lt_opt_process_env_set (const char *arg);
7706 +void lt_opt_process_env_prepend (const char *arg);
7707 +void lt_opt_process_env_append (const char *arg);
7708 +int lt_split_name_value (const char *arg, char** name, char** value);
7709 void lt_update_exe_path (const char *name, const char *value);
7710 void lt_update_lib_path (const char *name, const char *value);
7711 -char **prepare_spawn (char **argv);
7712 -void lt_dump_script (FILE *f);
7713 +
7714 +static const char *script_text_part1 =
7715 +EOF
7716 +
7717 + func_emit_wrapper_part1 yes |
7718 + $SED -e 's/\([\\"]\)/\\\1/g' \
7719 + -e 's/^/ "/' -e 's/$/\\n"/'
7720 + echo ";"
7721 + cat <<EOF
7722 +
7723 +static const char *script_text_part2 =
7724 EOF
7725 + func_emit_wrapper_part2 yes |
7726 + $SED -e 's/\([\\"]\)/\\\1/g' \
7727 + -e 's/^/ "/' -e 's/$/\\n"/'
7728 + echo ";"
7730 cat <<EOF
7731 const char * MAGIC_EXE = "$magic_exe";
7732 @@ -3605,10 +3340,24 @@ EOF
7733 cat <<"EOF"
7735 #define LTWRAPPER_OPTION_PREFIX "--lt-"
7736 +#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
7738 +static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
7739 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
7740 +
7741 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
7742 -static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
7743 +
7744 +static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
7745 +static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
7746 + /* argument is putenv-style "foo=bar", value of foo is set to bar */
7747 +
7748 +static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
7749 +static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
7750 + /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
7751 +
7752 +static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
7753 +static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
7754 + /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
7756 int
7757 main (int argc, char *argv[])
7758 @@ -3625,13 +3374,10 @@ main (int argc, char *argv[])
7759 int i;
7761 program_name = (char *) xstrdup (base_name (argv[0]));
7762 - newargz = XMALLOC (char *, argc + 1);
7763 + LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
7764 + LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
7766 - /* very simple arg parsing; don't want to rely on getopt
7767 - * also, copy all non cwrapper options to newargz, except
7768 - * argz[0], which is handled differently
7769 - */
7770 - newargc=0;
7771 + /* very simple arg parsing; don't want to rely on getopt */
7772 for (i = 1; i < argc; i++)
7773 {
7774 if (strcmp (argv[i], dumpscript_opt) == 0)
7775 @@ -3645,57 +3391,25 @@ EOF
7776 esac
7778 cat <<"EOF"
7779 - lt_dump_script (stdout);
7780 + printf ("%s", script_text_part1);
7781 + printf ("%s", script_text_part2);
7782 return 0;
7783 }
7784 - if (strcmp (argv[i], debug_opt) == 0)
7785 - {
7786 - lt_debug = 1;
7787 - continue;
7788 - }
7789 - if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
7790 - {
7791 - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
7792 - namespace, but it is not one of the ones we know about and
7793 - have already dealt with, above (inluding dump-script), then
7794 - report an error. Otherwise, targets might begin to believe
7795 - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
7796 - namespace. The first time any user complains about this, we'll
7797 - need to make LTWRAPPER_OPTION_PREFIX a configure-time option
7798 - or a configure.ac-settable value.
7799 - */
7800 - lt_fatal (__FILE__, __LINE__,
7801 - "unrecognized %s option: '%s'",
7802 - ltwrapper_option_prefix, argv[i]);
7803 - }
7804 - /* otherwise ... */
7805 - newargz[++newargc] = xstrdup (argv[i]);
7806 }
7807 - newargz[++newargc] = NULL;
7808 -
7809 -EOF
7810 - cat <<EOF
7811 - /* The GNU banner must be the first non-error debug message */
7812 - lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
7813 -EOF
7814 - cat <<"EOF"
7815 - lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
7816 - lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
7818 + newargz = XMALLOC (char *, argc + 1);
7819 tmp_pathspec = find_executable (argv[0]);
7820 if (tmp_pathspec == NULL)
7821 - lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
7822 - lt_debugprintf (__FILE__, __LINE__,
7823 - "(main) found exe (before symlink chase) at: %s\n",
7824 - tmp_pathspec);
7825 + lt_fatal ("Couldn't find %s", argv[0]);
7826 + LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
7827 + tmp_pathspec));
7829 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
7830 - lt_debugprintf (__FILE__, __LINE__,
7831 - "(main) found exe (after symlink chase) at: %s\n",
7832 - actual_cwrapper_path);
7833 + LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
7834 + actual_cwrapper_path));
7835 XFREE (tmp_pathspec);
7837 - actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
7838 + actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
7839 strendzap (actual_cwrapper_path, actual_cwrapper_name);
7841 /* wrapper name transforms */
7842 @@ -3713,9 +3427,8 @@ EOF
7843 target_name = tmp_pathspec;
7844 tmp_pathspec = 0;
7846 - lt_debugprintf (__FILE__, __LINE__,
7847 - "(main) libtool target name: %s\n",
7848 - target_name);
7849 + LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
7850 + target_name));
7851 EOF
7853 cat <<EOF
7854 @@ -3768,12 +3481,77 @@ EOF
7855 lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
7856 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
7858 - lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
7859 - nonnull (lt_argv_zero));
7860 + newargc=0;
7861 + for (i = 1; i < argc; i++)
7862 + {
7863 + if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
7864 + {
7865 + if (argv[i][env_set_opt_len] == '=')
7866 + {
7867 + const char *p = argv[i] + env_set_opt_len + 1;
7868 + lt_opt_process_env_set (p);
7869 + }
7870 + else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
7871 + {
7872 + lt_opt_process_env_set (argv[++i]); /* don't copy */
7873 + }
7874 + else
7875 + lt_fatal ("%s missing required argument", env_set_opt);
7876 + continue;
7877 + }
7878 + if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
7879 + {
7880 + if (argv[i][env_prepend_opt_len] == '=')
7881 + {
7882 + const char *p = argv[i] + env_prepend_opt_len + 1;
7883 + lt_opt_process_env_prepend (p);
7884 + }
7885 + else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
7886 + {
7887 + lt_opt_process_env_prepend (argv[++i]); /* don't copy */
7888 + }
7889 + else
7890 + lt_fatal ("%s missing required argument", env_prepend_opt);
7891 + continue;
7892 + }
7893 + if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
7894 + {
7895 + if (argv[i][env_append_opt_len] == '=')
7896 + {
7897 + const char *p = argv[i] + env_append_opt_len + 1;
7898 + lt_opt_process_env_append (p);
7899 + }
7900 + else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
7901 + {
7902 + lt_opt_process_env_append (argv[++i]); /* don't copy */
7903 + }
7904 + else
7905 + lt_fatal ("%s missing required argument", env_append_opt);
7906 + continue;
7907 + }
7908 + if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
7909 + {
7910 + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
7911 + namespace, but it is not one of the ones we know about and
7912 + have already dealt with, above (inluding dump-script), then
7913 + report an error. Otherwise, targets might begin to believe
7914 + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
7915 + namespace. The first time any user complains about this, we'll
7916 + need to make LTWRAPPER_OPTION_PREFIX a configure-time option
7917 + or a configure.ac-settable value.
7918 + */
7919 + lt_fatal ("Unrecognized option in %s namespace: '%s'",
7920 + ltwrapper_option_prefix, argv[i]);
7921 + }
7922 + /* otherwise ... */
7923 + newargz[++newargc] = xstrdup (argv[i]);
7924 + }
7925 + newargz[++newargc] = NULL;
7926 +
7927 + LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
7928 for (i = 0; i < newargc; i++)
7929 {
7930 - lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
7931 - i, nonnull (newargz[i]));
7932 + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
7933 }
7935 EOF
7936 @@ -3782,14 +3560,11 @@ EOF
7937 mingw*)
7938 cat <<"EOF"
7939 /* execv doesn't actually work on mingw as expected on unix */
7940 - newargz = prepare_spawn (newargz);
7941 rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
7942 if (rval == -1)
7943 {
7944 /* failed to start process */
7945 - lt_debugprintf (__FILE__, __LINE__,
7946 - "(main) failed to launch target \"%s\": %s\n",
7947 - lt_argv_zero, nonnull (strerror (errno)));
7948 + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
7949 return 127;
7950 }
7951 return rval;
7952 @@ -3811,7 +3586,7 @@ xmalloc (size_t num)
7953 {
7954 void *p = (void *) malloc (num);
7955 if (!p)
7956 - lt_fatal (__FILE__, __LINE__, "memory exhausted");
7957 + lt_fatal ("Memory exhausted");
7959 return p;
7960 }
7961 @@ -3845,8 +3620,8 @@ check_executable (const char *path)
7962 {
7963 struct stat st;
7965 - lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
7966 - nonempty (path));
7967 + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
7968 + path ? (*path ? path : "EMPTY!") : "NULL!"));
7969 if ((!path) || (!*path))
7970 return 0;
7972 @@ -3863,8 +3638,8 @@ make_executable (const char *path)
7973 int rval = 0;
7974 struct stat st;
7976 - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
7977 - nonempty (path));
7978 + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
7979 + path ? (*path ? path : "EMPTY!") : "NULL!"));
7980 if ((!path) || (!*path))
7981 return 0;
7983 @@ -3890,8 +3665,8 @@ find_executable (const char *wrapper)
7984 int tmp_len;
7985 char *concat_name;
7987 - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
7988 - nonempty (wrapper));
7989 + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
7990 + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
7992 if ((wrapper == NULL) || (*wrapper == '\0'))
7993 return NULL;
7994 @@ -3944,8 +3719,7 @@ find_executable (const char *wrapper)
7995 {
7996 /* empty path: current directory */
7997 if (getcwd (tmp, LT_PATHMAX) == NULL)
7998 - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
7999 - nonnull (strerror (errno)));
8000 + lt_fatal ("getcwd failed");
8001 tmp_len = strlen (tmp);
8002 concat_name =
8003 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
8004 @@ -3970,8 +3744,7 @@ find_executable (const char *wrapper)
8005 }
8006 /* Relative path | not found in path: prepend cwd */
8007 if (getcwd (tmp, LT_PATHMAX) == NULL)
8008 - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
8009 - nonnull (strerror (errno)));
8010 + lt_fatal ("getcwd failed");
8011 tmp_len = strlen (tmp);
8012 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
8013 memcpy (concat_name, tmp, tmp_len);
8014 @@ -3997,9 +3770,8 @@ chase_symlinks (const char *pathspec)
8015 int has_symlinks = 0;
8016 while (strlen (tmp_pathspec) && !has_symlinks)
8017 {
8018 - lt_debugprintf (__FILE__, __LINE__,
8019 - "checking path component for symlinks: %s\n",
8020 - tmp_pathspec);
8021 + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
8022 + tmp_pathspec));
8023 if (lstat (tmp_pathspec, &s) == 0)
8024 {
8025 if (S_ISLNK (s.st_mode) != 0)
8026 @@ -4021,9 +3793,8 @@ chase_symlinks (const char *pathspec)
8027 }
8028 else
8029 {
8030 - lt_fatal (__FILE__, __LINE__,
8031 - "error accessing file \"%s\": %s",
8032 - tmp_pathspec, nonnull (strerror (errno)));
8033 + char *errstr = strerror (errno);
8034 + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
8035 }
8036 }
8037 XFREE (tmp_pathspec);
8038 @@ -4036,8 +3807,7 @@ chase_symlinks (const char *pathspec)
8039 tmp_pathspec = realpath (pathspec, buf);
8040 if (tmp_pathspec == 0)
8041 {
8042 - lt_fatal (__FILE__, __LINE__,
8043 - "could not follow symlinks for %s", pathspec);
8044 + lt_fatal ("Could not follow symlinks for %s", pathspec);
8045 }
8046 return xstrdup (tmp_pathspec);
8047 #endif
8048 @@ -4063,25 +3833,11 @@ strendzap (char *str, const char *pat)
8049 return str;
8050 }
8052 -void
8053 -lt_debugprintf (const char *file, int line, const char *fmt, ...)
8054 -{
8055 - va_list args;
8056 - if (lt_debug)
8057 - {
8058 - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
8059 - va_start (args, fmt);
8060 - (void) vfprintf (stderr, fmt, args);
8061 - va_end (args);
8062 - }
8063 -}
8064 -
8065 static void
8066 -lt_error_core (int exit_status, const char *file,
8067 - int line, const char *mode,
8068 +lt_error_core (int exit_status, const char *mode,
8069 const char *message, va_list ap)
8070 {
8071 - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
8072 + fprintf (stderr, "%s: %s: ", program_name, mode);
8073 vfprintf (stderr, message, ap);
8074 fprintf (stderr, ".\n");
8076 @@ -4090,32 +3846,20 @@ lt_error_core (int exit_status, const ch
8077 }
8079 void
8080 -lt_fatal (const char *file, int line, const char *message, ...)
8081 +lt_fatal (const char *message, ...)
8082 {
8083 va_list ap;
8084 va_start (ap, message);
8085 - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
8086 + lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
8087 va_end (ap);
8088 }
8090 -static const char *
8091 -nonnull (const char *s)
8092 -{
8093 - return s ? s : "(null)";
8094 -}
8095 -
8096 -static const char *
8097 -nonempty (const char *s)
8098 -{
8099 - return (s && !*s) ? "(empty)" : nonnull (s);
8100 -}
8101 -
8102 void
8103 lt_setenv (const char *name, const char *value)
8104 {
8105 - lt_debugprintf (__FILE__, __LINE__,
8106 - "(lt_setenv) setting '%s' to '%s'\n",
8107 - nonnull (name), nonnull (value));
8108 + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
8109 + (name ? name : "<NULL>"),
8110 + (value ? value : "<NULL>")));
8111 {
8112 #ifdef HAVE_SETENV
8113 /* always make a copy, for consistency with !HAVE_SETENV */
8114 @@ -4160,12 +3904,95 @@ lt_extend_str (const char *orig_value, c
8115 return new_value;
8116 }
8118 +int
8119 +lt_split_name_value (const char *arg, char** name, char** value)
8120 +{
8121 + const char *p;
8122 + int len;
8123 + if (!arg || !*arg)
8124 + return 1;
8125 +
8126 + p = strchr (arg, (int)'=');
8127 +
8128 + if (!p)
8129 + return 1;
8130 +
8131 + *value = xstrdup (++p);
8132 +
8133 + len = strlen (arg) - strlen (*value);
8134 + *name = XMALLOC (char, len);
8135 + strncpy (*name, arg, len-1);
8136 + (*name)[len - 1] = '\0';
8137 +
8138 + return 0;
8139 +}
8140 +
8141 +void
8142 +lt_opt_process_env_set (const char *arg)
8143 +{
8144 + char *name = NULL;
8145 + char *value = NULL;
8146 +
8147 + if (lt_split_name_value (arg, &name, &value) != 0)
8148 + {
8149 + XFREE (name);
8150 + XFREE (value);
8151 + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
8152 + }
8153 +
8154 + lt_setenv (name, value);
8155 + XFREE (name);
8156 + XFREE (value);
8157 +}
8158 +
8159 +void
8160 +lt_opt_process_env_prepend (const char *arg)
8161 +{
8162 + char *name = NULL;
8163 + char *value = NULL;
8164 + char *new_value = NULL;
8165 +
8166 + if (lt_split_name_value (arg, &name, &value) != 0)
8167 + {
8168 + XFREE (name);
8169 + XFREE (value);
8170 + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
8171 + }
8172 +
8173 + new_value = lt_extend_str (getenv (name), value, 0);
8174 + lt_setenv (name, new_value);
8175 + XFREE (new_value);
8176 + XFREE (name);
8177 + XFREE (value);
8178 +}
8179 +
8180 +void
8181 +lt_opt_process_env_append (const char *arg)
8182 +{
8183 + char *name = NULL;
8184 + char *value = NULL;
8185 + char *new_value = NULL;
8186 +
8187 + if (lt_split_name_value (arg, &name, &value) != 0)
8188 + {
8189 + XFREE (name);
8190 + XFREE (value);
8191 + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
8192 + }
8193 +
8194 + new_value = lt_extend_str (getenv (name), value, 1);
8195 + lt_setenv (name, new_value);
8196 + XFREE (new_value);
8197 + XFREE (name);
8198 + XFREE (value);
8199 +}
8200 +
8201 void
8202 lt_update_exe_path (const char *name, const char *value)
8203 {
8204 - lt_debugprintf (__FILE__, __LINE__,
8205 - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
8206 - nonnull (name), nonnull (value));
8207 + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
8208 + (name ? name : "<NULL>"),
8209 + (value ? value : "<NULL>")));
8211 if (name && *name && value && *value)
8212 {
8213 @@ -4184,9 +4011,9 @@ lt_update_exe_path (const char *name, co
8214 void
8215 lt_update_lib_path (const char *name, const char *value)
8216 {
8217 - lt_debugprintf (__FILE__, __LINE__,
8218 - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
8219 - nonnull (name), nonnull (value));
8220 + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
8221 + (name ? name : "<NULL>"),
8222 + (value ? value : "<NULL>")));
8224 if (name && *name && value && *value)
8225 {
8226 @@ -4196,152 +4023,11 @@ lt_update_lib_path (const char *name, co
8227 }
8228 }
8230 -EOF
8231 - case $host_os in
8232 - mingw*)
8233 - cat <<"EOF"
8234 -
8235 -/* Prepares an argument vector before calling spawn().
8236 - Note that spawn() does not by itself call the command interpreter
8237 - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
8238 - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
8239 - GetVersionEx(&v);
8240 - v.dwPlatformId == VER_PLATFORM_WIN32_NT;
8241 - }) ? "cmd.exe" : "command.com").
8242 - Instead it simply concatenates the arguments, separated by ' ', and calls
8243 - CreateProcess(). We must quote the arguments since Win32 CreateProcess()
8244 - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
8245 - special way:
8246 - - Space and tab are interpreted as delimiters. They are not treated as
8247 - delimiters if they are surrounded by double quotes: "...".
8248 - - Unescaped double quotes are removed from the input. Their only effect is
8249 - that within double quotes, space and tab are treated like normal
8250 - characters.
8251 - - Backslashes not followed by double quotes are not special.
8252 - - But 2*n+1 backslashes followed by a double quote become
8253 - n backslashes followed by a double quote (n >= 0):
8254 - \" -> "
8255 - \\\" -> \"
8256 - \\\\\" -> \\"
8257 - */
8258 -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
8259 -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
8260 -char **
8261 -prepare_spawn (char **argv)
8262 -{
8263 - size_t argc;
8264 - char **new_argv;
8265 - size_t i;
8266 -
8267 - /* Count number of arguments. */
8268 - for (argc = 0; argv[argc] != NULL; argc++)
8269 - ;
8270 -
8271 - /* Allocate new argument vector. */
8272 - new_argv = XMALLOC (char *, argc + 1);
8273 -
8274 - /* Put quoted arguments into the new argument vector. */
8275 - for (i = 0; i < argc; i++)
8276 - {
8277 - const char *string = argv[i];
8278 -
8279 - if (string[0] == '\0')
8280 - new_argv[i] = xstrdup ("\"\"");
8281 - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
8282 - {
8283 - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
8284 - size_t length;
8285 - unsigned int backslashes;
8286 - const char *s;
8287 - char *quoted_string;
8288 - char *p;
8289 -
8290 - length = 0;
8291 - backslashes = 0;
8292 - if (quote_around)
8293 - length++;
8294 - for (s = string; *s != '\0'; s++)
8295 - {
8296 - char c = *s;
8297 - if (c == '"')
8298 - length += backslashes + 1;
8299 - length++;
8300 - if (c == '\\')
8301 - backslashes++;
8302 - else
8303 - backslashes = 0;
8304 - }
8305 - if (quote_around)
8306 - length += backslashes + 1;
8307 -
8308 - quoted_string = XMALLOC (char, length + 1);
8309 -
8310 - p = quoted_string;
8311 - backslashes = 0;
8312 - if (quote_around)
8313 - *p++ = '"';
8314 - for (s = string; *s != '\0'; s++)
8315 - {
8316 - char c = *s;
8317 - if (c == '"')
8318 - {
8319 - unsigned int j;
8320 - for (j = backslashes + 1; j > 0; j--)
8321 - *p++ = '\\';
8322 - }
8323 - *p++ = c;
8324 - if (c == '\\')
8325 - backslashes++;
8326 - else
8327 - backslashes = 0;
8328 - }
8329 - if (quote_around)
8330 - {
8331 - unsigned int j;
8332 - for (j = backslashes; j > 0; j--)
8333 - *p++ = '\\';
8334 - *p++ = '"';
8335 - }
8336 - *p = '\0';
8337 -
8338 - new_argv[i] = quoted_string;
8339 - }
8340 - else
8341 - new_argv[i] = (char *) string;
8342 - }
8343 - new_argv[argc] = NULL;
8344 -
8345 - return new_argv;
8346 -}
8347 -EOF
8348 - ;;
8349 - esac
8350 -
8351 - cat <<"EOF"
8352 -void lt_dump_script (FILE* f)
8353 -{
8354 -EOF
8355 - func_emit_wrapper yes |
8356 - $SED -e 's/\([\\"]\)/\\\1/g' \
8357 - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
8359 - cat <<"EOF"
8360 -}
8361 EOF
8362 }
8363 # end: func_emit_cwrapperexe_src
8365 -# func_win32_import_lib_p ARG
8366 -# True if ARG is an import lib, as indicated by $file_magic_cmd
8367 -func_win32_import_lib_p ()
8368 -{
8369 - $opt_debug
8370 - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
8371 - *import*) : ;;
8372 - *) false ;;
8373 - esac
8374 -}
8375 -
8376 # func_mode_link arg...
8377 func_mode_link ()
8378 {
8379 @@ -4386,7 +4072,6 @@ func_mode_link ()
8380 new_inherited_linker_flags=
8382 avoid_version=no
8383 - bindir=
8384 dlfiles=
8385 dlprefiles=
8386 dlself=no
8387 @@ -4479,11 +4164,6 @@ func_mode_link ()
8388 esac
8390 case $prev in
8391 - bindir)
8392 - bindir="$arg"
8393 - prev=
8394 - continue
8395 - ;;
8396 dlfiles|dlprefiles)
8397 if test "$preload" = no; then
8398 # Add the symbol object into the linking commands.
8399 @@ -4745,11 +4425,6 @@ func_mode_link ()
8400 continue
8401 ;;
8403 - -bindir)
8404 - prev=bindir
8405 - continue
8406 - ;;
8407 -
8408 -dlopen)
8409 prev=dlfiles
8410 continue
8411 @@ -4828,7 +4503,7 @@ func_mode_link ()
8412 esac
8413 case $host in
8414 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
8415 - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
8416 + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
8417 case :$dllsearchpath: in
8418 *":$dir:"*) ;;
8419 ::) dllsearchpath=$dir;;
8420 @@ -4847,7 +4522,7 @@ func_mode_link ()
8421 -l*)
8422 if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
8423 case $host in
8424 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
8425 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
8426 # These systems don't actually have a C or math library (as such)
8427 continue
8428 ;;
8429 @@ -5033,7 +4708,7 @@ func_mode_link ()
8430 for flag in $args; do
8431 IFS="$save_ifs"
8432 func_quote_for_eval "$flag"
8433 - arg="$arg $func_quote_for_eval_result"
8434 + arg="$arg $wl$func_quote_for_eval_result"
8435 compiler_flags="$compiler_flags $func_quote_for_eval_result"
8436 done
8437 IFS="$save_ifs"
8438 @@ -5079,19 +4754,18 @@ func_mode_link ()
8439 arg="$func_quote_for_eval_result"
8440 ;;
8442 - # Flags to be passed through unchanged, with rationale:
8443 - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
8444 - # -r[0-9][0-9]* specify processor for the SGI compiler
8445 - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
8446 - # +DA*, +DD* enable 64-bit mode for the HP compiler
8447 - # -q* compiler args for the IBM compiler
8448 - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
8449 - # -F/path path to uninstalled frameworks, gcc on darwin
8450 - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
8451 - # @file GCC response files
8452 - # -tp=* Portland pgcc target processor selection
8453 + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
8454 + # -r[0-9][0-9]* specifies the processor on the SGI compiler
8455 + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
8456 + # +DA*, +DD* enable 64-bit mode on the HP compiler
8457 + # -q* pass through compiler args for the IBM compiler
8458 + # -m*, -t[45]*, -txscale* pass through architecture-specific
8459 + # compiler args for GCC
8460 + # -F/path gives path to uninstalled frameworks, gcc on darwin
8461 + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
8462 + # @file GCC response files
8463 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
8464 - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
8465 + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
8466 func_quote_for_eval "$arg"
8467 arg="$func_quote_for_eval_result"
8468 func_append compile_command " $arg"
8469 @@ -5251,7 +4925,7 @@ func_mode_link ()
8471 if test -n "$shlibpath_var"; then
8472 # get the directories listed in $shlibpath_var
8473 - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
8474 + eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
8475 else
8476 shlib_search_path=
8477 fi
8478 @@ -5359,7 +5033,10 @@ func_mode_link ()
8479 case $pass in
8480 dlopen) libs="$dlfiles" ;;
8481 dlpreopen) libs="$dlprefiles" ;;
8482 - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
8483 + link)
8484 + libs="$deplibs %DEPLIBS%"
8485 + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
8486 + ;;
8487 esac
8488 fi
8489 if test "$linkmode,$pass" = "lib,dlpreopen"; then
8490 @@ -5374,8 +5051,7 @@ func_mode_link ()
8491 # Collect preopened libtool deplibs, except any this library
8492 # has declared as weak libs
8493 for deplib in $dependency_libs; do
8494 - func_basename "$deplib"
8495 - deplib_base=$func_basename_result
8496 + deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
8497 case " $weak_libs " in
8498 *" $deplib_base "*) ;;
8499 *) deplibs="$deplibs $deplib" ;;
8500 @@ -5554,7 +5230,7 @@ func_mode_link ()
8501 match_pattern*)
8502 set dummy $deplibs_check_method; shift
8503 match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
8504 - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
8505 + if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
8506 | $EGREP "$match_pattern_regex" > /dev/null; then
8507 valid_a_lib=yes
8508 fi
8509 @@ -5564,15 +5240,15 @@ func_mode_link ()
8510 ;;
8511 esac
8512 if test "$valid_a_lib" != yes; then
8513 - echo
8514 + $ECHO
8515 $ECHO "*** Warning: Trying to link with static lib archive $deplib."
8516 - echo "*** I have the capability to make that library automatically link in when"
8517 - echo "*** you link to this library. But I can only do this if you have a"
8518 - echo "*** shared version of the library, which you do not appear to have"
8519 - echo "*** because the file extensions .$libext of this argument makes me believe"
8520 - echo "*** that it is just a static archive that I should not use here."
8521 + $ECHO "*** I have the capability to make that library automatically link in when"
8522 + $ECHO "*** you link to this library. But I can only do this if you have a"
8523 + $ECHO "*** shared version of the library, which you do not appear to have"
8524 + $ECHO "*** because the file extensions .$libext of this argument makes me believe"
8525 + $ECHO "*** that it is just a static archive that I should not use here."
8526 else
8527 - echo
8528 + $ECHO
8529 $ECHO "*** Warning: Linking the shared library $output against the"
8530 $ECHO "*** static library $deplib is not portable!"
8531 deplibs="$deplib $deplibs"
8532 @@ -5645,7 +5321,7 @@ func_mode_link ()
8534 # Convert "-framework foo" to "foo.ltframework"
8535 if test -n "$inherited_linker_flags"; then
8536 - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
8537 + tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
8538 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
8539 case " $new_inherited_linker_flags " in
8540 *" $tmp_inherited_linker_flag "*) ;;
8541 @@ -5653,7 +5329,7 @@ func_mode_link ()
8542 esac
8543 done
8544 fi
8545 - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
8546 + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
8547 if test "$linkmode,$pass" = "lib,link" ||
8548 test "$linkmode,$pass" = "prog,scan" ||
8549 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
8550 @@ -5671,19 +5347,19 @@ func_mode_link ()
8551 # It is a libtool convenience library, so add in its objects.
8552 convenience="$convenience $ladir/$objdir/$old_library"
8553 old_convenience="$old_convenience $ladir/$objdir/$old_library"
8554 + tmp_libs=
8555 + for deplib in $dependency_libs; do
8556 + deplibs="$deplib $deplibs"
8557 + if $opt_duplicate_deps ; then
8558 + case "$tmp_libs " in
8559 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
8560 + esac
8561 + fi
8562 + tmp_libs="$tmp_libs $deplib"
8563 + done
8564 elif test "$linkmode" != prog && test "$linkmode" != lib; then
8565 func_fatal_error "\`$lib' is not a convenience library"
8566 fi
8567 - tmp_libs=
8568 - for deplib in $dependency_libs; do
8569 - deplibs="$deplib $deplibs"
8570 - if $opt_duplicate_deps ; then
8571 - case "$tmp_libs " in
8572 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
8573 - esac
8574 - fi
8575 - tmp_libs="$tmp_libs $deplib"
8576 - done
8577 continue
8578 fi # $pass = conv
8580 @@ -5907,7 +5583,7 @@ func_mode_link ()
8581 fi
8582 done
8583 if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
8584 - echo
8585 + $ECHO
8586 if test "$linkmode" = prog; then
8587 $ECHO "*** Warning: Linking the executable $output against the loadable module"
8588 else
8589 @@ -6010,9 +5686,9 @@ func_mode_link ()
8590 if test "X$dlopenmodule" != "X$lib"; then
8591 $ECHO "*** Warning: lib $linklib is a module, not a shared library"
8592 if test -z "$old_library" ; then
8593 - echo
8594 - echo "*** And there doesn't seem to be a static archive available"
8595 - echo "*** The link will probably fail, sorry"
8596 + $ECHO
8597 + $ECHO "*** And there doesn't seem to be a static archive available"
8598 + $ECHO "*** The link will probably fail, sorry"
8599 else
8600 add="$dir/$old_library"
8601 fi
8602 @@ -6152,21 +5828,21 @@ func_mode_link ()
8604 # Just print a warning and add the library to dependency_libs so
8605 # that the program can be linked against the static library.
8606 - echo
8607 + $ECHO
8608 $ECHO "*** Warning: This system can not link to static lib archive $lib."
8609 - echo "*** I have the capability to make that library automatically link in when"
8610 - echo "*** you link to this library. But I can only do this if you have a"
8611 - echo "*** shared version of the library, which you do not appear to have."
8612 + $ECHO "*** I have the capability to make that library automatically link in when"
8613 + $ECHO "*** you link to this library. But I can only do this if you have a"
8614 + $ECHO "*** shared version of the library, which you do not appear to have."
8615 if test "$module" = yes; then
8616 - echo "*** But as you try to build a module library, libtool will still create "
8617 - echo "*** a static module, that should work as long as the dlopening application"
8618 - echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
8619 + $ECHO "*** But as you try to build a module library, libtool will still create "
8620 + $ECHO "*** a static module, that should work as long as the dlopening application"
8621 + $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
8622 if test -z "$global_symbol_pipe"; then
8623 - echo
8624 - echo "*** However, this would only work if libtool was able to extract symbol"
8625 - echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
8626 - echo "*** not find such a program. So, this module is probably useless."
8627 - echo "*** \`nm' from GNU binutils and a full rebuild may help."
8628 + $ECHO
8629 + $ECHO "*** However, this would only work if libtool was able to extract symbol"
8630 + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
8631 + $ECHO "*** not find such a program. So, this module is probably useless."
8632 + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
8633 fi
8634 if test "$build_old_libs" = no; then
8635 build_libtool_libs=module
8636 @@ -6286,7 +5962,7 @@ func_mode_link ()
8637 compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
8638 finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
8639 else
8640 - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
8641 + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
8642 fi
8643 fi
8644 dependency_libs="$newdependency_libs"
8645 @@ -6454,7 +6130,7 @@ func_mode_link ()
8646 if test "$deplibs_check_method" != pass_all; then
8647 func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
8648 else
8649 - echo
8650 + $ECHO
8651 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
8652 $ECHO "*** objects $objs is not portable!"
8653 libobjs="$libobjs $objs"
8654 @@ -6522,7 +6198,7 @@ func_mode_link ()
8655 age="$number_minor"
8656 revision="$number_revision"
8657 ;;
8658 - freebsd-aout|freebsd-elf|qnx|sunos)
8659 + freebsd-aout|freebsd-elf|sunos)
8660 current="$number_major"
8661 revision="$number_minor"
8662 age="0"
8663 @@ -6534,6 +6210,9 @@ func_mode_link ()
8664 revision="$number_minor"
8665 lt_irix_increment=no
8666 ;;
8667 + *)
8668 + func_fatal_configuration "$modename: unknown library version type \`$version_type'"
8669 + ;;
8670 esac
8671 ;;
8672 no)
8673 @@ -6756,14 +6435,14 @@ func_mode_link ()
8674 oldlibs="$oldlibs $output_objdir/$libname.$libext"
8676 # Transform .lo files to .o files.
8677 - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
8678 + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
8679 fi
8681 # Eliminate all temporary directories.
8682 #for path in $notinst_path; do
8683 - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
8684 - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
8685 - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
8686 + # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
8687 + # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
8688 + # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
8689 #done
8691 if test -n "$xrpath"; then
8692 @@ -6804,7 +6483,7 @@ func_mode_link ()
8693 if test "$build_libtool_libs" = yes; then
8694 if test -n "$rpath"; then
8695 case $host in
8696 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
8697 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
8698 # these systems don't actually have a c library (as such)!
8699 ;;
8700 *-*-rhapsody* | *-*-darwin1.[012])
8701 @@ -6889,13 +6568,13 @@ EOF
8702 newdeplibs="$newdeplibs $i"
8703 else
8704 droppeddeps=yes
8705 - echo
8706 + $ECHO
8707 $ECHO "*** Warning: dynamic linker does not accept needed library $i."
8708 - echo "*** I have the capability to make that library automatically link in when"
8709 - echo "*** you link to this library. But I can only do this if you have a"
8710 - echo "*** shared version of the library, which I believe you do not have"
8711 - echo "*** because a test_compile did reveal that the linker did not use it for"
8712 - echo "*** its dynamic dependency list that programs get resolved with at runtime."
8713 + $ECHO "*** I have the capability to make that library automatically link in when"
8714 + $ECHO "*** you link to this library. But I can only do this if you have a"
8715 + $ECHO "*** shared version of the library, which I believe you do not have"
8716 + $ECHO "*** because a test_compile did reveal that the linker did not use it for"
8717 + $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
8718 fi
8719 fi
8720 ;;
8721 @@ -6932,22 +6611,22 @@ EOF
8722 newdeplibs="$newdeplibs $i"
8723 else
8724 droppeddeps=yes
8725 - echo
8726 + $ECHO
8727 $ECHO "*** Warning: dynamic linker does not accept needed library $i."
8728 - echo "*** I have the capability to make that library automatically link in when"
8729 - echo "*** you link to this library. But I can only do this if you have a"
8730 - echo "*** shared version of the library, which you do not appear to have"
8731 - echo "*** because a test_compile did reveal that the linker did not use this one"
8732 - echo "*** as a dynamic dependency that programs can get resolved with at runtime."
8733 + $ECHO "*** I have the capability to make that library automatically link in when"
8734 + $ECHO "*** you link to this library. But I can only do this if you have a"
8735 + $ECHO "*** shared version of the library, which you do not appear to have"
8736 + $ECHO "*** because a test_compile did reveal that the linker did not use this one"
8737 + $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
8738 fi
8739 fi
8740 else
8741 droppeddeps=yes
8742 - echo
8743 + $ECHO
8744 $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
8745 - echo "*** make it link in! You will probably need to install it or some"
8746 - echo "*** library that it depends on before this library will be fully"
8747 - echo "*** functional. Installing it before continuing would be even better."
8748 + $ECHO "*** make it link in! You will probably need to install it or some"
8749 + $ECHO "*** library that it depends on before this library will be fully"
8750 + $ECHO "*** functional. Installing it before continuing would be even better."
8751 fi
8752 ;;
8753 *)
8754 @@ -6993,7 +6672,7 @@ EOF
8755 potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
8756 case $potliblink in
8757 [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
8758 - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
8759 + *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
8760 esac
8761 done
8762 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
8763 @@ -7008,12 +6687,12 @@ EOF
8764 fi
8765 if test -n "$a_deplib" ; then
8766 droppeddeps=yes
8767 - echo
8768 + $ECHO
8769 $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
8770 - echo "*** I have the capability to make that library automatically link in when"
8771 - echo "*** you link to this library. But I can only do this if you have a"
8772 - echo "*** shared version of the library, which you do not appear to have"
8773 - echo "*** because I did check the linker path looking for a file starting"
8774 + $ECHO "*** I have the capability to make that library automatically link in when"
8775 + $ECHO "*** you link to this library. But I can only do this if you have a"
8776 + $ECHO "*** shared version of the library, which you do not appear to have"
8777 + $ECHO "*** because I did check the linker path looking for a file starting"
8778 if test -z "$potlib" ; then
8779 $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
8780 else
8781 @@ -7051,7 +6730,7 @@ EOF
8782 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
8783 for potent_lib in $potential_libs; do
8784 potlib="$potent_lib" # see symlink-check above in file_magic test
8785 - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
8786 + if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
8787 $EGREP "$match_pattern_regex" > /dev/null; then
8788 newdeplibs="$newdeplibs $a_deplib"
8789 a_deplib=""
8790 @@ -7062,12 +6741,12 @@ EOF
8791 fi
8792 if test -n "$a_deplib" ; then
8793 droppeddeps=yes
8794 - echo
8795 + $ECHO
8796 $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
8797 - echo "*** I have the capability to make that library automatically link in when"
8798 - echo "*** you link to this library. But I can only do this if you have a"
8799 - echo "*** shared version of the library, which you do not appear to have"
8800 - echo "*** because I did check the linker path looking for a file starting"
8801 + $ECHO "*** I have the capability to make that library automatically link in when"
8802 + $ECHO "*** you link to this library. But I can only do this if you have a"
8803 + $ECHO "*** shared version of the library, which you do not appear to have"
8804 + $ECHO "*** because I did check the linker path looking for a file starting"
8805 if test -z "$potlib" ; then
8806 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
8807 else
8808 @@ -7085,25 +6764,25 @@ EOF
8809 ;;
8810 none | unknown | *)
8811 newdeplibs=""
8812 - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
8813 + tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
8814 + -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
8815 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
8816 for i in $predeps $postdeps ; do
8817 # can't use Xsed below, because $i might contain '/'
8818 - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
8819 + tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
8820 done
8821 fi
8822 - case $tmp_deplibs in
8823 - *[!\ \ ]*)
8824 - echo
8825 + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
8826 + $GREP . >/dev/null; then
8827 + $ECHO
8828 if test "X$deplibs_check_method" = "Xnone"; then
8829 - echo "*** Warning: inter-library dependencies are not supported in this platform."
8830 + $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
8831 else
8832 - echo "*** Warning: inter-library dependencies are not known to be supported."
8833 + $ECHO "*** Warning: inter-library dependencies are not known to be supported."
8834 fi
8835 - echo "*** All declared inter-library dependencies are being dropped."
8836 + $ECHO "*** All declared inter-library dependencies are being dropped."
8837 droppeddeps=yes
8838 - ;;
8839 - esac
8840 + fi
8841 ;;
8842 esac
8843 versuffix=$versuffix_save
8844 @@ -7115,23 +6794,23 @@ EOF
8845 case $host in
8846 *-*-rhapsody* | *-*-darwin1.[012])
8847 # On Rhapsody replace the C library with the System framework
8848 - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
8849 + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
8850 ;;
8851 esac
8853 if test "$droppeddeps" = yes; then
8854 if test "$module" = yes; then
8855 - echo
8856 - echo "*** Warning: libtool could not satisfy all declared inter-library"
8857 + $ECHO
8858 + $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
8859 $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
8860 - echo "*** a static module, that should work as long as the dlopening"
8861 - echo "*** application is linked with the -dlopen flag."
8862 + $ECHO "*** a static module, that should work as long as the dlopening"
8863 + $ECHO "*** application is linked with the -dlopen flag."
8864 if test -z "$global_symbol_pipe"; then
8865 - echo
8866 - echo "*** However, this would only work if libtool was able to extract symbol"
8867 - echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
8868 - echo "*** not find such a program. So, this module is probably useless."
8869 - echo "*** \`nm' from GNU binutils and a full rebuild may help."
8870 + $ECHO
8871 + $ECHO "*** However, this would only work if libtool was able to extract symbol"
8872 + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
8873 + $ECHO "*** not find such a program. So, this module is probably useless."
8874 + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
8875 fi
8876 if test "$build_old_libs" = no; then
8877 oldlibs="$output_objdir/$libname.$libext"
8878 @@ -7141,16 +6820,16 @@ EOF
8879 build_libtool_libs=no
8880 fi
8881 else
8882 - echo "*** The inter-library dependencies that have been dropped here will be"
8883 - echo "*** automatically added whenever a program is linked with this library"
8884 - echo "*** or is declared to -dlopen it."
8885 + $ECHO "*** The inter-library dependencies that have been dropped here will be"
8886 + $ECHO "*** automatically added whenever a program is linked with this library"
8887 + $ECHO "*** or is declared to -dlopen it."
8889 if test "$allow_undefined" = no; then
8890 - echo
8891 - echo "*** Since this library must not contain undefined symbols,"
8892 - echo "*** because either the platform does not support them or"
8893 - echo "*** it was explicitly requested with -no-undefined,"
8894 - echo "*** libtool will only create a static version of it."
8895 + $ECHO
8896 + $ECHO "*** Since this library must not contain undefined symbols,"
8897 + $ECHO "*** because either the platform does not support them or"
8898 + $ECHO "*** it was explicitly requested with -no-undefined,"
8899 + $ECHO "*** libtool will only create a static version of it."
8900 if test "$build_old_libs" = no; then
8901 oldlibs="$output_objdir/$libname.$libext"
8902 build_libtool_libs=module
8903 @@ -7167,9 +6846,9 @@ EOF
8904 # Time to change all our "foo.ltframework" stuff back to "-framework foo"
8905 case $host in
8906 *-*-darwin*)
8907 - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
8908 - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
8909 - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
8910 + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
8911 + new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
8912 + deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
8913 ;;
8914 esac
8916 @@ -7291,7 +6970,7 @@ EOF
8917 done
8919 # Use standard objects if they are pic
8920 - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
8921 + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
8922 test "X$libobjs" = "X " && libobjs=
8924 delfiles=
8925 @@ -7357,7 +7036,7 @@ EOF
8926 if test -n "$export_symbols" && test -n "$include_expsyms"; then
8927 tmp_export_symbols="$export_symbols"
8928 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
8929 - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
8930 + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
8931 fi
8933 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
8934 @@ -7458,8 +7137,7 @@ EOF
8935 save_libobjs=$libobjs
8936 fi
8937 save_output=$output
8938 - func_basename "$output"
8939 - output_la=$func_basename_result
8940 + output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
8942 # Clear the reloadable object creation command queue and
8943 # initialize k to one.
8944 @@ -7472,12 +7150,12 @@ EOF
8945 if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
8946 output=${output_objdir}/${output_la}.lnkscript
8947 func_verbose "creating GNU ld script: $output"
8948 - echo 'INPUT (' > $output
8949 + $ECHO 'INPUT (' > $output
8950 for obj in $save_libobjs
8951 do
8952 $ECHO "$obj" >> $output
8953 done
8954 - echo ')' >> $output
8955 + $ECHO ')' >> $output
8956 delfiles="$delfiles $output"
8957 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
8958 output=${output_objdir}/${output_la}.lnk
8959 @@ -7519,19 +7197,17 @@ EOF
8960 # command to the queue.
8961 if test "$k" -eq 1 ; then
8962 # The first file doesn't have a previous command to add.
8963 - reload_objs=$objlist
8964 - eval concat_cmds=\"$reload_cmds\"
8965 + eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
8966 else
8967 # All subsequent reloadable object files will link in
8968 # the last one created.
8969 - reload_objs="$objlist $last_robj"
8970 - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
8971 + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
8972 fi
8973 last_robj=$output_objdir/$output_la-${k}.$objext
8974 func_arith $k + 1
8975 k=$func_arith_result
8976 output=$output_objdir/$output_la-${k}.$objext
8977 - objlist=" $obj"
8978 + objlist=$obj
8979 func_len " $last_robj"
8980 func_arith $len0 + $func_len_result
8981 len=$func_arith_result
8982 @@ -7541,8 +7217,7 @@ EOF
8983 # reloadable object file. All subsequent reloadable object
8984 # files will link in the last one created.
8985 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
8986 - reload_objs="$objlist $last_robj"
8987 - eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
8988 + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
8989 if test -n "$last_robj"; then
8990 eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
8991 fi
8992 @@ -7601,7 +7276,7 @@ EOF
8993 if test -n "$export_symbols" && test -n "$include_expsyms"; then
8994 tmp_export_symbols="$export_symbols"
8995 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
8996 - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
8997 + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
8998 fi
9000 if test -n "$orig_export_symbols"; then
9001 @@ -7766,7 +7441,7 @@ EOF
9002 if test -n "$convenience"; then
9003 if test -n "$whole_archive_flag_spec"; then
9004 eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
9005 - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
9006 + reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
9007 else
9008 gentop="$output_objdir/${obj}x"
9009 generated="$generated $gentop"
9010 @@ -7777,7 +7452,7 @@ EOF
9011 fi
9013 # Create the old-style object.
9014 - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
9015 + reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
9017 output="$obj"
9018 func_execute_cmds "$reload_cmds" 'exit $?'
9019 @@ -7837,8 +7512,8 @@ EOF
9020 case $host in
9021 *-*-rhapsody* | *-*-darwin1.[012])
9022 # On Rhapsody replace the C library is the System framework
9023 - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
9024 - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
9025 + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
9026 + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
9027 ;;
9028 esac
9030 @@ -7855,8 +7530,8 @@ EOF
9031 esac
9032 fi
9033 # Time to change all our "foo.ltframework" stuff back to "-framework foo"
9034 - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
9035 - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
9036 + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
9037 + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
9038 ;;
9039 esac
9041 @@ -7993,8 +7668,8 @@ EOF
9043 if test -n "$libobjs" && test "$build_old_libs" = yes; then
9044 # Transform all the library objects into standard objects.
9045 - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
9046 - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
9047 + compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
9048 + finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
9049 fi
9051 func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
9052 @@ -8006,15 +7681,15 @@ EOF
9054 wrappers_required=yes
9055 case $host in
9056 - *cegcc* | *mingw32ce*)
9057 - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
9058 - wrappers_required=no
9059 - ;;
9060 *cygwin* | *mingw* )
9061 if test "$build_libtool_libs" != yes; then
9062 wrappers_required=no
9063 fi
9064 ;;
9065 + *cegcc)
9066 + # Disable wrappers for cegcc, we are cross compiling anyway.
9067 + wrappers_required=no
9068 + ;;
9069 *)
9070 if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
9071 wrappers_required=no
9072 @@ -8023,7 +7698,7 @@ EOF
9073 esac
9074 if test "$wrappers_required" = no; then
9075 # Replace the output file specification.
9076 - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
9077 + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
9078 link_command="$compile_command$compile_rpath"
9080 # We have no uninstalled library dependencies, so finalize right now.
9081 @@ -8070,7 +7745,7 @@ EOF
9082 # We don't need to create a wrapper script.
9083 link_command="$compile_var$compile_command$compile_rpath"
9084 # Replace the output file specification.
9085 - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
9086 + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
9087 # Delete the old output file.
9088 $opt_dry_run || $RM $output
9089 # Link the executable and exit
9090 @@ -8089,7 +7764,7 @@ EOF
9091 if test "$fast_install" != no; then
9092 link_command="$finalize_var$compile_command$finalize_rpath"
9093 if test "$fast_install" = yes; then
9094 - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
9095 + relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
9096 else
9097 # fast_install is set to needless
9098 relink_command=
9099 @@ -8101,7 +7776,7 @@ EOF
9100 fi
9102 # Replace the output file specification.
9103 - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
9104 + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
9106 # Delete the old output files.
9107 $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
9108 @@ -8125,7 +7800,18 @@ EOF
9109 fi
9110 done
9111 relink_command="(cd `pwd`; $relink_command)"
9112 - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
9113 + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
9114 + fi
9115 +
9116 + # Quote $ECHO for shipping.
9117 + if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
9118 + case $progpath in
9119 + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
9120 + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
9121 + esac
9122 + qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
9123 + else
9124 + qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
9125 fi
9127 # Only actually do things if not in dry run mode.
9128 @@ -8246,7 +7932,7 @@ EOF
9129 done | sort | sort -uc >/dev/null 2>&1); then
9130 :
9131 else
9132 - echo "copying selected object files to avoid basename conflicts..."
9133 + $ECHO "copying selected object files to avoid basename conflicts..."
9134 gentop="$output_objdir/${outputname}x"
9135 generated="$generated $gentop"
9136 func_mkdir_p "$gentop"
9137 @@ -8357,7 +8043,7 @@ EOF
9138 done
9139 # Quote the link command for shipping.
9140 relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
9141 - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
9142 + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
9143 if test "$hardcode_automatic" = yes ; then
9144 relink_command=
9145 fi
9146 @@ -8442,27 +8128,9 @@ EOF
9147 fi
9148 $RM $output
9149 # place dlname in correct position for cygwin
9150 - # In fact, it would be nice if we could use this code for all target
9151 - # systems that can't hard-code library paths into their executables
9152 - # and that have no shared library path variable independent of PATH,
9153 - # but it turns out we can't easily determine that from inspecting
9154 - # libtool variables, so we have to hard-code the OSs to which it
9155 - # applies here; at the moment, that means platforms that use the PE
9156 - # object format with DLL files. See the long comment at the top of
9157 - # tests/bindir.at for full details.
9158 tdlname=$dlname
9159 case $host,$output,$installed,$module,$dlname in
9160 - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
9161 - # If a -bindir argument was supplied, place the dll there.
9162 - if test "x$bindir" != x ;
9163 - then
9164 - func_relative_path "$install_libdir" "$bindir"
9165 - tdlname=$func_relative_path_result$dlname
9166 - else
9167 - # Otherwise fall back on heuristic.
9168 - tdlname=../bin/$dlname
9169 - fi
9170 - ;;
9171 + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
9172 esac
9173 $ECHO > $output "\
9174 # $outputname - a libtool library file
9175 --- lxpanel-0.5.6.orig/src/Makefile.in
9176 +++ lxpanel-0.5.6/src/Makefile.in
9177 @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
9178 $(top_srcdir)/configure.ac
9179 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9180 $(ACLOCAL_M4)
9181 -mkinstalldirs = $(install_sh) -d
9182 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9183 CONFIG_HEADER = $(top_builddir)/config.h
9184 CONFIG_CLEAN_FILES =
9185 CONFIG_CLEAN_VPATH_FILES =
9186 @@ -163,6 +163,8 @@ ACLOCAL = @ACLOCAL@
9187 ALL_LINGUAS = @ALL_LINGUAS@
9188 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
9189 AMTAR = @AMTAR@
9190 +APPLET_CFLAGS = @APPLET_CFLAGS@
9191 +APPLET_LIBS = @APPLET_LIBS@
9192 AR = @AR@
9193 AUTOCONF = @AUTOCONF@
9194 AUTOHEADER = @AUTOHEADER@
9195 @@ -192,6 +194,8 @@ GMOFILES = @GMOFILES@
9196 GMSGFMT = @GMSGFMT@
9197 GREP = @GREP@
9198 G_CAST_CHECKS = @G_CAST_CHECKS@
9199 +INDICATORDIR = @INDICATORDIR@
9200 +INDICATORICONSDIR = @INDICATORICONSDIR@
9201 INSTALL = @INSTALL@
9202 INSTALL_DATA = @INSTALL_DATA@
9203 INSTALL_PROGRAM = @INSTALL_PROGRAM@
9204 @@ -237,8 +241,6 @@ PACKAGE_URL = @PACKAGE_URL@
9205 PACKAGE_VERSION = @PACKAGE_VERSION@
9206 PATH_SEPARATOR = @PATH_SEPARATOR@
9207 PKG_CONFIG = @PKG_CONFIG@
9208 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9209 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9210 PLUGINS_LIST = @PLUGINS_LIST@
9211 POFILES = @POFILES@
9212 POSUB = @POSUB@
9213 @@ -294,6 +296,7 @@ libdir = @libdir@
9214 libexecdir = @libexecdir@
9215 localedir = @localedir@
9216 localstatedir = @localstatedir@
9217 +lt_ECHO = @lt_ECHO@
9218 mandir = @mandir@
9219 mkdir_p = @mkdir_p@
9220 oldincludedir = @oldincludedir@
9221 --- lxpanel-0.5.6.orig/src/plugins/Makefile.in
9222 +++ lxpanel-0.5.6/src/plugins/Makefile.in
9223 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
9224 $(top_srcdir)/configure.ac
9225 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9226 $(ACLOCAL_M4)
9227 -mkinstalldirs = $(install_sh) -d
9228 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9229 CONFIG_HEADER = $(top_builddir)/config.h
9230 CONFIG_CLEAN_FILES =
9231 CONFIG_CLEAN_VPATH_FILES =
9232 @@ -117,6 +117,8 @@ ACLOCAL = @ACLOCAL@
9233 ALL_LINGUAS = @ALL_LINGUAS@
9234 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
9235 AMTAR = @AMTAR@
9236 +APPLET_CFLAGS = @APPLET_CFLAGS@
9237 +APPLET_LIBS = @APPLET_LIBS@
9238 AR = @AR@
9239 AUTOCONF = @AUTOCONF@
9240 AUTOHEADER = @AUTOHEADER@
9241 @@ -146,6 +148,8 @@ GMOFILES = @GMOFILES@
9242 GMSGFMT = @GMSGFMT@
9243 GREP = @GREP@
9244 G_CAST_CHECKS = @G_CAST_CHECKS@
9245 +INDICATORDIR = @INDICATORDIR@
9246 +INDICATORICONSDIR = @INDICATORICONSDIR@
9247 INSTALL = @INSTALL@
9248 INSTALL_DATA = @INSTALL_DATA@
9249 INSTALL_PROGRAM = @INSTALL_PROGRAM@
9250 @@ -191,8 +195,6 @@ PACKAGE_URL = @PACKAGE_URL@
9251 PACKAGE_VERSION = @PACKAGE_VERSION@
9252 PATH_SEPARATOR = @PATH_SEPARATOR@
9253 PKG_CONFIG = @PKG_CONFIG@
9254 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9255 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9256 PLUGINS_LIST = @PLUGINS_LIST@
9257 POFILES = @POFILES@
9258 POSUB = @POSUB@
9259 @@ -248,6 +250,7 @@ libdir = @libdir@
9260 libexecdir = @libexecdir@
9261 localedir = @localedir@
9262 localstatedir = @localstatedir@
9263 +lt_ECHO = @lt_ECHO@
9264 mandir = @mandir@
9265 mkdir_p = @mkdir_p@
9266 oldincludedir = @oldincludedir@
9267 --- /dev/null
9268 +++ lxpanel-0.5.6/src/plugins/indicator/Makefile.in
9269 @@ -0,0 +1,579 @@
9270 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
9271 +# @configure_input@
9272 +
9273 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9274 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
9275 +# Inc.
9276 +# This Makefile.in is free software; the Free Software Foundation
9277 +# gives unlimited permission to copy and/or distribute it,
9278 +# with or without modifications, as long as this notice is preserved.
9279 +
9280 +# This program is distributed in the hope that it will be useful,
9281 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
9282 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
9283 +# PARTICULAR PURPOSE.
9284 +
9285 +@SET_MAKE@
9286 +
9287 +VPATH = @srcdir@
9288 +pkgdatadir = $(datadir)/@PACKAGE@
9289 +pkgincludedir = $(includedir)/@PACKAGE@
9290 +pkglibdir = $(libdir)/@PACKAGE@
9291 +pkglibexecdir = $(libexecdir)/@PACKAGE@
9292 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
9293 +install_sh_DATA = $(install_sh) -c -m 644
9294 +install_sh_PROGRAM = $(install_sh) -c
9295 +install_sh_SCRIPT = $(install_sh) -c
9296 +INSTALL_HEADER = $(INSTALL_DATA)
9297 +transform = $(program_transform_name)
9298 +NORMAL_INSTALL = :
9299 +PRE_INSTALL = :
9300 +POST_INSTALL = :
9301 +NORMAL_UNINSTALL = :
9302 +PRE_UNINSTALL = :
9303 +POST_UNINSTALL = :
9304 +build_triplet = @build@
9305 +host_triplet = @host@
9306 +subdir = src/plugins/indicator
9307 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
9308 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9309 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
9310 + $(top_srcdir)/configure.ac
9311 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9312 + $(ACLOCAL_M4)
9313 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9314 +CONFIG_HEADER = $(top_builddir)/config.h
9315 +CONFIG_CLEAN_FILES =
9316 +CONFIG_CLEAN_VPATH_FILES =
9317 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
9318 +am__vpath_adj = case $$p in \
9319 + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
9320 + *) f=$$p;; \
9321 + esac;
9322 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
9323 +am__install_max = 40
9324 +am__nobase_strip_setup = \
9325 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
9326 +am__nobase_strip = \
9327 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
9328 +am__nobase_list = $(am__nobase_strip_setup); \
9329 + for p in $$list; do echo "$$p $$p"; done | \
9330 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
9331 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
9332 + if (++n[$$2] == $(am__install_max)) \
9333 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
9334 + END { for (dir in files) print dir, files[dir] }'
9335 +am__base_list = \
9336 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
9337 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
9338 +am__installdirs = "$(DESTDIR)$(moduledir)"
9339 +LTLIBRARIES = $(module_LTLIBRARIES)
9340 +am__DEPENDENCIES_1 =
9341 +indicator_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
9342 + $(am__DEPENDENCIES_1)
9343 +am_indicator_la_OBJECTS = indicator.lo
9344 +indicator_la_OBJECTS = $(am_indicator_la_OBJECTS)
9345 +indicator_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
9346 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
9347 + $(indicator_la_LDFLAGS) $(LDFLAGS) -o $@
9348 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
9349 +depcomp = $(SHELL) $(top_srcdir)/depcomp
9350 +am__depfiles_maybe = depfiles
9351 +am__mv = mv -f
9352 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
9353 + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9354 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
9355 + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
9356 + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9357 +CCLD = $(CC)
9358 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
9359 + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
9360 + $(LDFLAGS) -o $@
9361 +SOURCES = $(indicator_la_SOURCES)
9362 +DIST_SOURCES = $(indicator_la_SOURCES)
9363 +ETAGS = etags
9364 +CTAGS = ctags
9365 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
9366 +ACLOCAL = @ACLOCAL@
9367 +ALL_LINGUAS = @ALL_LINGUAS@
9368 +ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
9369 +AMTAR = @AMTAR@
9370 +APPLET_CFLAGS = @APPLET_CFLAGS@
9371 +APPLET_LIBS = @APPLET_LIBS@
9372 +AR = @AR@
9373 +AUTOCONF = @AUTOCONF@
9374 +AUTOHEADER = @AUTOHEADER@
9375 +AUTOMAKE = @AUTOMAKE@
9376 +AWK = @AWK@
9377 +CATALOGS = @CATALOGS@
9378 +CATOBJEXT = @CATOBJEXT@
9379 +CC = @CC@
9380 +CCDEPMODE = @CCDEPMODE@
9381 +CFLAGS = @CFLAGS@
9382 +CPP = @CPP@
9383 +CPPFLAGS = @CPPFLAGS@
9384 +CYGPATH_W = @CYGPATH_W@
9385 +DATADIRNAME = @DATADIRNAME@
9386 +DEFS = @DEFS@
9387 +DEPDIR = @DEPDIR@
9388 +DSYMUTIL = @DSYMUTIL@
9389 +DUMPBIN = @DUMPBIN@
9390 +ECHO_C = @ECHO_C@
9391 +ECHO_N = @ECHO_N@
9392 +ECHO_T = @ECHO_T@
9393 +EGREP = @EGREP@
9394 +EXEEXT = @EXEEXT@
9395 +FGREP = @FGREP@
9396 +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9397 +GMOFILES = @GMOFILES@
9398 +GMSGFMT = @GMSGFMT@
9399 +GREP = @GREP@
9400 +G_CAST_CHECKS = @G_CAST_CHECKS@
9401 +INDICATORDIR = @INDICATORDIR@
9402 +INDICATORICONSDIR = @INDICATORICONSDIR@
9403 +INSTALL = @INSTALL@
9404 +INSTALL_DATA = @INSTALL_DATA@
9405 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
9406 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
9407 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
9408 +INSTOBJEXT = @INSTOBJEXT@
9409 +INTLLIBS = @INTLLIBS@
9410 +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
9411 +INTLTOOL_MERGE = @INTLTOOL_MERGE@
9412 +INTLTOOL_PERL = @INTLTOOL_PERL@
9413 +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
9414 +LD = @LD@
9415 +LDFLAGS = @LDFLAGS@
9416 +LIBOBJS = @LIBOBJS@
9417 +LIBS = @LIBS@
9418 +LIBTOOL = @LIBTOOL@
9419 +LIPO = @LIPO@
9420 +LN_S = @LN_S@
9421 +LTLIBOBJS = @LTLIBOBJS@
9422 +LXPANEL_MODULE = @LXPANEL_MODULE@
9423 +MAKEINFO = @MAKEINFO@
9424 +MENU_CACHE_CFLAGS = @MENU_CACHE_CFLAGS@
9425 +MENU_CACHE_LIBS = @MENU_CACHE_LIBS@
9426 +MKDIR_P = @MKDIR_P@
9427 +MKINSTALLDIRS = @MKINSTALLDIRS@
9428 +MSGFMT = @MSGFMT@
9429 +MSGFMT_OPTS = @MSGFMT_OPTS@
9430 +MSGMERGE = @MSGMERGE@
9431 +NM = @NM@
9432 +NMEDIT = @NMEDIT@
9433 +OBJDUMP = @OBJDUMP@
9434 +OBJEXT = @OBJEXT@
9435 +OTOOL = @OTOOL@
9436 +OTOOL64 = @OTOOL64@
9437 +PACKAGE = @PACKAGE@
9438 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
9439 +PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
9440 +PACKAGE_LIBS = @PACKAGE_LIBS@
9441 +PACKAGE_NAME = @PACKAGE_NAME@
9442 +PACKAGE_STRING = @PACKAGE_STRING@
9443 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
9444 +PACKAGE_URL = @PACKAGE_URL@
9445 +PACKAGE_VERSION = @PACKAGE_VERSION@
9446 +PATH_SEPARATOR = @PATH_SEPARATOR@
9447 +PKG_CONFIG = @PKG_CONFIG@
9448 +PLUGINS_LIST = @PLUGINS_LIST@
9449 +POFILES = @POFILES@
9450 +POSUB = @POSUB@
9451 +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9452 +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
9453 +RANLIB = @RANLIB@
9454 +SED = @SED@
9455 +SET_MAKE = @SET_MAKE@
9456 +SHELL = @SHELL@
9457 +STRIP = @STRIP@
9458 +USE_NLS = @USE_NLS@
9459 +VERSION = @VERSION@
9460 +X11_CFLAGS = @X11_CFLAGS@
9461 +X11_LIBS = @X11_LIBS@
9462 +XGETTEXT = @XGETTEXT@
9463 +XMKMF = @XMKMF@
9464 +XMLCATALOG = @XMLCATALOG@
9465 +XML_CATALOG_FILE = @XML_CATALOG_FILE@
9466 +XSLTPROC = @XSLTPROC@
9467 +abs_builddir = @abs_builddir@
9468 +abs_srcdir = @abs_srcdir@
9469 +abs_top_builddir = @abs_top_builddir@
9470 +abs_top_srcdir = @abs_top_srcdir@
9471 +ac_ct_CC = @ac_ct_CC@
9472 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
9473 +am__include = @am__include@
9474 +am__leading_dot = @am__leading_dot@
9475 +am__quote = @am__quote@
9476 +am__tar = @am__tar@
9477 +am__untar = @am__untar@
9478 +bindir = @bindir@
9479 +build = @build@
9480 +build_alias = @build_alias@
9481 +build_cpu = @build_cpu@
9482 +build_os = @build_os@
9483 +build_vendor = @build_vendor@
9484 +builddir = @builddir@
9485 +datadir = @datadir@
9486 +datarootdir = @datarootdir@
9487 +docdir = @docdir@
9488 +dvidir = @dvidir@
9489 +exec_prefix = @exec_prefix@
9490 +host = @host@
9491 +host_alias = @host_alias@
9492 +host_cpu = @host_cpu@
9493 +host_os = @host_os@
9494 +host_vendor = @host_vendor@
9495 +htmldir = @htmldir@
9496 +includedir = @includedir@
9497 +infodir = @infodir@
9498 +install_sh = @install_sh@
9499 +libdir = @libdir@
9500 +libexecdir = @libexecdir@
9501 +localedir = @localedir@
9502 +localstatedir = @localstatedir@
9503 +lt_ECHO = @lt_ECHO@
9504 +mandir = @mandir@
9505 +mkdir_p = @mkdir_p@
9506 +oldincludedir = @oldincludedir@
9507 +pdfdir = @pdfdir@
9508 +prefix = @prefix@
9509 +program_transform_name = @program_transform_name@
9510 +psdir = @psdir@
9511 +sbindir = @sbindir@
9512 +sharedstatedir = @sharedstatedir@
9513 +srcdir = @srcdir@
9514 +sysconfdir = @sysconfdir@
9515 +target_alias = @target_alias@
9516 +top_build_prefix = @top_build_prefix@
9517 +top_builddir = @top_builddir@
9518 +top_srcdir = @top_srcdir@
9519 +INCLUDES = \
9520 + -I. \
9521 + -I$(top_srcdir)/src \
9522 + -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
9523 + -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
9524 + $(PACKAGE_CFLAGS) \
9525 + $(APPLET_CFLAGS) \
9526 + $(G_CAST_CHECKS)
9527 +
9528 +module_LTLIBRARIES = indicator.la
9529 +moduledir = $(libdir)/lxpanel/plugins
9530 +indicator_la_SOURCES = \
9531 + indicator.c
9532 +
9533 +indicator_la_LIBADD = \
9534 + $(PACKAGE_LIBS) \
9535 + $(APPLET_LIBS)
9536 +
9537 +indicator_la_LDFLAGS = \
9538 + -module \
9539 + @LXPANEL_MODULE@
9540 +
9541 +all: all-am
9542 +
9543 +.SUFFIXES:
9544 +.SUFFIXES: .c .lo .o .obj
9545 +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
9546 + @for dep in $?; do \
9547 + case '$(am__configure_deps)' in \
9548 + *$$dep*) \
9549 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
9550 + && { if test -f $@; then exit 0; else break; fi; }; \
9551 + exit 1;; \
9552 + esac; \
9553 + done; \
9554 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/indicator/Makefile'; \
9555 + $(am__cd) $(top_srcdir) && \
9556 + $(AUTOMAKE) --gnu src/plugins/indicator/Makefile
9557 +.PRECIOUS: Makefile
9558 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
9559 + @case '$?' in \
9560 + *config.status*) \
9561 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
9562 + *) \
9563 + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
9564 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
9565 + esac;
9566 +
9567 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
9568 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9569 +
9570 +$(top_srcdir)/configure: $(am__configure_deps)
9571 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9572 +$(ACLOCAL_M4): $(am__aclocal_m4_deps)
9573 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9574 +$(am__aclocal_m4_deps):
9575 +install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
9576 + @$(NORMAL_INSTALL)
9577 + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
9578 + @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
9579 + list2=; for p in $$list; do \
9580 + if test -f $$p; then \
9581 + list2="$$list2 $$p"; \
9582 + else :; fi; \
9583 + done; \
9584 + test -z "$$list2" || { \
9585 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
9586 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
9587 + }
9588 +
9589 +uninstall-moduleLTLIBRARIES:
9590 + @$(NORMAL_UNINSTALL)
9591 + @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
9592 + for p in $$list; do \
9593 + $(am__strip_dir) \
9594 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
9595 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
9596 + done
9597 +
9598 +clean-moduleLTLIBRARIES:
9599 + -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
9600 + @list='$(module_LTLIBRARIES)'; for p in $$list; do \
9601 + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
9602 + test "$$dir" != "$$p" || dir=.; \
9603 + echo "rm -f \"$${dir}/so_locations\""; \
9604 + rm -f "$${dir}/so_locations"; \
9605 + done
9606 +indicator.la: $(indicator_la_OBJECTS) $(indicator_la_DEPENDENCIES)
9607 + $(indicator_la_LINK) -rpath $(moduledir) $(indicator_la_OBJECTS) $(indicator_la_LIBADD) $(LIBS)
9608 +
9609 +mostlyclean-compile:
9610 + -rm -f *.$(OBJEXT)
9611 +
9612 +distclean-compile:
9613 + -rm -f *.tab.c
9614 +
9615 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator.Plo@am__quote@
9616 +
9617 +.c.o:
9618 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
9619 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
9620 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
9621 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
9622 +@am__fastdepCC_FALSE@ $(COMPILE) -c $<
9623 +
9624 +.c.obj:
9625 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
9626 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
9627 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
9628 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
9629 +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
9630 +
9631 +.c.lo:
9632 +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
9633 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
9634 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
9635 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
9636 +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
9637 +
9638 +mostlyclean-libtool:
9639 + -rm -f *.lo
9640 +
9641 +clean-libtool:
9642 + -rm -rf .libs _libs
9643 +
9644 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
9645 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9646 + unique=`for i in $$list; do \
9647 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9648 + done | \
9649 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9650 + END { if (nonempty) { for (i in files) print i; }; }'`; \
9651 + mkid -fID $$unique
9652 +tags: TAGS
9653 +
9654 +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9655 + $(TAGS_FILES) $(LISP)
9656 + set x; \
9657 + here=`pwd`; \
9658 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9659 + unique=`for i in $$list; do \
9660 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9661 + done | \
9662 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9663 + END { if (nonempty) { for (i in files) print i; }; }'`; \
9664 + shift; \
9665 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
9666 + test -n "$$unique" || unique=$$empty_fix; \
9667 + if test $$# -gt 0; then \
9668 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
9669 + "$$@" $$unique; \
9670 + else \
9671 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
9672 + $$unique; \
9673 + fi; \
9674 + fi
9675 +ctags: CTAGS
9676 +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9677 + $(TAGS_FILES) $(LISP)
9678 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9679 + unique=`for i in $$list; do \
9680 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9681 + done | \
9682 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9683 + END { if (nonempty) { for (i in files) print i; }; }'`; \
9684 + test -z "$(CTAGS_ARGS)$$unique" \
9685 + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
9686 + $$unique
9687 +
9688 +GTAGS:
9689 + here=`$(am__cd) $(top_builddir) && pwd` \
9690 + && $(am__cd) $(top_srcdir) \
9691 + && gtags -i $(GTAGS_ARGS) "$$here"
9692 +
9693 +distclean-tags:
9694 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
9695 +
9696 +distdir: $(DISTFILES)
9697 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
9698 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
9699 + list='$(DISTFILES)'; \
9700 + dist_files=`for file in $$list; do echo $$file; done | \
9701 + sed -e "s|^$$srcdirstrip/||;t" \
9702 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
9703 + case $$dist_files in \
9704 + */*) $(MKDIR_P) `echo "$$dist_files" | \
9705 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
9706 + sort -u` ;; \
9707 + esac; \
9708 + for file in $$dist_files; do \
9709 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
9710 + if test -d $$d/$$file; then \
9711 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
9712 + if test -d "$(distdir)/$$file"; then \
9713 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9714 + fi; \
9715 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
9716 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
9717 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9718 + fi; \
9719 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
9720 + else \
9721 + test -f "$(distdir)/$$file" \
9722 + || cp -p $$d/$$file "$(distdir)/$$file" \
9723 + || exit 1; \
9724 + fi; \
9725 + done
9726 +check-am: all-am
9727 +check: check-am
9728 +all-am: Makefile $(LTLIBRARIES)
9729 +installdirs:
9730 + for dir in "$(DESTDIR)$(moduledir)"; do \
9731 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
9732 + done
9733 +install: install-am
9734 +install-exec: install-exec-am
9735 +install-data: install-data-am
9736 +uninstall: uninstall-am
9737 +
9738 +install-am: all-am
9739 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
9740 +
9741 +installcheck: installcheck-am
9742 +install-strip:
9743 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
9744 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
9745 + `test -z '$(STRIP)' || \
9746 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
9747 +mostlyclean-generic:
9748 +
9749 +clean-generic:
9750 +
9751 +distclean-generic:
9752 + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
9753 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
9754 +
9755 +maintainer-clean-generic:
9756 + @echo "This command is intended for maintainers to use"
9757 + @echo "it deletes files that may require special tools to rebuild."
9758 +clean: clean-am
9759 +
9760 +clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
9761 + mostlyclean-am
9762 +
9763 +distclean: distclean-am
9764 + -rm -rf ./$(DEPDIR)
9765 + -rm -f Makefile
9766 +distclean-am: clean-am distclean-compile distclean-generic \
9767 + distclean-tags
9768 +
9769 +dvi: dvi-am
9770 +
9771 +dvi-am:
9772 +
9773 +html: html-am
9774 +
9775 +html-am:
9776 +
9777 +info: info-am
9778 +
9779 +info-am:
9780 +
9781 +install-data-am: install-moduleLTLIBRARIES
9782 +
9783 +install-dvi: install-dvi-am
9784 +
9785 +install-dvi-am:
9786 +
9787 +install-exec-am:
9788 +
9789 +install-html: install-html-am
9790 +
9791 +install-html-am:
9792 +
9793 +install-info: install-info-am
9794 +
9795 +install-info-am:
9796 +
9797 +install-man:
9798 +
9799 +install-pdf: install-pdf-am
9800 +
9801 +install-pdf-am:
9802 +
9803 +install-ps: install-ps-am
9804 +
9805 +install-ps-am:
9806 +
9807 +installcheck-am:
9808 +
9809 +maintainer-clean: maintainer-clean-am
9810 + -rm -rf ./$(DEPDIR)
9811 + -rm -f Makefile
9812 +maintainer-clean-am: distclean-am maintainer-clean-generic
9813 +
9814 +mostlyclean: mostlyclean-am
9815 +
9816 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
9817 + mostlyclean-libtool
9818 +
9819 +pdf: pdf-am
9820 +
9821 +pdf-am:
9822 +
9823 +ps: ps-am
9824 +
9825 +ps-am:
9826 +
9827 +uninstall-am: uninstall-moduleLTLIBRARIES
9828 +
9829 +.MAKE: install-am install-strip
9830 +
9831 +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
9832 + clean-libtool clean-moduleLTLIBRARIES ctags distclean \
9833 + distclean-compile distclean-generic distclean-libtool \
9834 + distclean-tags distdir dvi dvi-am html html-am info info-am \
9835 + install install-am install-data install-data-am install-dvi \
9836 + install-dvi-am install-exec install-exec-am install-html \
9837 + install-html-am install-info install-info-am install-man \
9838 + install-moduleLTLIBRARIES install-pdf install-pdf-am \
9839 + install-ps install-ps-am install-strip installcheck \
9840 + installcheck-am installdirs maintainer-clean \
9841 + maintainer-clean-generic mostlyclean mostlyclean-compile \
9842 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
9843 + tags uninstall uninstall-am uninstall-moduleLTLIBRARIES
9844 +
9845 +
9846 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
9847 +# Otherwise a system limit (for SysV at least) may be exceeded.
9848 +.NOEXPORT:
9849 --- lxpanel-0.5.6.orig/src/plugins/cpu/Makefile.in
9850 +++ lxpanel-0.5.6/src/plugins/cpu/Makefile.in
9851 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
9852 $(top_srcdir)/configure.ac
9853 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9854 $(ACLOCAL_M4)
9855 -mkinstalldirs = $(install_sh) -d
9856 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9857 CONFIG_HEADER = $(top_builddir)/config.h
9858 CONFIG_CLEAN_FILES =
9859 CONFIG_CLEAN_VPATH_FILES =
9860 @@ -97,6 +97,8 @@ ACLOCAL = @ACLOCAL@
9861 ALL_LINGUAS = @ALL_LINGUAS@
9862 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
9863 AMTAR = @AMTAR@
9864 +APPLET_CFLAGS = @APPLET_CFLAGS@
9865 +APPLET_LIBS = @APPLET_LIBS@
9866 AR = @AR@
9867 AUTOCONF = @AUTOCONF@
9868 AUTOHEADER = @AUTOHEADER@
9869 @@ -126,6 +128,8 @@ GMOFILES = @GMOFILES@
9870 GMSGFMT = @GMSGFMT@
9871 GREP = @GREP@
9872 G_CAST_CHECKS = @G_CAST_CHECKS@
9873 +INDICATORDIR = @INDICATORDIR@
9874 +INDICATORICONSDIR = @INDICATORICONSDIR@
9875 INSTALL = @INSTALL@
9876 INSTALL_DATA = @INSTALL_DATA@
9877 INSTALL_PROGRAM = @INSTALL_PROGRAM@
9878 @@ -171,8 +175,6 @@ PACKAGE_URL = @PACKAGE_URL@
9879 PACKAGE_VERSION = @PACKAGE_VERSION@
9880 PATH_SEPARATOR = @PATH_SEPARATOR@
9881 PKG_CONFIG = @PKG_CONFIG@
9882 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9883 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9884 PLUGINS_LIST = @PLUGINS_LIST@
9885 POFILES = @POFILES@
9886 POSUB = @POSUB@
9887 @@ -228,6 +230,7 @@ libdir = @libdir@
9888 libexecdir = @libexecdir@
9889 localedir = @localedir@
9890 localstatedir = @localstatedir@
9891 +lt_ECHO = @lt_ECHO@
9892 mandir = @mandir@
9893 mkdir_p = @mkdir_p@
9894 oldincludedir = @oldincludedir@
9895 --- lxpanel-0.5.6.orig/src/plugins/batt/Makefile.in
9896 +++ lxpanel-0.5.6/src/plugins/batt/Makefile.in
9897 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
9898 $(top_srcdir)/configure.ac
9899 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9900 $(ACLOCAL_M4)
9901 -mkinstalldirs = $(install_sh) -d
9902 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9903 CONFIG_HEADER = $(top_builddir)/config.h
9904 CONFIG_CLEAN_FILES =
9905 CONFIG_CLEAN_VPATH_FILES =
9906 @@ -97,6 +97,8 @@ ACLOCAL = @ACLOCAL@
9907 ALL_LINGUAS = @ALL_LINGUAS@
9908 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
9909 AMTAR = @AMTAR@
9910 +APPLET_CFLAGS = @APPLET_CFLAGS@
9911 +APPLET_LIBS = @APPLET_LIBS@
9912 AR = @AR@
9913 AUTOCONF = @AUTOCONF@
9914 AUTOHEADER = @AUTOHEADER@
9915 @@ -126,6 +128,8 @@ GMOFILES = @GMOFILES@
9916 GMSGFMT = @GMSGFMT@
9917 GREP = @GREP@
9918 G_CAST_CHECKS = @G_CAST_CHECKS@
9919 +INDICATORDIR = @INDICATORDIR@
9920 +INDICATORICONSDIR = @INDICATORICONSDIR@
9921 INSTALL = @INSTALL@
9922 INSTALL_DATA = @INSTALL_DATA@
9923 INSTALL_PROGRAM = @INSTALL_PROGRAM@
9924 @@ -171,8 +175,6 @@ PACKAGE_URL = @PACKAGE_URL@
9925 PACKAGE_VERSION = @PACKAGE_VERSION@
9926 PATH_SEPARATOR = @PATH_SEPARATOR@
9927 PKG_CONFIG = @PKG_CONFIG@
9928 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9929 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9930 PLUGINS_LIST = @PLUGINS_LIST@
9931 POFILES = @POFILES@
9932 POSUB = @POSUB@
9933 @@ -228,6 +230,7 @@ libdir = @libdir@
9934 libexecdir = @libexecdir@
9935 localedir = @localedir@
9936 localstatedir = @localstatedir@
9937 +lt_ECHO = @lt_ECHO@
9938 mandir = @mandir@
9939 mkdir_p = @mkdir_p@
9940 oldincludedir = @oldincludedir@
9941 --- lxpanel-0.5.6.orig/src/plugins/cpufreq/Makefile.in
9942 +++ lxpanel-0.5.6/src/plugins/cpufreq/Makefile.in
9943 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
9944 $(top_srcdir)/configure.ac
9945 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9946 $(ACLOCAL_M4)
9947 -mkinstalldirs = $(install_sh) -d
9948 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9949 CONFIG_HEADER = $(top_builddir)/config.h
9950 CONFIG_CLEAN_FILES =
9951 CONFIG_CLEAN_VPATH_FILES =
9952 @@ -97,6 +97,8 @@ ACLOCAL = @ACLOCAL@
9953 ALL_LINGUAS = @ALL_LINGUAS@
9954 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
9955 AMTAR = @AMTAR@
9956 +APPLET_CFLAGS = @APPLET_CFLAGS@
9957 +APPLET_LIBS = @APPLET_LIBS@
9958 AR = @AR@
9959 AUTOCONF = @AUTOCONF@
9960 AUTOHEADER = @AUTOHEADER@
9961 @@ -126,6 +128,8 @@ GMOFILES = @GMOFILES@
9962 GMSGFMT = @GMSGFMT@
9963 GREP = @GREP@
9964 G_CAST_CHECKS = @G_CAST_CHECKS@
9965 +INDICATORDIR = @INDICATORDIR@
9966 +INDICATORICONSDIR = @INDICATORICONSDIR@
9967 INSTALL = @INSTALL@
9968 INSTALL_DATA = @INSTALL_DATA@
9969 INSTALL_PROGRAM = @INSTALL_PROGRAM@
9970 @@ -171,8 +175,6 @@ PACKAGE_URL = @PACKAGE_URL@
9971 PACKAGE_VERSION = @PACKAGE_VERSION@
9972 PATH_SEPARATOR = @PATH_SEPARATOR@
9973 PKG_CONFIG = @PKG_CONFIG@
9974 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9975 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9976 PLUGINS_LIST = @PLUGINS_LIST@
9977 POFILES = @POFILES@
9978 POSUB = @POSUB@
9979 @@ -228,6 +230,7 @@ libdir = @libdir@
9980 libexecdir = @libexecdir@
9981 localedir = @localedir@
9982 localstatedir = @localstatedir@
9983 +lt_ECHO = @lt_ECHO@
9984 mandir = @mandir@
9985 mkdir_p = @mkdir_p@
9986 oldincludedir = @oldincludedir@
9987 --- lxpanel-0.5.6.orig/src/plugins/deskno/Makefile.in
9988 +++ lxpanel-0.5.6/src/plugins/deskno/Makefile.in
9989 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
9990 $(top_srcdir)/configure.ac
9991 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9992 $(ACLOCAL_M4)
9993 -mkinstalldirs = $(install_sh) -d
9994 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9995 CONFIG_HEADER = $(top_builddir)/config.h
9996 CONFIG_CLEAN_FILES =
9997 CONFIG_CLEAN_VPATH_FILES =
9998 @@ -97,6 +97,8 @@ ACLOCAL = @ACLOCAL@
9999 ALL_LINGUAS = @ALL_LINGUAS@
10000 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10001 AMTAR = @AMTAR@
10002 +APPLET_CFLAGS = @APPLET_CFLAGS@
10003 +APPLET_LIBS = @APPLET_LIBS@
10004 AR = @AR@
10005 AUTOCONF = @AUTOCONF@
10006 AUTOHEADER = @AUTOHEADER@
10007 @@ -126,6 +128,8 @@ GMOFILES = @GMOFILES@
10008 GMSGFMT = @GMSGFMT@
10009 GREP = @GREP@
10010 G_CAST_CHECKS = @G_CAST_CHECKS@
10011 +INDICATORDIR = @INDICATORDIR@
10012 +INDICATORICONSDIR = @INDICATORICONSDIR@
10013 INSTALL = @INSTALL@
10014 INSTALL_DATA = @INSTALL_DATA@
10015 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10016 @@ -171,8 +175,6 @@ PACKAGE_URL = @PACKAGE_URL@
10017 PACKAGE_VERSION = @PACKAGE_VERSION@
10018 PATH_SEPARATOR = @PATH_SEPARATOR@
10019 PKG_CONFIG = @PKG_CONFIG@
10020 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10021 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10022 PLUGINS_LIST = @PLUGINS_LIST@
10023 POFILES = @POFILES@
10024 POSUB = @POSUB@
10025 @@ -228,6 +230,7 @@ libdir = @libdir@
10026 libexecdir = @libexecdir@
10027 localedir = @localedir@
10028 localstatedir = @localstatedir@
10029 +lt_ECHO = @lt_ECHO@
10030 mandir = @mandir@
10031 mkdir_p = @mkdir_p@
10032 oldincludedir = @oldincludedir@
10033 --- lxpanel-0.5.6.orig/src/plugins/thermal/Makefile.in
10034 +++ lxpanel-0.5.6/src/plugins/thermal/Makefile.in
10035 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
10036 $(top_srcdir)/configure.ac
10037 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10038 $(ACLOCAL_M4)
10039 -mkinstalldirs = $(install_sh) -d
10040 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10041 CONFIG_HEADER = $(top_builddir)/config.h
10042 CONFIG_CLEAN_FILES =
10043 CONFIG_CLEAN_VPATH_FILES =
10044 @@ -97,6 +97,8 @@ ACLOCAL = @ACLOCAL@
10045 ALL_LINGUAS = @ALL_LINGUAS@
10046 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10047 AMTAR = @AMTAR@
10048 +APPLET_CFLAGS = @APPLET_CFLAGS@
10049 +APPLET_LIBS = @APPLET_LIBS@
10050 AR = @AR@
10051 AUTOCONF = @AUTOCONF@
10052 AUTOHEADER = @AUTOHEADER@
10053 @@ -126,6 +128,8 @@ GMOFILES = @GMOFILES@
10054 GMSGFMT = @GMSGFMT@
10055 GREP = @GREP@
10056 G_CAST_CHECKS = @G_CAST_CHECKS@
10057 +INDICATORDIR = @INDICATORDIR@
10058 +INDICATORICONSDIR = @INDICATORICONSDIR@
10059 INSTALL = @INSTALL@
10060 INSTALL_DATA = @INSTALL_DATA@
10061 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10062 @@ -171,8 +175,6 @@ PACKAGE_URL = @PACKAGE_URL@
10063 PACKAGE_VERSION = @PACKAGE_VERSION@
10064 PATH_SEPARATOR = @PATH_SEPARATOR@
10065 PKG_CONFIG = @PKG_CONFIG@
10066 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10067 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10068 PLUGINS_LIST = @PLUGINS_LIST@
10069 POFILES = @POFILES@
10070 POSUB = @POSUB@
10071 @@ -228,6 +230,7 @@ libdir = @libdir@
10072 libexecdir = @libexecdir@
10073 localedir = @localedir@
10074 localstatedir = @localstatedir@
10075 +lt_ECHO = @lt_ECHO@
10076 mandir = @mandir@
10077 mkdir_p = @mkdir_p@
10078 oldincludedir = @oldincludedir@
10079 --- lxpanel-0.5.6.orig/src/plugins/volume/Makefile.in
10080 +++ lxpanel-0.5.6/src/plugins/volume/Makefile.in
10081 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
10082 $(top_srcdir)/configure.ac
10083 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10084 $(ACLOCAL_M4)
10085 -mkinstalldirs = $(install_sh) -d
10086 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10087 CONFIG_HEADER = $(top_builddir)/config.h
10088 CONFIG_CLEAN_FILES =
10089 CONFIG_CLEAN_VPATH_FILES =
10090 @@ -102,6 +102,8 @@ ACLOCAL = @ACLOCAL@
10091 ALL_LINGUAS = @ALL_LINGUAS@
10092 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10093 AMTAR = @AMTAR@
10094 +APPLET_CFLAGS = @APPLET_CFLAGS@
10095 +APPLET_LIBS = @APPLET_LIBS@
10096 AR = @AR@
10097 AUTOCONF = @AUTOCONF@
10098 AUTOHEADER = @AUTOHEADER@
10099 @@ -131,6 +133,8 @@ GMOFILES = @GMOFILES@
10100 GMSGFMT = @GMSGFMT@
10101 GREP = @GREP@
10102 G_CAST_CHECKS = @G_CAST_CHECKS@
10103 +INDICATORDIR = @INDICATORDIR@
10104 +INDICATORICONSDIR = @INDICATORICONSDIR@
10105 INSTALL = @INSTALL@
10106 INSTALL_DATA = @INSTALL_DATA@
10107 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10108 @@ -176,8 +180,6 @@ PACKAGE_URL = @PACKAGE_URL@
10109 PACKAGE_VERSION = @PACKAGE_VERSION@
10110 PATH_SEPARATOR = @PATH_SEPARATOR@
10111 PKG_CONFIG = @PKG_CONFIG@
10112 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10113 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10114 PLUGINS_LIST = @PLUGINS_LIST@
10115 POFILES = @POFILES@
10116 POSUB = @POSUB@
10117 @@ -233,6 +235,7 @@ libdir = @libdir@
10118 libexecdir = @libexecdir@
10119 localedir = @localedir@
10120 localstatedir = @localstatedir@
10121 +lt_ECHO = @lt_ECHO@
10122 mandir = @mandir@
10123 mkdir_p = @mkdir_p@
10124 oldincludedir = @oldincludedir@
10125 --- lxpanel-0.5.6.orig/src/plugins/xkb/Makefile.in
10126 +++ lxpanel-0.5.6/src/plugins/xkb/Makefile.in
10127 @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
10128 $(top_srcdir)/configure.ac
10129 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10130 $(ACLOCAL_M4)
10131 -mkinstalldirs = $(install_sh) -d
10132 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10133 CONFIG_HEADER = $(top_builddir)/config.h
10134 CONFIG_CLEAN_FILES =
10135 CONFIG_CLEAN_VPATH_FILES =
10136 @@ -99,6 +99,8 @@ ACLOCAL = @ACLOCAL@
10137 ALL_LINGUAS = @ALL_LINGUAS@
10138 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10139 AMTAR = @AMTAR@
10140 +APPLET_CFLAGS = @APPLET_CFLAGS@
10141 +APPLET_LIBS = @APPLET_LIBS@
10142 AR = @AR@
10143 AUTOCONF = @AUTOCONF@
10144 AUTOHEADER = @AUTOHEADER@
10145 @@ -128,6 +130,8 @@ GMOFILES = @GMOFILES@
10146 GMSGFMT = @GMSGFMT@
10147 GREP = @GREP@
10148 G_CAST_CHECKS = @G_CAST_CHECKS@
10149 +INDICATORDIR = @INDICATORDIR@
10150 +INDICATORICONSDIR = @INDICATORICONSDIR@
10151 INSTALL = @INSTALL@
10152 INSTALL_DATA = @INSTALL_DATA@
10153 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10154 @@ -173,8 +177,6 @@ PACKAGE_URL = @PACKAGE_URL@
10155 PACKAGE_VERSION = @PACKAGE_VERSION@
10156 PATH_SEPARATOR = @PATH_SEPARATOR@
10157 PKG_CONFIG = @PKG_CONFIG@
10158 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10159 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10160 PLUGINS_LIST = @PLUGINS_LIST@
10161 POFILES = @POFILES@
10162 POSUB = @POSUB@
10163 @@ -230,6 +232,7 @@ libdir = @libdir@
10164 libexecdir = @libexecdir@
10165 localedir = @localedir@
10166 localstatedir = @localstatedir@
10167 +lt_ECHO = @lt_ECHO@
10168 mandir = @mandir@
10169 mkdir_p = @mkdir_p@
10170 oldincludedir = @oldincludedir@
10171 --- lxpanel-0.5.6.orig/src/plugins/kbled/Makefile.in
10172 +++ lxpanel-0.5.6/src/plugins/kbled/Makefile.in
10173 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
10174 $(top_srcdir)/configure.ac
10175 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10176 $(ACLOCAL_M4)
10177 -mkinstalldirs = $(install_sh) -d
10178 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10179 CONFIG_HEADER = $(top_builddir)/config.h
10180 CONFIG_CLEAN_FILES =
10181 CONFIG_CLEAN_VPATH_FILES =
10182 @@ -97,6 +97,8 @@ ACLOCAL = @ACLOCAL@
10183 ALL_LINGUAS = @ALL_LINGUAS@
10184 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10185 AMTAR = @AMTAR@
10186 +APPLET_CFLAGS = @APPLET_CFLAGS@
10187 +APPLET_LIBS = @APPLET_LIBS@
10188 AR = @AR@
10189 AUTOCONF = @AUTOCONF@
10190 AUTOHEADER = @AUTOHEADER@
10191 @@ -126,6 +128,8 @@ GMOFILES = @GMOFILES@
10192 GMSGFMT = @GMSGFMT@
10193 GREP = @GREP@
10194 G_CAST_CHECKS = @G_CAST_CHECKS@
10195 +INDICATORDIR = @INDICATORDIR@
10196 +INDICATORICONSDIR = @INDICATORICONSDIR@
10197 INSTALL = @INSTALL@
10198 INSTALL_DATA = @INSTALL_DATA@
10199 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10200 @@ -171,8 +175,6 @@ PACKAGE_URL = @PACKAGE_URL@
10201 PACKAGE_VERSION = @PACKAGE_VERSION@
10202 PATH_SEPARATOR = @PATH_SEPARATOR@
10203 PKG_CONFIG = @PKG_CONFIG@
10204 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10205 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10206 PLUGINS_LIST = @PLUGINS_LIST@
10207 POFILES = @POFILES@
10208 POSUB = @POSUB@
10209 @@ -228,6 +230,7 @@ libdir = @libdir@
10210 libexecdir = @libexecdir@
10211 localedir = @localedir@
10212 localstatedir = @localstatedir@
10213 +lt_ECHO = @lt_ECHO@
10214 mandir = @mandir@
10215 mkdir_p = @mkdir_p@
10216 oldincludedir = @oldincludedir@
10217 --- lxpanel-0.5.6.orig/src/plugins/volumealsa/Makefile.in
10218 +++ lxpanel-0.5.6/src/plugins/volumealsa/Makefile.in
10219 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
10220 $(top_srcdir)/configure.ac
10221 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10222 $(ACLOCAL_M4)
10223 -mkinstalldirs = $(install_sh) -d
10224 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10225 CONFIG_HEADER = $(top_builddir)/config.h
10226 CONFIG_CLEAN_FILES =
10227 CONFIG_CLEAN_VPATH_FILES =
10228 @@ -100,6 +100,8 @@ ACLOCAL = @ACLOCAL@
10229 ALL_LINGUAS = @ALL_LINGUAS@
10230 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10231 AMTAR = @AMTAR@
10232 +APPLET_CFLAGS = @APPLET_CFLAGS@
10233 +APPLET_LIBS = @APPLET_LIBS@
10234 AR = @AR@
10235 AUTOCONF = @AUTOCONF@
10236 AUTOHEADER = @AUTOHEADER@
10237 @@ -129,6 +131,8 @@ GMOFILES = @GMOFILES@
10238 GMSGFMT = @GMSGFMT@
10239 GREP = @GREP@
10240 G_CAST_CHECKS = @G_CAST_CHECKS@
10241 +INDICATORDIR = @INDICATORDIR@
10242 +INDICATORICONSDIR = @INDICATORICONSDIR@
10243 INSTALL = @INSTALL@
10244 INSTALL_DATA = @INSTALL_DATA@
10245 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10246 @@ -174,8 +178,6 @@ PACKAGE_URL = @PACKAGE_URL@
10247 PACKAGE_VERSION = @PACKAGE_VERSION@
10248 PATH_SEPARATOR = @PATH_SEPARATOR@
10249 PKG_CONFIG = @PKG_CONFIG@
10250 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10251 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10252 PLUGINS_LIST = @PLUGINS_LIST@
10253 POFILES = @POFILES@
10254 POSUB = @POSUB@
10255 @@ -231,6 +233,7 @@ libdir = @libdir@
10256 libexecdir = @libexecdir@
10257 localedir = @localedir@
10258 localstatedir = @localstatedir@
10259 +lt_ECHO = @lt_ECHO@
10260 mandir = @mandir@
10261 mkdir_p = @mkdir_p@
10262 oldincludedir = @oldincludedir@
10263 --- lxpanel-0.5.6.orig/src/plugins/netstatus/Makefile.in
10264 +++ lxpanel-0.5.6/src/plugins/netstatus/Makefile.in
10265 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
10266 $(top_srcdir)/configure.ac
10267 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10268 $(ACLOCAL_M4)
10269 -mkinstalldirs = $(install_sh) -d
10270 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10271 CONFIG_HEADER = $(top_builddir)/config.h
10272 CONFIG_CLEAN_FILES =
10273 CONFIG_CLEAN_VPATH_FILES =
10274 @@ -99,6 +99,8 @@ ACLOCAL = @ACLOCAL@
10275 ALL_LINGUAS = @ALL_LINGUAS@
10276 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10277 AMTAR = @AMTAR@
10278 +APPLET_CFLAGS = @APPLET_CFLAGS@
10279 +APPLET_LIBS = @APPLET_LIBS@
10280 AR = @AR@
10281 AUTOCONF = @AUTOCONF@
10282 AUTOHEADER = @AUTOHEADER@
10283 @@ -128,6 +130,8 @@ GMOFILES = @GMOFILES@
10284 GMSGFMT = @GMSGFMT@
10285 GREP = @GREP@
10286 G_CAST_CHECKS = @G_CAST_CHECKS@
10287 +INDICATORDIR = @INDICATORDIR@
10288 +INDICATORICONSDIR = @INDICATORICONSDIR@
10289 INSTALL = @INSTALL@
10290 INSTALL_DATA = @INSTALL_DATA@
10291 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10292 @@ -173,8 +177,6 @@ PACKAGE_URL = @PACKAGE_URL@
10293 PACKAGE_VERSION = @PACKAGE_VERSION@
10294 PATH_SEPARATOR = @PATH_SEPARATOR@
10295 PKG_CONFIG = @PKG_CONFIG@
10296 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10297 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10298 PLUGINS_LIST = @PLUGINS_LIST@
10299 POFILES = @POFILES@
10300 POSUB = @POSUB@
10301 @@ -230,6 +232,7 @@ libdir = @libdir@
10302 libexecdir = @libexecdir@
10303 localedir = @localedir@
10304 localstatedir = @localstatedir@
10305 +lt_ECHO = @lt_ECHO@
10306 mandir = @mandir@
10307 mkdir_p = @mkdir_p@
10308 oldincludedir = @oldincludedir@
10309 --- /dev/null
10310 +++ lxpanel-0.5.6/po/quot.sed
10311 @@ -0,0 +1,6 @@
10312 +s/"\([^"]*\)"/“\1”/g
10313 +s/`\([^`']*\)'/‘\1’/g
10314 +s/ '\([^`']*\)' / ‘\1’ /g
10315 +s/ '\([^`']*\)'$/ ‘\1’/g
10316 +s/^'\([^`']*\)' /‘\1’ /g
10317 +s/“”/""/g
10318 --- /dev/null
10319 +++ lxpanel-0.5.6/po/Makevars.template
10320 @@ -0,0 +1,41 @@
10321 +# Makefile variables for PO directory in any package using GNU gettext.
10322 +
10323 +# Usually the message domain is the same as the package name.
10324 +DOMAIN = $(PACKAGE)
10325 +
10326 +# These two variables depend on the location of this directory.
10327 +subdir = po
10328 +top_builddir = ..
10329 +
10330 +# These options get passed to xgettext.
10331 +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
10332 +
10333 +# This is the copyright holder that gets inserted into the header of the
10334 +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
10335 +# package. (Note that the msgstr strings, extracted from the package's
10336 +# sources, belong to the copyright holder of the package.) Translators are
10337 +# expected to transfer the copyright for their translations to this person
10338 +# or entity, or to disclaim their copyright. The empty string stands for
10339 +# the public domain; in this case the translators are expected to disclaim
10340 +# their copyright.
10341 +COPYRIGHT_HOLDER = Free Software Foundation, Inc.
10342 +
10343 +# This is the email address or URL to which the translators shall report
10344 +# bugs in the untranslated strings:
10345 +# - Strings which are not entire sentences, see the maintainer guidelines
10346 +# in the GNU gettext documentation, section 'Preparing Strings'.
10347 +# - Strings which use unclear terms or require additional context to be
10348 +# understood.
10349 +# - Strings which make invalid assumptions about notation of date, time or
10350 +# money.
10351 +# - Pluralisation problems.
10352 +# - Incorrect English spelling.
10353 +# - Incorrect formatting.
10354 +# It can be your email address, or a mailing list address where translators
10355 +# can write to without being subscribed, or the URL of a web page through
10356 +# which the translators can contact you.
10357 +MSGID_BUGS_ADDRESS =
10358 +
10359 +# This is the list of locale categories, beyond LC_MESSAGES, for which the
10360 +# message catalogs shall be used. It is usually empty.
10361 +EXTRA_LOCALE_CATEGORIES =
10362 --- lxpanel-0.5.6.orig/po/Makefile.in.in
10363 +++ lxpanel-0.5.6/po/Makefile.in.in
10364 @@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
10366 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
10368 -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
10369 +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
10371 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
10373 @@ -129,7 +129,7 @@ install-data-yes: all
10374 done
10376 # Empty stubs to satisfy archaic automake needs
10377 -dvi info tags TAGS ID:
10378 +dvi info ctags tags CTAGS TAGS ID:
10380 # Define this as empty until I found a useful application.
10381 install-exec installcheck:
10382 --- /dev/null
10383 +++ lxpanel-0.5.6/po/en@quot.header
10384 @@ -0,0 +1,22 @@
10385 +# All this catalog "translates" are quotation characters.
10386 +# The msgids must be ASCII and therefore cannot contain real quotation
10387 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
10388 +# and double quote (0x22). These substitutes look strange; see
10389 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
10390 +#
10391 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
10392 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
10393 +# It also translates pairs of apostrophe (0x27) to
10394 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
10395 +# and pairs of quotation mark (0x22) to
10396 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
10397 +#
10398 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
10399 +# When output to an ISO-8859-1 terminal, the single quotation marks are
10400 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
10401 +# grave/acute accent (by libiconv), and the double quotation marks are
10402 +# transliterated to 0x22.
10403 +# When output to an ASCII terminal, the single quotation marks are
10404 +# transliterated to apostrophes, and the double quotation marks are
10405 +# transliterated to 0x22.
10406 +#
10407 --- /dev/null
10408 +++ lxpanel-0.5.6/po/en@boldquot.header
10409 @@ -0,0 +1,25 @@
10410 +# All this catalog "translates" are quotation characters.
10411 +# The msgids must be ASCII and therefore cannot contain real quotation
10412 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
10413 +# and double quote (0x22). These substitutes look strange; see
10414 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
10415 +#
10416 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
10417 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
10418 +# It also translates pairs of apostrophe (0x27) to
10419 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
10420 +# and pairs of quotation mark (0x22) to
10421 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
10422 +#
10423 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
10424 +# When output to an ISO-8859-1 terminal, the single quotation marks are
10425 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
10426 +# grave/acute accent (by libiconv), and the double quotation marks are
10427 +# transliterated to 0x22.
10428 +# When output to an ASCII terminal, the single quotation marks are
10429 +# transliterated to apostrophes, and the double quotation marks are
10430 +# transliterated to 0x22.
10431 +#
10432 +# This catalog furthermore displays the text between the quotation marks in
10433 +# bold face, assuming the VT100/XTerm escape sequences.
10434 +#
10435 --- /dev/null
10436 +++ lxpanel-0.5.6/po/boldquot.sed
10437 @@ -0,0 +1,10 @@
10438 +s/"\([^"]*\)"/“\1”/g
10439 +s/`\([^`']*\)'/‘\1’/g
10440 +s/ '\([^`']*\)' / ‘\1’ /g
10441 +s/ '\([^`']*\)'$/ ‘\1’/g
10442 +s/^'\([^`']*\)' /‘\1’ /g
10443 +s/“”/""/g
10444 +s/“/“\e[1m/g
10445 +s/”/\e[0m”/g
10446 +s/‘/‘\e[1m/g
10447 +s/’/\e[0m’/g
10448 --- /dev/null
10449 +++ lxpanel-0.5.6/po/Rules-quot
10450 @@ -0,0 +1,47 @@
10451 +# Special Makefile rules for English message catalogs with quotation marks.
10452 +
10453 +DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
10454 +
10455 +.SUFFIXES: .insert-header .po-update-en
10456 +
10457 +en@quot.po-create:
10458 + $(MAKE) en@quot.po-update
10459 +en@boldquot.po-create:
10460 + $(MAKE) en@boldquot.po-update
10461 +
10462 +en@quot.po-update: en@quot.po-update-en
10463 +en@boldquot.po-update: en@boldquot.po-update-en
10464 +
10465 +.insert-header.po-update-en:
10466 + @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
10467 + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
10468 + tmpdir=`pwd`; \
10469 + echo "$$lang:"; \
10470 + ll=`echo $$lang | sed -e 's/@.*//'`; \
10471 + LC_ALL=C; export LC_ALL; \
10472 + cd $(srcdir); \
10473 + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
10474 + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
10475 + rm -f $$tmpdir/$$lang.new.po; \
10476 + else \
10477 + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
10478 + :; \
10479 + else \
10480 + echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
10481 + exit 1; \
10482 + fi; \
10483 + fi; \
10484 + else \
10485 + echo "creation of $$lang.po failed!" 1>&2; \
10486 + rm -f $$tmpdir/$$lang.new.po; \
10487 + fi
10488 +
10489 +en@quot.insert-header: insert-header.sin
10490 + sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
10491 +
10492 +en@boldquot.insert-header: insert-header.sin
10493 + sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
10494 +
10495 +mostlyclean: mostlyclean-quot
10496 +mostlyclean-quot:
10497 + rm -f *.insert-header
10498 --- /dev/null
10499 +++ lxpanel-0.5.6/po/insert-header.sin
10500 @@ -0,0 +1,23 @@
10501 +# Sed script that inserts the file called HEADER before the header entry.
10502 +#
10503 +# At each occurrence of a line starting with "msgid ", we execute the following
10504 +# commands. At the first occurrence, insert the file. At the following
10505 +# occurrences, do nothing. The distinction between the first and the following
10506 +# occurrences is achieved by looking at the hold space.
10507 +/^msgid /{
10508 +x
10509 +# Test if the hold space is empty.
10510 +s/m/m/
10511 +ta
10512 +# Yes it was empty. First occurrence. Read the file.
10513 +r HEADER
10514 +# Output the file's contents by reading the next line. But don't lose the
10515 +# current line while doing this.
10516 +g
10517 +N
10518 +bb
10519 +:a
10520 +# The hold space was nonempty. Following occurrences. Do nothing.
10521 +x
10522 +:b
10523 +}
10524 --- /dev/null
10525 +++ lxpanel-0.5.6/po/remove-potcdate.sin
10526 @@ -0,0 +1,19 @@
10527 +# Sed script that remove the POT-Creation-Date line in the header entry
10528 +# from a POT file.
10529 +#
10530 +# The distinction between the first and the following occurrences of the
10531 +# pattern is achieved by looking at the hold space.
10532 +/^"POT-Creation-Date: .*"$/{
10533 +x
10534 +# Test if the hold space is empty.
10535 +s/P/P/
10536 +ta
10537 +# Yes it was empty. First occurrence. Remove the line.
10538 +g
10539 +d
10540 +bb
10541 +:a
10542 +# The hold space was nonempty. Following occurrences. Do nothing.
10543 +x
10544 +:b
10545 +}
10546 --- lxpanel-0.5.6.orig/man/Makefile.in
10547 +++ lxpanel-0.5.6/man/Makefile.in
10548 @@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
10549 $(top_srcdir)/configure.ac
10550 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10551 $(ACLOCAL_M4)
10552 -mkinstalldirs = $(install_sh) -d
10553 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10554 CONFIG_HEADER = $(top_builddir)/config.h
10555 CONFIG_CLEAN_FILES =
10556 CONFIG_CLEAN_VPATH_FILES =
10557 @@ -76,6 +76,8 @@ ACLOCAL = @ACLOCAL@
10558 ALL_LINGUAS = @ALL_LINGUAS@
10559 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
10560 AMTAR = @AMTAR@
10561 +APPLET_CFLAGS = @APPLET_CFLAGS@
10562 +APPLET_LIBS = @APPLET_LIBS@
10563 AR = @AR@
10564 AUTOCONF = @AUTOCONF@
10565 AUTOHEADER = @AUTOHEADER@
10566 @@ -105,6 +107,8 @@ GMOFILES = @GMOFILES@
10567 GMSGFMT = @GMSGFMT@
10568 GREP = @GREP@
10569 G_CAST_CHECKS = @G_CAST_CHECKS@
10570 +INDICATORDIR = @INDICATORDIR@
10571 +INDICATORICONSDIR = @INDICATORICONSDIR@
10572 INSTALL = @INSTALL@
10573 INSTALL_DATA = @INSTALL_DATA@
10574 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10575 @@ -150,8 +154,6 @@ PACKAGE_URL = @PACKAGE_URL@
10576 PACKAGE_VERSION = @PACKAGE_VERSION@
10577 PATH_SEPARATOR = @PATH_SEPARATOR@
10578 PKG_CONFIG = @PKG_CONFIG@
10579 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10580 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10581 PLUGINS_LIST = @PLUGINS_LIST@
10582 POFILES = @POFILES@
10583 POSUB = @POSUB@
10584 @@ -207,6 +209,7 @@ libdir = @libdir@
10585 libexecdir = @libexecdir@
10586 localedir = @localedir@
10587 localstatedir = @localstatedir@
10588 +lt_ECHO = @lt_ECHO@
10589 mandir = @mandir@
10590 mkdir_p = @mkdir_p@
10591 oldincludedir = @oldincludedir@
10592 --- /dev/null
10593 +++ lxpanel-0.5.6/m4/codeset.m4
10594 @@ -0,0 +1,23 @@
10595 +# codeset.m4 serial AM1 (gettext-0.10.40)
10596 +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
10597 +dnl This file is free software, distributed under the terms of the GNU
10598 +dnl General Public License. As a special exception to the GNU General
10599 +dnl Public License, this file may be distributed as part of a program
10600 +dnl that contains a configuration script generated by Autoconf, under
10601 +dnl the same distribution terms as the rest of that program.
10602 +
10603 +dnl From Bruno Haible.
10604 +
10605 +AC_DEFUN([AM_LANGINFO_CODESET],
10606 +[
10607 + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
10608 + [AC_TRY_LINK([#include <langinfo.h>],
10609 + [char* cs = nl_langinfo(CODESET);],
10610 + am_cv_langinfo_codeset=yes,
10611 + am_cv_langinfo_codeset=no)
10612 + ])
10613 + if test $am_cv_langinfo_codeset = yes; then
10614 + AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
10615 + [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
10616 + fi
10617 +])
10618 --- /dev/null
10619 +++ lxpanel-0.5.6/m4/inttypes_h.m4
10620 @@ -0,0 +1,28 @@
10621 +# inttypes_h.m4 serial 5 (gettext-0.12)
10622 +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
10623 +dnl This file is free software, distributed under the terms of the GNU
10624 +dnl General Public License. As a special exception to the GNU General
10625 +dnl Public License, this file may be distributed as part of a program
10626 +dnl that contains a configuration script generated by Autoconf, under
10627 +dnl the same distribution terms as the rest of that program.
10628 +
10629 +dnl From Paul Eggert.
10630 +
10631 +# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
10632 +# doesn't clash with <sys/types.h>, and declares uintmax_t.
10633 +
10634 +AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
10635 +[
10636 + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
10637 + [AC_TRY_COMPILE(
10638 + [#include <sys/types.h>
10639 +#include <inttypes.h>],
10640 + [uintmax_t i = (uintmax_t) -1;],
10641 + jm_ac_cv_header_inttypes_h=yes,
10642 + jm_ac_cv_header_inttypes_h=no)])
10643 + if test $jm_ac_cv_header_inttypes_h = yes; then
10644 + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
10645 + [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
10646 + and declares uintmax_t. ])
10647 + fi
10648 +])
10649 --- /dev/null
10650 +++ lxpanel-0.5.6/m4/xsize.m4
10651 @@ -0,0 +1,14 @@
10652 +# xsize.m4 serial 2
10653 +dnl Copyright (C) 2003 Free Software Foundation, Inc.
10654 +dnl This file is free software, distributed under the terms of the GNU
10655 +dnl General Public License. As a special exception to the GNU General
10656 +dnl Public License, this file may be distributed as part of a program
10657 +dnl that contains a configuration script generated by Autoconf, under
10658 +dnl the same distribution terms as the rest of that program.
10659 +
10660 +AC_DEFUN([gl_XSIZE],
10661 +[
10662 + dnl Prerequisites of lib/xsize.h.
10663 + AC_REQUIRE([gl_SIZE_MAX])
10664 + AC_CHECK_HEADERS(stdint.h)
10665 +])
10666 --- /dev/null
10667 +++ lxpanel-0.5.6/m4/gettext.m4
10668 @@ -0,0 +1,487 @@
10669 +# gettext.m4 serial 28 (gettext-0.13)
10670 +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
10671 +dnl This file is free software, distributed under the terms of the GNU
10672 +dnl General Public License. As a special exception to the GNU General
10673 +dnl Public License, this file may be distributed as part of a program
10674 +dnl that contains a configuration script generated by Autoconf, under
10675 +dnl the same distribution terms as the rest of that program.
10676 +dnl
10677 +dnl This file can can be used in projects which are not available under
10678 +dnl the GNU General Public License or the GNU Library General Public
10679 +dnl License but which still want to provide support for the GNU gettext
10680 +dnl functionality.
10681 +dnl Please note that the actual code of the GNU gettext library is covered
10682 +dnl by the GNU Library General Public License, and the rest of the GNU
10683 +dnl gettext package package is covered by the GNU General Public License.
10684 +dnl They are *not* in the public domain.
10685 +
10686 +dnl Authors:
10687 +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
10688 +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
10689 +
10690 +dnl Macro to add for using GNU gettext.
10691 +
10692 +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
10693 +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
10694 +dnl default (if it is not specified or empty) is 'no-libtool'.
10695 +dnl INTLSYMBOL should be 'external' for packages with no intl directory,
10696 +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
10697 +dnl If INTLSYMBOL is 'use-libtool', then a libtool library
10698 +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
10699 +dnl depending on --{enable,disable}-{shared,static} and on the presence of
10700 +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
10701 +dnl $(top_builddir)/intl/libintl.a will be created.
10702 +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
10703 +dnl implementations (in libc or libintl) without the ngettext() function
10704 +dnl will be ignored. If NEEDSYMBOL is specified and is
10705 +dnl 'need-formatstring-macros', then GNU gettext implementations that don't
10706 +dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
10707 +dnl INTLDIR is used to find the intl libraries. If empty,
10708 +dnl the value `$(top_builddir)/intl/' is used.
10709 +dnl
10710 +dnl The result of the configuration is one of three cases:
10711 +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
10712 +dnl and used.
10713 +dnl Catalog format: GNU --> install in $(datadir)
10714 +dnl Catalog extension: .mo after installation, .gmo in source tree
10715 +dnl 2) GNU gettext has been found in the system's C library.
10716 +dnl Catalog format: GNU --> install in $(datadir)
10717 +dnl Catalog extension: .mo after installation, .gmo in source tree
10718 +dnl 3) No internationalization, always use English msgid.
10719 +dnl Catalog format: none
10720 +dnl Catalog extension: none
10721 +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
10722 +dnl The use of .gmo is historical (it was needed to avoid overwriting the
10723 +dnl GNU format catalogs when building on a platform with an X/Open gettext),
10724 +dnl but we keep it in order not to force irrelevant filename changes on the
10725 +dnl maintainers.
10726 +dnl
10727 +AC_DEFUN([AM_GNU_GETTEXT],
10728 +[
10729 + dnl Argument checking.
10730 + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
10731 + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
10732 +])])])])])
10733 + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
10734 + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
10735 +])])])])
10736 + define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
10737 + define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
10738 +
10739 + AC_REQUIRE([AM_PO_SUBDIRS])dnl
10740 + ifelse(gt_included_intl, yes, [
10741 + AC_REQUIRE([AM_INTL_SUBDIR])dnl
10742 + ])
10743 +
10744 + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
10745 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
10746 + AC_REQUIRE([AC_LIB_RPATH])
10747 +
10748 + dnl Sometimes libintl requires libiconv, so first search for libiconv.
10749 + dnl Ideally we would do this search only after the
10750 + dnl if test "$USE_NLS" = "yes"; then
10751 + dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
10752 + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
10753 + dnl the configure script would need to contain the same shell code
10754 + dnl again, outside any 'if'. There are two solutions:
10755 + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
10756 + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
10757 + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
10758 + dnl documented, we avoid it.
10759 + ifelse(gt_included_intl, yes, , [
10760 + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
10761 + ])
10762 +
10763 + dnl Set USE_NLS.
10764 + AM_NLS
10765 +
10766 + ifelse(gt_included_intl, yes, [
10767 + BUILD_INCLUDED_LIBINTL=no
10768 + USE_INCLUDED_LIBINTL=no
10769 + ])
10770 + LIBINTL=
10771 + LTLIBINTL=
10772 + POSUB=
10773 +
10774 + dnl If we use NLS figure out what method
10775 + if test "$USE_NLS" = "yes"; then
10776 + gt_use_preinstalled_gnugettext=no
10777 + ifelse(gt_included_intl, yes, [
10778 + AC_MSG_CHECKING([whether included gettext is requested])
10779 + AC_ARG_WITH(included-gettext,
10780 + [ --with-included-gettext use the GNU gettext library included here],
10781 + nls_cv_force_use_gnu_gettext=$withval,
10782 + nls_cv_force_use_gnu_gettext=no)
10783 + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
10784 +
10785 + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
10786 + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
10787 + ])
10788 + dnl User does not insist on using GNU NLS library. Figure out what
10789 + dnl to use. If GNU gettext is available we use this. Else we have
10790 + dnl to fall back to GNU NLS library.
10791 +
10792 + dnl Add a version number to the cache macros.
10793 + define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
10794 + define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
10795 + define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
10796 +
10797 + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
10798 + [AC_TRY_LINK([#include <libintl.h>
10799 +]ifelse([$2], [need-formatstring-macros],
10800 +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
10801 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
10802 +#endif
10803 +changequote(,)dnl
10804 +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
10805 +changequote([,])dnl
10806 +], [])[extern int _nl_msg_cat_cntr;
10807 +extern int *_nl_domain_bindings;],
10808 + [bindtextdomain ("", "");
10809 +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
10810 + gt_cv_func_gnugettext_libc=yes,
10811 + gt_cv_func_gnugettext_libc=no)])
10812 +
10813 + if test "$gt_cv_func_gnugettext_libc" != "yes"; then
10814 + dnl Sometimes libintl requires libiconv, so first search for libiconv.
10815 + ifelse(gt_included_intl, yes, , [
10816 + AM_ICONV_LINK
10817 + ])
10818 + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
10819 + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
10820 + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
10821 + dnl even if libiconv doesn't exist.
10822 + AC_LIB_LINKFLAGS_BODY([intl])
10823 + AC_CACHE_CHECK([for GNU gettext in libintl],
10824 + gt_cv_func_gnugettext_libintl,
10825 + [gt_save_CPPFLAGS="$CPPFLAGS"
10826 + CPPFLAGS="$CPPFLAGS $INCINTL"
10827 + gt_save_LIBS="$LIBS"
10828 + LIBS="$LIBS $LIBINTL"
10829 + dnl Now see whether libintl exists and does not depend on libiconv.
10830 + AC_TRY_LINK([#include <libintl.h>
10831 +]ifelse([$2], [need-formatstring-macros],
10832 +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
10833 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
10834 +#endif
10835 +changequote(,)dnl
10836 +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
10837 +changequote([,])dnl
10838 +], [])[extern int _nl_msg_cat_cntr;
10839 +extern
10840 +#ifdef __cplusplus
10841 +"C"
10842 +#endif
10843 +const char *_nl_expand_alias ();],
10844 + [bindtextdomain ("", "");
10845 +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
10846 + gt_cv_func_gnugettext_libintl=yes,
10847 + gt_cv_func_gnugettext_libintl=no)
10848 + dnl Now see whether libintl exists and depends on libiconv.
10849 + if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
10850 + LIBS="$LIBS $LIBICONV"
10851 + AC_TRY_LINK([#include <libintl.h>
10852 +]ifelse([$2], [need-formatstring-macros],
10853 +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
10854 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
10855 +#endif
10856 +changequote(,)dnl
10857 +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
10858 +changequote([,])dnl
10859 +], [])[extern int _nl_msg_cat_cntr;
10860 +extern
10861 +#ifdef __cplusplus
10862 +"C"
10863 +#endif
10864 +const char *_nl_expand_alias ();],
10865 + [bindtextdomain ("", "");
10866 +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
10867 + [LIBINTL="$LIBINTL $LIBICONV"
10868 + LTLIBINTL="$LTLIBINTL $LTLIBICONV"
10869 + gt_cv_func_gnugettext_libintl=yes
10870 + ])
10871 + fi
10872 + CPPFLAGS="$gt_save_CPPFLAGS"
10873 + LIBS="$gt_save_LIBS"])
10874 + fi
10875 +
10876 + dnl If an already present or preinstalled GNU gettext() is found,
10877 + dnl use it. But if this macro is used in GNU gettext, and GNU
10878 + dnl gettext is already preinstalled in libintl, we update this
10879 + dnl libintl. (Cf. the install rule in intl/Makefile.in.)
10880 + if test "$gt_cv_func_gnugettext_libc" = "yes" \
10881 + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
10882 + && test "$PACKAGE" != gettext-runtime \
10883 + && test "$PACKAGE" != gettext-tools; }; then
10884 + gt_use_preinstalled_gnugettext=yes
10885 + else
10886 + dnl Reset the values set by searching for libintl.
10887 + LIBINTL=
10888 + LTLIBINTL=
10889 + INCINTL=
10890 + fi
10891 +
10892 + ifelse(gt_included_intl, yes, [
10893 + if test "$gt_use_preinstalled_gnugettext" != "yes"; then
10894 + dnl GNU gettext is not found in the C library.
10895 + dnl Fall back on included GNU gettext library.
10896 + nls_cv_use_gnu_gettext=yes
10897 + fi
10898 + fi
10899 +
10900 + if test "$nls_cv_use_gnu_gettext" = "yes"; then
10901 + dnl Mark actions used to generate GNU NLS library.
10902 + BUILD_INCLUDED_LIBINTL=yes
10903 + USE_INCLUDED_LIBINTL=yes
10904 + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
10905 + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
10906 + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
10907 + fi
10908 +
10909 + if test "$gt_use_preinstalled_gnugettext" = "yes" \
10910 + || test "$nls_cv_use_gnu_gettext" = "yes"; then
10911 + dnl Mark actions to use GNU gettext tools.
10912 + CATOBJEXT=.gmo
10913 + fi
10914 + ])
10915 +
10916 + if test "$gt_use_preinstalled_gnugettext" = "yes" \
10917 + || test "$nls_cv_use_gnu_gettext" = "yes"; then
10918 + AC_DEFINE(ENABLE_NLS, 1,
10919 + [Define to 1 if translation of program messages to the user's native language
10920 + is requested.])
10921 + else
10922 + USE_NLS=no
10923 + fi
10924 + fi
10925 +
10926 + AC_MSG_CHECKING([whether to use NLS])
10927 + AC_MSG_RESULT([$USE_NLS])
10928 + if test "$USE_NLS" = "yes"; then
10929 + AC_MSG_CHECKING([where the gettext function comes from])
10930 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then
10931 + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
10932 + gt_source="external libintl"
10933 + else
10934 + gt_source="libc"
10935 + fi
10936 + else
10937 + gt_source="included intl directory"
10938 + fi
10939 + AC_MSG_RESULT([$gt_source])
10940 + fi
10941 +
10942 + if test "$USE_NLS" = "yes"; then
10943 +
10944 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then
10945 + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
10946 + AC_MSG_CHECKING([how to link with libintl])
10947 + AC_MSG_RESULT([$LIBINTL])
10948 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
10949 + fi
10950 +
10951 + dnl For backward compatibility. Some packages may be using this.
10952 + AC_DEFINE(HAVE_GETTEXT, 1,
10953 + [Define if the GNU gettext() function is already present or preinstalled.])
10954 + AC_DEFINE(HAVE_DCGETTEXT, 1,
10955 + [Define if the GNU dcgettext() function is already present or preinstalled.])
10956 + fi
10957 +
10958 + dnl We need to process the po/ directory.
10959 + POSUB=po
10960 + fi
10961 +
10962 + ifelse(gt_included_intl, yes, [
10963 + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
10964 + dnl to 'yes' because some of the testsuite requires it.
10965 + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
10966 + BUILD_INCLUDED_LIBINTL=yes
10967 + fi
10968 +
10969 + dnl Make all variables we use known to autoconf.
10970 + AC_SUBST(BUILD_INCLUDED_LIBINTL)
10971 + AC_SUBST(USE_INCLUDED_LIBINTL)
10972 + AC_SUBST(CATOBJEXT)
10973 +
10974 + dnl For backward compatibility. Some configure.ins may be using this.
10975 + nls_cv_header_intl=
10976 + nls_cv_header_libgt=
10977 +
10978 + dnl For backward compatibility. Some Makefiles may be using this.
10979 + DATADIRNAME=share
10980 + AC_SUBST(DATADIRNAME)
10981 +
10982 + dnl For backward compatibility. Some Makefiles may be using this.
10983 + INSTOBJEXT=.mo
10984 + AC_SUBST(INSTOBJEXT)
10985 +
10986 + dnl For backward compatibility. Some Makefiles may be using this.
10987 + GENCAT=gencat
10988 + AC_SUBST(GENCAT)
10989 +
10990 + dnl For backward compatibility. Some Makefiles may be using this.
10991 + if test "$USE_INCLUDED_LIBINTL" = yes; then
10992 + INTLOBJS="\$(GETTOBJS)"
10993 + fi
10994 + AC_SUBST(INTLOBJS)
10995 +
10996 + dnl Enable libtool support if the surrounding package wishes it.
10997 + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
10998 + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
10999 + ])
11000 +
11001 + dnl For backward compatibility. Some Makefiles may be using this.
11002 + INTLLIBS="$LIBINTL"
11003 + AC_SUBST(INTLLIBS)
11004 +
11005 + dnl Make all documented variables known to autoconf.
11006 + AC_SUBST(LIBINTL)
11007 + AC_SUBST(LTLIBINTL)
11008 + AC_SUBST(POSUB)
11009 +])
11010 +
11011 +
11012 +dnl Checks for all prerequisites of the intl subdirectory,
11013 +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
11014 +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
11015 +AC_DEFUN([AM_INTL_SUBDIR],
11016 +[
11017 + AC_REQUIRE([AC_PROG_INSTALL])dnl
11018 + AC_REQUIRE([AM_MKINSTALLDIRS])dnl
11019 + AC_REQUIRE([AC_PROG_CC])dnl
11020 + AC_REQUIRE([AC_CANONICAL_HOST])dnl
11021 + AC_REQUIRE([AC_PROG_RANLIB])dnl
11022 + AC_REQUIRE([AC_ISC_POSIX])dnl
11023 + AC_REQUIRE([AC_HEADER_STDC])dnl
11024 + AC_REQUIRE([AC_C_CONST])dnl
11025 + AC_REQUIRE([bh_C_SIGNED])dnl
11026 + AC_REQUIRE([AC_C_INLINE])dnl
11027 + AC_REQUIRE([AC_TYPE_OFF_T])dnl
11028 + AC_REQUIRE([AC_TYPE_SIZE_T])dnl
11029 + AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
11030 + AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
11031 + AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
11032 + AC_REQUIRE([gt_TYPE_WINT_T])dnl
11033 + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
11034 + AC_REQUIRE([jm_AC_HEADER_STDINT_H])
11035 + AC_REQUIRE([gt_TYPE_INTMAX_T])
11036 + AC_REQUIRE([gt_PRINTF_POSIX])
11037 + AC_REQUIRE([AC_FUNC_ALLOCA])dnl
11038 + AC_REQUIRE([AC_FUNC_MMAP])dnl
11039 + AC_REQUIRE([jm_GLIBC21])dnl
11040 + AC_REQUIRE([gt_INTDIV0])dnl
11041 + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
11042 + AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
11043 + AC_REQUIRE([gt_INTTYPES_PRI])dnl
11044 + AC_REQUIRE([gl_XSIZE])dnl
11045 +
11046 + AC_CHECK_TYPE([ptrdiff_t], ,
11047 + [AC_DEFINE([ptrdiff_t], [long],
11048 + [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
11049 + ])
11050 + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
11051 +stdlib.h string.h unistd.h sys/param.h])
11052 + AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
11053 +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
11054 +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
11055 +__fsetlocking])
11056 +
11057 + dnl Use the _snprintf function only if it is declared (because on NetBSD it
11058 + dnl is defined as a weak alias of snprintf; we prefer to use the latter).
11059 + gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
11060 + gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
11061 +
11062 + dnl Use the *_unlocked functions only if they are declared.
11063 + dnl (because some of them were defined without being declared in Solaris
11064 + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
11065 + dnl on Solaris 2.5.1 to run on Solaris 2.6).
11066 + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
11067 + gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
11068 + gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
11069 + gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
11070 +
11071 + case $gt_cv_func_printf_posix in
11072 + *yes) HAVE_POSIX_PRINTF=1 ;;
11073 + *) HAVE_POSIX_PRINTF=0 ;;
11074 + esac
11075 + AC_SUBST([HAVE_POSIX_PRINTF])
11076 + if test "$ac_cv_func_asprintf" = yes; then
11077 + HAVE_ASPRINTF=1
11078 + else
11079 + HAVE_ASPRINTF=0
11080 + fi
11081 + AC_SUBST([HAVE_ASPRINTF])
11082 + if test "$ac_cv_func_snprintf" = yes; then
11083 + HAVE_SNPRINTF=1
11084 + else
11085 + HAVE_SNPRINTF=0
11086 + fi
11087 + AC_SUBST([HAVE_SNPRINTF])
11088 + if test "$ac_cv_func_wprintf" = yes; then
11089 + HAVE_WPRINTF=1
11090 + else
11091 + HAVE_WPRINTF=0
11092 + fi
11093 + AC_SUBST([HAVE_WPRINTF])
11094 +
11095 + AM_ICONV
11096 + AM_LANGINFO_CODESET
11097 + if test $ac_cv_header_locale_h = yes; then
11098 + AM_LC_MESSAGES
11099 + fi
11100 +
11101 + dnl intl/plural.c is generated from intl/plural.y. It requires bison,
11102 + dnl because plural.y uses bison specific features. It requires at least
11103 + dnl bison-1.26 because earlier versions generate a plural.c that doesn't
11104 + dnl compile.
11105 + dnl bison is only needed for the maintainer (who touches plural.y). But in
11106 + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
11107 + dnl the rule in general Makefile. Now, some people carelessly touch the
11108 + dnl files or have a broken "make" program, hence the plural.c rule will
11109 + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
11110 + dnl present or too old.
11111 + AC_CHECK_PROGS([INTLBISON], [bison])
11112 + if test -z "$INTLBISON"; then
11113 + ac_verc_fail=yes
11114 + else
11115 + dnl Found it, now check the version.
11116 + AC_MSG_CHECKING([version of bison])
11117 +changequote(<<,>>)dnl
11118 + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
11119 + case $ac_prog_version in
11120 + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
11121 + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
11122 +changequote([,])dnl
11123 + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
11124 + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
11125 + esac
11126 + AC_MSG_RESULT([$ac_prog_version])
11127 + fi
11128 + if test $ac_verc_fail = yes; then
11129 + INTLBISON=:
11130 + fi
11131 +])
11132 +
11133 +
11134 +dnl gt_CHECK_DECL(FUNC, INCLUDES)
11135 +dnl Check whether a function is declared.
11136 +AC_DEFUN([gt_CHECK_DECL],
11137 +[
11138 + AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
11139 + [AC_TRY_COMPILE([$2], [
11140 +#ifndef $1
11141 + char *p = (char *) $1;
11142 +#endif
11143 +], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
11144 + if test $ac_cv_have_decl_$1 = yes; then
11145 + gt_value=1
11146 + else
11147 + gt_value=0
11148 + fi
11149 + AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
11150 + [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
11151 +])
11152 +
11153 +
11154 +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
11155 +AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
11156 --- /dev/null
11157 +++ lxpanel-0.5.6/m4/progtest.m4
11158 @@ -0,0 +1,91 @@
11159 +# progtest.m4 serial 3 (gettext-0.12)
11160 +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
11161 +dnl This file is free software, distributed under the terms of the GNU
11162 +dnl General Public License. As a special exception to the GNU General
11163 +dnl Public License, this file may be distributed as part of a program
11164 +dnl that contains a configuration script generated by Autoconf, under
11165 +dnl the same distribution terms as the rest of that program.
11166 +dnl
11167 +dnl This file can can be used in projects which are not available under
11168 +dnl the GNU General Public License or the GNU Library General Public
11169 +dnl License but which still want to provide support for the GNU gettext
11170 +dnl functionality.
11171 +dnl Please note that the actual code of the GNU gettext library is covered
11172 +dnl by the GNU Library General Public License, and the rest of the GNU
11173 +dnl gettext package package is covered by the GNU General Public License.
11174 +dnl They are *not* in the public domain.
11175 +
11176 +dnl Authors:
11177 +dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
11178 +
11179 +# Search path for a program which passes the given test.
11180 +
11181 +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
11182 +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
11183 +AC_DEFUN([AM_PATH_PROG_WITH_TEST],
11184 +[
11185 +# Prepare PATH_SEPARATOR.
11186 +# The user is always right.
11187 +if test "${PATH_SEPARATOR+set}" != set; then
11188 + echo "#! /bin/sh" >conf$$.sh
11189 + echo "exit 0" >>conf$$.sh
11190 + chmod +x conf$$.sh
11191 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
11192 + PATH_SEPARATOR=';'
11193 + else
11194 + PATH_SEPARATOR=:
11195 + fi
11196 + rm -f conf$$.sh
11197 +fi
11198 +
11199 +# Find out how to test for executable files. Don't use a zero-byte file,
11200 +# as systems may use methods other than mode bits to determine executability.
11201 +cat >conf$$.file <<_ASEOF
11202 +#! /bin/sh
11203 +exit 0
11204 +_ASEOF
11205 +chmod +x conf$$.file
11206 +if test -x conf$$.file >/dev/null 2>&1; then
11207 + ac_executable_p="test -x"
11208 +else
11209 + ac_executable_p="test -f"
11210 +fi
11211 +rm -f conf$$.file
11212 +
11213 +# Extract the first word of "$2", so it can be a program name with args.
11214 +set dummy $2; ac_word=[$]2
11215 +AC_MSG_CHECKING([for $ac_word])
11216 +AC_CACHE_VAL(ac_cv_path_$1,
11217 +[case "[$]$1" in
11218 + [[\\/]]* | ?:[[\\/]]*)
11219 + ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
11220 + ;;
11221 + *)
11222 + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
11223 + for ac_dir in ifelse([$5], , $PATH, [$5]); do
11224 + IFS="$ac_save_IFS"
11225 + test -z "$ac_dir" && ac_dir=.
11226 + for ac_exec_ext in '' $ac_executable_extensions; do
11227 + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
11228 + if [$3]; then
11229 + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
11230 + break 2
11231 + fi
11232 + fi
11233 + done
11234 + done
11235 + IFS="$ac_save_IFS"
11236 +dnl If no 4th arg is given, leave the cache variable unset,
11237 +dnl so AC_PATH_PROGS will keep looking.
11238 +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
11239 +])dnl
11240 + ;;
11241 +esac])dnl
11242 +$1="$ac_cv_path_$1"
11243 +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
11244 + AC_MSG_RESULT([$]$1)
11245 +else
11246 + AC_MSG_RESULT(no)
11247 +fi
11248 +AC_SUBST($1)dnl
11249 +])
11250 --- /dev/null
11251 +++ lxpanel-0.5.6/m4/longdouble.m4
11252 @@ -0,0 +1,30 @@
11253 +# longdouble.m4 serial 1 (gettext-0.12)
11254 +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
11255 +dnl This file is free software, distributed under the terms of the GNU
11256 +dnl General Public License. As a special exception to the GNU General
11257 +dnl Public License, this file may be distributed as part of a program
11258 +dnl that contains a configuration script generated by Autoconf, under
11259 +dnl the same distribution terms as the rest of that program.
11260 +
11261 +dnl From Bruno Haible.
11262 +dnl Test whether the compiler supports the 'long double' type.
11263 +dnl Prerequisite: AC_PROG_CC
11264 +
11265 +AC_DEFUN([gt_TYPE_LONGDOUBLE],
11266 +[
11267 + AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
11268 + [if test "$GCC" = yes; then
11269 + gt_cv_c_long_double=yes
11270 + else
11271 + AC_TRY_COMPILE([
11272 + /* The Stardent Vistra knows sizeof(long double), but does not support it. */
11273 + long double foo = 0.0;
11274 + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
11275 + int array [2*(sizeof(long double) >= sizeof(double)) - 1];
11276 + ], ,
11277 + gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
11278 + fi])
11279 + if test $gt_cv_c_long_double = yes; then
11280 + AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
11281 + fi
11282 +])
11283 --- /dev/null
11284 +++ lxpanel-0.5.6/m4/stdint_h.m4
11285 @@ -0,0 +1,28 @@
11286 +# stdint_h.m4 serial 3 (gettext-0.12)
11287 +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
11288 +dnl This file is free software, distributed under the terms of the GNU
11289 +dnl General Public License. As a special exception to the GNU General
11290 +dnl Public License, this file may be distributed as part of a program
11291 +dnl that contains a configuration script generated by Autoconf, under
11292 +dnl the same distribution terms as the rest of that program.
11293 +
11294 +dnl From Paul Eggert.
11295 +
11296 +# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
11297 +# doesn't clash with <sys/types.h>, and declares uintmax_t.
11298 +
11299 +AC_DEFUN([jm_AC_HEADER_STDINT_H],
11300 +[
11301 + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
11302 + [AC_TRY_COMPILE(
11303 + [#include <sys/types.h>
11304 +#include <stdint.h>],
11305 + [uintmax_t i = (uintmax_t) -1;],
11306 + jm_ac_cv_header_stdint_h=yes,
11307 + jm_ac_cv_header_stdint_h=no)])
11308 + if test $jm_ac_cv_header_stdint_h = yes; then
11309 + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
11310 + [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
11311 + and declares uintmax_t. ])
11312 + fi
11313 +])
11314 --- /dev/null
11315 +++ lxpanel-0.5.6/m4/signed.m4
11316 @@ -0,0 +1,19 @@
11317 +# signed.m4 serial 1 (gettext-0.10.40)
11318 +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
11319 +dnl This file is free software, distributed under the terms of the GNU
11320 +dnl General Public License. As a special exception to the GNU General
11321 +dnl Public License, this file may be distributed as part of a program
11322 +dnl that contains a configuration script generated by Autoconf, under
11323 +dnl the same distribution terms as the rest of that program.
11324 +
11325 +dnl From Bruno Haible.
11326 +
11327 +AC_DEFUN([bh_C_SIGNED],
11328 +[
11329 + AC_CACHE_CHECK([for signed], bh_cv_c_signed,
11330 + [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
11331 + if test $bh_cv_c_signed = no; then
11332 + AC_DEFINE(signed, ,
11333 + [Define to empty if the C compiler doesn't support this keyword.])
11334 + fi
11335 +])
11336 --- /dev/null
11337 +++ lxpanel-0.5.6/m4/po.m4
11338 @@ -0,0 +1,426 @@
11339 +# po.m4 serial 3 (gettext-0.14)
11340 +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
11341 +dnl This file is free software, distributed under the terms of the GNU
11342 +dnl General Public License. As a special exception to the GNU General
11343 +dnl Public License, this file may be distributed as part of a program
11344 +dnl that contains a configuration script generated by Autoconf, under
11345 +dnl the same distribution terms as the rest of that program.
11346 +dnl
11347 +dnl This file can can be used in projects which are not available under
11348 +dnl the GNU General Public License or the GNU Library General Public
11349 +dnl License but which still want to provide support for the GNU gettext
11350 +dnl functionality.
11351 +dnl Please note that the actual code of the GNU gettext library is covered
11352 +dnl by the GNU Library General Public License, and the rest of the GNU
11353 +dnl gettext package package is covered by the GNU General Public License.
11354 +dnl They are *not* in the public domain.
11355 +
11356 +dnl Authors:
11357 +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
11358 +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
11359 +
11360 +dnl Checks for all prerequisites of the po subdirectory.
11361 +AC_DEFUN([AM_PO_SUBDIRS],
11362 +[
11363 + AC_REQUIRE([AC_PROG_MAKE_SET])dnl
11364 + AC_REQUIRE([AC_PROG_INSTALL])dnl
11365 + AC_REQUIRE([AM_MKINSTALLDIRS])dnl
11366 + AC_REQUIRE([AM_NLS])dnl
11367 +
11368 + dnl Perform the following tests also if --disable-nls has been given,
11369 + dnl because they are needed for "make dist" to work.
11370 +
11371 + dnl Search for GNU msgfmt in the PATH.
11372 + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
11373 + dnl The second test excludes FreeBSD msgfmt.
11374 + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
11375 + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
11376 + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
11377 + :)
11378 + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
11379 +
11380 + dnl Search for GNU xgettext 0.12 or newer in the PATH.
11381 + dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
11382 + dnl The second test excludes FreeBSD xgettext.
11383 + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
11384 + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
11385 + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
11386 + :)
11387 + dnl Remove leftover from FreeBSD xgettext call.
11388 + rm -f messages.po
11389 +
11390 + dnl Search for GNU msgmerge 0.11 or newer in the PATH.
11391 + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
11392 + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
11393 +
11394 + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
11395 + dnl Test whether we really found GNU msgfmt.
11396 + if test "$GMSGFMT" != ":"; then
11397 + dnl If it is no GNU msgfmt we define it as : so that the
11398 + dnl Makefiles still can work.
11399 + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
11400 + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
11401 + : ;
11402 + else
11403 + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
11404 + AC_MSG_RESULT(
11405 + [found $GMSGFMT program is not GNU msgfmt; ignore it])
11406 + GMSGFMT=":"
11407 + fi
11408 + fi
11409 +
11410 + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
11411 + dnl Test whether we really found GNU xgettext.
11412 + if test "$XGETTEXT" != ":"; then
11413 + dnl If it is no GNU xgettext we define it as : so that the
11414 + dnl Makefiles still can work.
11415 + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
11416 + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
11417 + : ;
11418 + else
11419 + AC_MSG_RESULT(
11420 + [found xgettext program is not GNU xgettext; ignore it])
11421 + XGETTEXT=":"
11422 + fi
11423 + dnl Remove leftover from FreeBSD xgettext call.
11424 + rm -f messages.po
11425 + fi
11426 +
11427 + AC_OUTPUT_COMMANDS([
11428 + for ac_file in $CONFIG_FILES; do
11429 + # Support "outfile[:infile[:infile...]]"
11430 + case "$ac_file" in
11431 + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
11432 + esac
11433 + # PO directories have a Makefile.in generated from Makefile.in.in.
11434 + case "$ac_file" in */Makefile.in)
11435 + # Adjust a relative srcdir.
11436 + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
11437 + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
11438 + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
11439 + # In autoconf-2.13 it is called $ac_given_srcdir.
11440 + # In autoconf-2.50 it is called $srcdir.
11441 + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
11442 + case "$ac_given_srcdir" in
11443 + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
11444 + /*) top_srcdir="$ac_given_srcdir" ;;
11445 + *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
11446 + esac
11447 + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
11448 + rm -f "$ac_dir/POTFILES"
11449 + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
11450 + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
11451 + POMAKEFILEDEPS="POTFILES.in"
11452 + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
11453 + # on $ac_dir but don't depend on user-specified configuration
11454 + # parameters.
11455 + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
11456 + # The LINGUAS file contains the set of available languages.
11457 + if test -n "$OBSOLETE_ALL_LINGUAS"; then
11458 + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
11459 + fi
11460 + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
11461 + # Hide the ALL_LINGUAS assigment from automake.
11462 + eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
11463 + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
11464 + else
11465 + # The set of available languages was given in configure.in.
11466 + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
11467 + fi
11468 + # Compute POFILES
11469 + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
11470 + # Compute UPDATEPOFILES
11471 + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
11472 + # Compute DUMMYPOFILES
11473 + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
11474 + # Compute GMOFILES
11475 + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
11476 + case "$ac_given_srcdir" in
11477 + .) srcdirpre= ;;
11478 + *) srcdirpre='$(srcdir)/' ;;
11479 + esac
11480 + POFILES=
11481 + UPDATEPOFILES=
11482 + DUMMYPOFILES=
11483 + GMOFILES=
11484 + for lang in $ALL_LINGUAS; do
11485 + POFILES="$POFILES $srcdirpre$lang.po"
11486 + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
11487 + DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
11488 + GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
11489 + done
11490 + # CATALOGS depends on both $ac_dir and the user's LINGUAS
11491 + # environment variable.
11492 + INST_LINGUAS=
11493 + if test -n "$ALL_LINGUAS"; then
11494 + for presentlang in $ALL_LINGUAS; do
11495 + useit=no
11496 + if test "%UNSET%" != "$LINGUAS"; then
11497 + desiredlanguages="$LINGUAS"
11498 + else
11499 + desiredlanguages="$ALL_LINGUAS"
11500 + fi
11501 + for desiredlang in $desiredlanguages; do
11502 + # Use the presentlang catalog if desiredlang is
11503 + # a. equal to presentlang, or
11504 + # b. a variant of presentlang (because in this case,
11505 + # presentlang can be used as a fallback for messages
11506 + # which are not translated in the desiredlang catalog).
11507 + case "$desiredlang" in
11508 + "$presentlang"*) useit=yes;;
11509 + esac
11510 + done
11511 + if test $useit = yes; then
11512 + INST_LINGUAS="$INST_LINGUAS $presentlang"
11513 + fi
11514 + done
11515 + fi
11516 + CATALOGS=
11517 + if test -n "$INST_LINGUAS"; then
11518 + for lang in $INST_LINGUAS; do
11519 + CATALOGS="$CATALOGS $lang.gmo"
11520 + done
11521 + fi
11522 + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
11523 + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
11524 + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
11525 + if test -f "$f"; then
11526 + case "$f" in
11527 + *.orig | *.bak | *~) ;;
11528 + *) cat "$f" >> "$ac_dir/Makefile" ;;
11529 + esac
11530 + fi
11531 + done
11532 + fi
11533 + ;;
11534 + esac
11535 + done],
11536 + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
11537 + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
11538 + # from automake.
11539 + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
11540 + # Capture the value of LINGUAS because we need it to compute CATALOGS.
11541 + LINGUAS="${LINGUAS-%UNSET%}"
11542 + ])
11543 +])
11544 +
11545 +dnl Postprocesses a Makefile in a directory containing PO files.
11546 +AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
11547 +[
11548 + # When this code is run, in config.status, two variables have already been
11549 + # set:
11550 + # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
11551 + # - LINGUAS is the value of the environment variable LINGUAS at configure
11552 + # time.
11553 +
11554 +changequote(,)dnl
11555 + # Adjust a relative srcdir.
11556 + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
11557 + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
11558 + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
11559 + # In autoconf-2.13 it is called $ac_given_srcdir.
11560 + # In autoconf-2.50 it is called $srcdir.
11561 + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
11562 + case "$ac_given_srcdir" in
11563 + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
11564 + /*) top_srcdir="$ac_given_srcdir" ;;
11565 + *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
11566 + esac
11567 +
11568 + # Find a way to echo strings without interpreting backslash.
11569 + if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
11570 + gt_echo='echo'
11571 + else
11572 + if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
11573 + gt_echo='printf %s\n'
11574 + else
11575 + echo_func () {
11576 + cat <<EOT
11577 +$*
11578 +EOT
11579 + }
11580 + gt_echo='echo_func'
11581 + fi
11582 + fi
11583 +
11584 + # A sed script that extracts the value of VARIABLE from a Makefile.
11585 + sed_x_variable='
11586 +# Test if the hold space is empty.
11587 +x
11588 +s/P/P/
11589 +x
11590 +ta
11591 +# Yes it was empty. Look if we have the expected variable definition.
11592 +/^[ ]*VARIABLE[ ]*=/{
11593 + # Seen the first line of the variable definition.
11594 + s/^[ ]*VARIABLE[ ]*=//
11595 + ba
11596 +}
11597 +bd
11598 +:a
11599 +# Here we are processing a line from the variable definition.
11600 +# Remove comment, more precisely replace it with a space.
11601 +s/#.*$/ /
11602 +# See if the line ends in a backslash.
11603 +tb
11604 +:b
11605 +s/\\$//
11606 +# Print the line, without the trailing backslash.
11607 +p
11608 +tc
11609 +# There was no trailing backslash. The end of the variable definition is
11610 +# reached. Clear the hold space.
11611 +s/^.*$//
11612 +x
11613 +bd
11614 +:c
11615 +# A trailing backslash means that the variable definition continues in the
11616 +# next line. Put a nonempty string into the hold space to indicate this.
11617 +s/^.*$/P/
11618 +x
11619 +:d
11620 +'
11621 +changequote([,])dnl
11622 +
11623 + # Set POTFILES to the value of the Makefile variable POTFILES.
11624 + sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
11625 + POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
11626 + # Compute POTFILES_DEPS as
11627 + # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
11628 + POTFILES_DEPS=
11629 + for file in $POTFILES; do
11630 + POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
11631 + done
11632 + POMAKEFILEDEPS=""
11633 +
11634 + if test -n "$OBSOLETE_ALL_LINGUAS"; then
11635 + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
11636 + fi
11637 + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
11638 + # The LINGUAS file contains the set of available languages.
11639 + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
11640 + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
11641 + else
11642 + # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
11643 + sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
11644 + ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
11645 + fi
11646 + # Hide the ALL_LINGUAS assigment from automake.
11647 + eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
11648 + # Compute POFILES
11649 + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
11650 + # Compute UPDATEPOFILES
11651 + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
11652 + # Compute DUMMYPOFILES
11653 + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
11654 + # Compute GMOFILES
11655 + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
11656 + # Compute PROPERTIESFILES
11657 + # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
11658 + # Compute CLASSFILES
11659 + # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
11660 + # Compute QMFILES
11661 + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
11662 + # Compute MSGFILES
11663 + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
11664 + # Compute RESOURCESDLLFILES
11665 + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
11666 + case "$ac_given_srcdir" in
11667 + .) srcdirpre= ;;
11668 + *) srcdirpre='$(srcdir)/' ;;
11669 + esac
11670 + POFILES=
11671 + UPDATEPOFILES=
11672 + DUMMYPOFILES=
11673 + GMOFILES=
11674 + PROPERTIESFILES=
11675 + CLASSFILES=
11676 + QMFILES=
11677 + MSGFILES=
11678 + RESOURCESDLLFILES=
11679 + for lang in $ALL_LINGUAS; do
11680 + POFILES="$POFILES $srcdirpre$lang.po"
11681 + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
11682 + DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
11683 + GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
11684 + PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
11685 + CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
11686 + QMFILES="$QMFILES $srcdirpre$lang.qm"
11687 + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
11688 + MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
11689 + frobbedlang=`echo $lang | sed -e 's/_/-/g'`
11690 + RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
11691 + done
11692 + # CATALOGS depends on both $ac_dir and the user's LINGUAS
11693 + # environment variable.
11694 + INST_LINGUAS=
11695 + if test -n "$ALL_LINGUAS"; then
11696 + for presentlang in $ALL_LINGUAS; do
11697 + useit=no
11698 + if test "%UNSET%" != "$LINGUAS"; then
11699 + desiredlanguages="$LINGUAS"
11700 + else
11701 + desiredlanguages="$ALL_LINGUAS"
11702 + fi
11703 + for desiredlang in $desiredlanguages; do
11704 + # Use the presentlang catalog if desiredlang is
11705 + # a. equal to presentlang, or
11706 + # b. a variant of presentlang (because in this case,
11707 + # presentlang can be used as a fallback for messages
11708 + # which are not translated in the desiredlang catalog).
11709 + case "$desiredlang" in
11710 + "$presentlang"*) useit=yes;;
11711 + esac
11712 + done
11713 + if test $useit = yes; then
11714 + INST_LINGUAS="$INST_LINGUAS $presentlang"
11715 + fi
11716 + done
11717 + fi
11718 + CATALOGS=
11719 + JAVACATALOGS=
11720 + QTCATALOGS=
11721 + TCLCATALOGS=
11722 + CSHARPCATALOGS=
11723 + if test -n "$INST_LINGUAS"; then
11724 + for lang in $INST_LINGUAS; do
11725 + CATALOGS="$CATALOGS $lang.gmo"
11726 + JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
11727 + QTCATALOGS="$QTCATALOGS $lang.qm"
11728 + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
11729 + TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
11730 + frobbedlang=`echo $lang | sed -e 's/_/-/g'`
11731 + CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
11732 + done
11733 + fi
11734 +
11735 + sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
11736 + if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
11737 + # Add dependencies that cannot be formulated as a simple suffix rule.
11738 + for lang in $ALL_LINGUAS; do
11739 + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
11740 + cat >> "$ac_file.tmp" <<EOF
11741 +$frobbedlang.msg: $lang.po
11742 + @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
11743 + \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
11744 +EOF
11745 + done
11746 + fi
11747 + if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
11748 + # Add dependencies that cannot be formulated as a simple suffix rule.
11749 + for lang in $ALL_LINGUAS; do
11750 + frobbedlang=`echo $lang | sed -e 's/_/-/g'`
11751 + cat >> "$ac_file.tmp" <<EOF
11752 +$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
11753 + @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
11754 + \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
11755 +EOF
11756 + done
11757 + fi
11758 + if test -n "$POMAKEFILEDEPS"; then
11759 + cat >> "$ac_file.tmp" <<EOF
11760 +Makefile: $POMAKEFILEDEPS
11761 +EOF
11762 + fi
11763 + mv "$ac_file.tmp" "$ac_file"
11764 +])
11765 --- /dev/null
11766 +++ lxpanel-0.5.6/m4/isc-posix.m4
11767 @@ -0,0 +1,26 @@
11768 +# isc-posix.m4 serial 2 (gettext-0.11.2)
11769 +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
11770 +dnl This file is free software, distributed under the terms of the GNU
11771 +dnl General Public License. As a special exception to the GNU General
11772 +dnl Public License, this file may be distributed as part of a program
11773 +dnl that contains a configuration script generated by Autoconf, under
11774 +dnl the same distribution terms as the rest of that program.
11775 +
11776 +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
11777 +
11778 +# This test replaces the one in autoconf.
11779 +# Currently this macro should have the same name as the autoconf macro
11780 +# because gettext's gettext.m4 (distributed in the automake package)
11781 +# still uses it. Otherwise, the use in gettext.m4 makes autoheader
11782 +# give these diagnostics:
11783 +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
11784 +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
11785 +
11786 +undefine([AC_ISC_POSIX])
11787 +
11788 +AC_DEFUN([AC_ISC_POSIX],
11789 + [
11790 + dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
11791 + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
11792 + ]
11793 +)
11794 --- /dev/null
11795 +++ lxpanel-0.5.6/m4/size_max.m4
11796 @@ -0,0 +1,61 @@
11797 +# size_max.m4 serial 2
11798 +dnl Copyright (C) 2003 Free Software Foundation, Inc.
11799 +dnl This file is free software, distributed under the terms of the GNU
11800 +dnl General Public License. As a special exception to the GNU General
11801 +dnl Public License, this file may be distributed as part of a program
11802 +dnl that contains a configuration script generated by Autoconf, under
11803 +dnl the same distribution terms as the rest of that program.
11804 +
11805 +dnl From Bruno Haible.
11806 +
11807 +AC_DEFUN([gl_SIZE_MAX],
11808 +[
11809 + AC_CHECK_HEADERS(stdint.h)
11810 + dnl First test whether the system already has SIZE_MAX.
11811 + AC_MSG_CHECKING([for SIZE_MAX])
11812 + result=
11813 + AC_EGREP_CPP([Found it], [
11814 +#include <limits.h>
11815 +#if HAVE_STDINT_H
11816 +#include <stdint.h>
11817 +#endif
11818 +#ifdef SIZE_MAX
11819 +Found it
11820 +#endif
11821 +], result=yes)
11822 + if test -z "$result"; then
11823 + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
11824 + dnl than the type 'unsigned long'.
11825 + dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
11826 + dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
11827 + _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
11828 + [#include <stddef.h>], result=?)
11829 + _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
11830 + [#include <stddef.h>], result=?)
11831 + _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
11832 + [#include <stddef.h>], result=?)
11833 + if test "$fits_in_uint" = 1; then
11834 + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
11835 + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
11836 + AC_TRY_COMPILE([#include <stddef.h>
11837 + extern size_t foo;
11838 + extern unsigned long foo;
11839 + ], [], fits_in_uint=0)
11840 + fi
11841 + if test -z "$result"; then
11842 + if test "$fits_in_uint" = 1; then
11843 + result="$res_hi$res_lo"U
11844 + else
11845 + result="$res_hi$res_lo"UL
11846 + fi
11847 + else
11848 + dnl Shouldn't happen, but who knows...
11849 + result='~(size_t)0'
11850 + fi
11851 + fi
11852 + AC_MSG_RESULT([$result])
11853 + if test "$result" != yes; then
11854 + AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
11855 + [Define as the maximum value of type 'size_t', if the system doesn't define it.])
11856 + fi
11857 +])
11858 --- /dev/null
11859 +++ lxpanel-0.5.6/m4/wchar_t.m4
11860 @@ -0,0 +1,22 @@
11861 +# wchar_t.m4 serial 1 (gettext-0.12)
11862 +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
11863 +dnl This file is free software, distributed under the terms of the GNU
11864 +dnl General Public License. As a special exception to the GNU General
11865 +dnl Public License, this file may be distributed as part of a program
11866 +dnl that contains a configuration script generated by Autoconf, under
11867 +dnl the same distribution terms as the rest of that program.
11868 +
11869 +dnl From Bruno Haible.
11870 +dnl Test whether <stddef.h> has the 'wchar_t' type.
11871 +dnl Prerequisite: AC_PROG_CC
11872 +
11873 +AC_DEFUN([gt_TYPE_WCHAR_T],
11874 +[
11875 + AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
11876 + [AC_TRY_COMPILE([#include <stddef.h>
11877 + wchar_t foo = (wchar_t)'\0';], ,
11878 + gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
11879 + if test $gt_cv_c_wchar_t = yes; then
11880 + AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
11881 + fi
11882 +])
11883 --- /dev/null
11884 +++ lxpanel-0.5.6/m4/lib-link.m4
11885 @@ -0,0 +1,551 @@
11886 +# lib-link.m4 serial 4 (gettext-0.12)
11887 +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
11888 +dnl This file is free software, distributed under the terms of the GNU
11889 +dnl General Public License. As a special exception to the GNU General
11890 +dnl Public License, this file may be distributed as part of a program
11891 +dnl that contains a configuration script generated by Autoconf, under
11892 +dnl the same distribution terms as the rest of that program.
11893 +
11894 +dnl From Bruno Haible.
11895 +
11896 +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
11897 +dnl the libraries corresponding to explicit and implicit dependencies.
11898 +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
11899 +dnl augments the CPPFLAGS variable.
11900 +AC_DEFUN([AC_LIB_LINKFLAGS],
11901 +[
11902 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
11903 + AC_REQUIRE([AC_LIB_RPATH])
11904 + define([Name],[translit([$1],[./-], [___])])
11905 + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
11906 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
11907 + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
11908 + AC_LIB_LINKFLAGS_BODY([$1], [$2])
11909 + ac_cv_lib[]Name[]_libs="$LIB[]NAME"
11910 + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
11911 + ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
11912 + ])
11913 + LIB[]NAME="$ac_cv_lib[]Name[]_libs"
11914 + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
11915 + INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
11916 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
11917 + AC_SUBST([LIB]NAME)
11918 + AC_SUBST([LTLIB]NAME)
11919 + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
11920 + dnl results of this search when this library appears as a dependency.
11921 + HAVE_LIB[]NAME=yes
11922 + undefine([Name])
11923 + undefine([NAME])
11924 +])
11925 +
11926 +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
11927 +dnl searches for libname and the libraries corresponding to explicit and
11928 +dnl implicit dependencies, together with the specified include files and
11929 +dnl the ability to compile and link the specified testcode. If found, it
11930 +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
11931 +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
11932 +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
11933 +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
11934 +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
11935 +[
11936 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
11937 + AC_REQUIRE([AC_LIB_RPATH])
11938 + define([Name],[translit([$1],[./-], [___])])
11939 + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
11940 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
11941 +
11942 + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
11943 + dnl accordingly.
11944 + AC_LIB_LINKFLAGS_BODY([$1], [$2])
11945 +
11946 + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
11947 + dnl because if the user has installed lib[]Name and not disabled its use
11948 + dnl via --without-lib[]Name-prefix, he wants to use it.
11949 + ac_save_CPPFLAGS="$CPPFLAGS"
11950 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
11951 +
11952 + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
11953 + ac_save_LIBS="$LIBS"
11954 + LIBS="$LIBS $LIB[]NAME"
11955 + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
11956 + LIBS="$ac_save_LIBS"
11957 + ])
11958 + if test "$ac_cv_lib[]Name" = yes; then
11959 + HAVE_LIB[]NAME=yes
11960 + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
11961 + AC_MSG_CHECKING([how to link with lib[]$1])
11962 + AC_MSG_RESULT([$LIB[]NAME])
11963 + else
11964 + HAVE_LIB[]NAME=no
11965 + dnl If $LIB[]NAME didn't lead to a usable library, we don't need
11966 + dnl $INC[]NAME either.
11967 + CPPFLAGS="$ac_save_CPPFLAGS"
11968 + LIB[]NAME=
11969 + LTLIB[]NAME=
11970 + fi
11971 + AC_SUBST([HAVE_LIB]NAME)
11972 + AC_SUBST([LIB]NAME)
11973 + AC_SUBST([LTLIB]NAME)
11974 + undefine([Name])
11975 + undefine([NAME])
11976 +])
11977 +
11978 +dnl Determine the platform dependent parameters needed to use rpath:
11979 +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
11980 +dnl hardcode_direct, hardcode_minus_L.
11981 +AC_DEFUN([AC_LIB_RPATH],
11982 +[
11983 + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
11984 + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
11985 + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
11986 + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
11987 + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
11988 + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
11989 + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
11990 + . ./conftest.sh
11991 + rm -f ./conftest.sh
11992 + acl_cv_rpath=done
11993 + ])
11994 + wl="$acl_cv_wl"
11995 + libext="$acl_cv_libext"
11996 + shlibext="$acl_cv_shlibext"
11997 + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
11998 + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
11999 + hardcode_direct="$acl_cv_hardcode_direct"
12000 + hardcode_minus_L="$acl_cv_hardcode_minus_L"
12001 + dnl Determine whether the user wants rpath handling at all.
12002 + AC_ARG_ENABLE(rpath,
12003 + [ --disable-rpath do not hardcode runtime library paths],
12004 + :, enable_rpath=yes)
12005 +])
12006 +
12007 +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
12008 +dnl the libraries corresponding to explicit and implicit dependencies.
12009 +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
12010 +AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
12011 +[
12012 + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
12013 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
12014 + dnl By default, look in $includedir and $libdir.
12015 + use_additional=yes
12016 + AC_LIB_WITH_FINAL_PREFIX([
12017 + eval additional_includedir=\"$includedir\"
12018 + eval additional_libdir=\"$libdir\"
12019 + ])
12020 + AC_LIB_ARG_WITH([lib$1-prefix],
12021 +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
12022 + --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
12023 +[
12024 + if test "X$withval" = "Xno"; then
12025 + use_additional=no
12026 + else
12027 + if test "X$withval" = "X"; then
12028 + AC_LIB_WITH_FINAL_PREFIX([
12029 + eval additional_includedir=\"$includedir\"
12030 + eval additional_libdir=\"$libdir\"
12031 + ])
12032 + else
12033 + additional_includedir="$withval/include"
12034 + additional_libdir="$withval/lib"
12035 + fi
12036 + fi
12037 +])
12038 + dnl Search the library and its dependencies in $additional_libdir and
12039 + dnl $LDFLAGS. Using breadth-first-seach.
12040 + LIB[]NAME=
12041 + LTLIB[]NAME=
12042 + INC[]NAME=
12043 + rpathdirs=
12044 + ltrpathdirs=
12045 + names_already_handled=
12046 + names_next_round='$1 $2'
12047 + while test -n "$names_next_round"; do
12048 + names_this_round="$names_next_round"
12049 + names_next_round=
12050 + for name in $names_this_round; do
12051 + already_handled=
12052 + for n in $names_already_handled; do
12053 + if test "$n" = "$name"; then
12054 + already_handled=yes
12055 + break
12056 + fi
12057 + done
12058 + if test -z "$already_handled"; then
12059 + names_already_handled="$names_already_handled $name"
12060 + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
12061 + dnl or AC_LIB_HAVE_LINKFLAGS call.
12062 + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
12063 + eval value=\"\$HAVE_LIB$uppername\"
12064 + if test -n "$value"; then
12065 + if test "$value" = yes; then
12066 + eval value=\"\$LIB$uppername\"
12067 + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
12068 + eval value=\"\$LTLIB$uppername\"
12069 + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
12070 + else
12071 + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
12072 + dnl that this library doesn't exist. So just drop it.
12073 + :
12074 + fi
12075 + else
12076 + dnl Search the library lib$name in $additional_libdir and $LDFLAGS
12077 + dnl and the already constructed $LIBNAME/$LTLIBNAME.
12078 + found_dir=
12079 + found_la=
12080 + found_so=
12081 + found_a=
12082 + if test $use_additional = yes; then
12083 + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
12084 + found_dir="$additional_libdir"
12085 + found_so="$additional_libdir/lib$name.$shlibext"
12086 + if test -f "$additional_libdir/lib$name.la"; then
12087 + found_la="$additional_libdir/lib$name.la"
12088 + fi
12089 + else
12090 + if test -f "$additional_libdir/lib$name.$libext"; then
12091 + found_dir="$additional_libdir"
12092 + found_a="$additional_libdir/lib$name.$libext"
12093 + if test -f "$additional_libdir/lib$name.la"; then
12094 + found_la="$additional_libdir/lib$name.la"
12095 + fi
12096 + fi
12097 + fi
12098 + fi
12099 + if test "X$found_dir" = "X"; then
12100 + for x in $LDFLAGS $LTLIB[]NAME; do
12101 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12102 + case "$x" in
12103 + -L*)
12104 + dir=`echo "X$x" | sed -e 's/^X-L//'`
12105 + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
12106 + found_dir="$dir"
12107 + found_so="$dir/lib$name.$shlibext"
12108 + if test -f "$dir/lib$name.la"; then
12109 + found_la="$dir/lib$name.la"
12110 + fi
12111 + else
12112 + if test -f "$dir/lib$name.$libext"; then
12113 + found_dir="$dir"
12114 + found_a="$dir/lib$name.$libext"
12115 + if test -f "$dir/lib$name.la"; then
12116 + found_la="$dir/lib$name.la"
12117 + fi
12118 + fi
12119 + fi
12120 + ;;
12121 + esac
12122 + if test "X$found_dir" != "X"; then
12123 + break
12124 + fi
12125 + done
12126 + fi
12127 + if test "X$found_dir" != "X"; then
12128 + dnl Found the library.
12129 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
12130 + if test "X$found_so" != "X"; then
12131 + dnl Linking with a shared library. We attempt to hardcode its
12132 + dnl directory into the executable's runpath, unless it's the
12133 + dnl standard /usr/lib.
12134 + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
12135 + dnl No hardcoding is needed.
12136 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
12137 + else
12138 + dnl Use an explicit option to hardcode DIR into the resulting
12139 + dnl binary.
12140 + dnl Potentially add DIR to ltrpathdirs.
12141 + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
12142 + haveit=
12143 + for x in $ltrpathdirs; do
12144 + if test "X$x" = "X$found_dir"; then
12145 + haveit=yes
12146 + break
12147 + fi
12148 + done
12149 + if test -z "$haveit"; then
12150 + ltrpathdirs="$ltrpathdirs $found_dir"
12151 + fi
12152 + dnl The hardcoding into $LIBNAME is system dependent.
12153 + if test "$hardcode_direct" = yes; then
12154 + dnl Using DIR/libNAME.so during linking hardcodes DIR into the
12155 + dnl resulting binary.
12156 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
12157 + else
12158 + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
12159 + dnl Use an explicit option to hardcode DIR into the resulting
12160 + dnl binary.
12161 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
12162 + dnl Potentially add DIR to rpathdirs.
12163 + dnl The rpathdirs will be appended to $LIBNAME at the end.
12164 + haveit=
12165 + for x in $rpathdirs; do
12166 + if test "X$x" = "X$found_dir"; then
12167 + haveit=yes
12168 + break
12169 + fi
12170 + done
12171 + if test -z "$haveit"; then
12172 + rpathdirs="$rpathdirs $found_dir"
12173 + fi
12174 + else
12175 + dnl Rely on "-L$found_dir".
12176 + dnl But don't add it if it's already contained in the LDFLAGS
12177 + dnl or the already constructed $LIBNAME
12178 + haveit=
12179 + for x in $LDFLAGS $LIB[]NAME; do
12180 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12181 + if test "X$x" = "X-L$found_dir"; then
12182 + haveit=yes
12183 + break
12184 + fi
12185 + done
12186 + if test -z "$haveit"; then
12187 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
12188 + fi
12189 + if test "$hardcode_minus_L" != no; then
12190 + dnl FIXME: Not sure whether we should use
12191 + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
12192 + dnl here.
12193 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
12194 + else
12195 + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
12196 + dnl here, because this doesn't fit in flags passed to the
12197 + dnl compiler. So give up. No hardcoding. This affects only
12198 + dnl very old systems.
12199 + dnl FIXME: Not sure whether we should use
12200 + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
12201 + dnl here.
12202 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
12203 + fi
12204 + fi
12205 + fi
12206 + fi
12207 + else
12208 + if test "X$found_a" != "X"; then
12209 + dnl Linking with a static library.
12210 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
12211 + else
12212 + dnl We shouldn't come here, but anyway it's good to have a
12213 + dnl fallback.
12214 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
12215 + fi
12216 + fi
12217 + dnl Assume the include files are nearby.
12218 + additional_includedir=
12219 + case "$found_dir" in
12220 + */lib | */lib/)
12221 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
12222 + additional_includedir="$basedir/include"
12223 + ;;
12224 + esac
12225 + if test "X$additional_includedir" != "X"; then
12226 + dnl Potentially add $additional_includedir to $INCNAME.
12227 + dnl But don't add it
12228 + dnl 1. if it's the standard /usr/include,
12229 + dnl 2. if it's /usr/local/include and we are using GCC on Linux,
12230 + dnl 3. if it's already present in $CPPFLAGS or the already
12231 + dnl constructed $INCNAME,
12232 + dnl 4. if it doesn't exist as a directory.
12233 + if test "X$additional_includedir" != "X/usr/include"; then
12234 + haveit=
12235 + if test "X$additional_includedir" = "X/usr/local/include"; then
12236 + if test -n "$GCC"; then
12237 + case $host_os in
12238 + linux*) haveit=yes;;
12239 + esac
12240 + fi
12241 + fi
12242 + if test -z "$haveit"; then
12243 + for x in $CPPFLAGS $INC[]NAME; do
12244 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12245 + if test "X$x" = "X-I$additional_includedir"; then
12246 + haveit=yes
12247 + break
12248 + fi
12249 + done
12250 + if test -z "$haveit"; then
12251 + if test -d "$additional_includedir"; then
12252 + dnl Really add $additional_includedir to $INCNAME.
12253 + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
12254 + fi
12255 + fi
12256 + fi
12257 + fi
12258 + fi
12259 + dnl Look for dependencies.
12260 + if test -n "$found_la"; then
12261 + dnl Read the .la file. It defines the variables
12262 + dnl dlname, library_names, old_library, dependency_libs, current,
12263 + dnl age, revision, installed, dlopen, dlpreopen, libdir.
12264 + save_libdir="$libdir"
12265 + case "$found_la" in
12266 + */* | *\\*) . "$found_la" ;;
12267 + *) . "./$found_la" ;;
12268 + esac
12269 + libdir="$save_libdir"
12270 + dnl We use only dependency_libs.
12271 + for dep in $dependency_libs; do
12272 + case "$dep" in
12273 + -L*)
12274 + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
12275 + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
12276 + dnl But don't add it
12277 + dnl 1. if it's the standard /usr/lib,
12278 + dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
12279 + dnl 3. if it's already present in $LDFLAGS or the already
12280 + dnl constructed $LIBNAME,
12281 + dnl 4. if it doesn't exist as a directory.
12282 + if test "X$additional_libdir" != "X/usr/lib"; then
12283 + haveit=
12284 + if test "X$additional_libdir" = "X/usr/local/lib"; then
12285 + if test -n "$GCC"; then
12286 + case $host_os in
12287 + linux*) haveit=yes;;
12288 + esac
12289 + fi
12290 + fi
12291 + if test -z "$haveit"; then
12292 + haveit=
12293 + for x in $LDFLAGS $LIB[]NAME; do
12294 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12295 + if test "X$x" = "X-L$additional_libdir"; then
12296 + haveit=yes
12297 + break
12298 + fi
12299 + done
12300 + if test -z "$haveit"; then
12301 + if test -d "$additional_libdir"; then
12302 + dnl Really add $additional_libdir to $LIBNAME.
12303 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
12304 + fi
12305 + fi
12306 + haveit=
12307 + for x in $LDFLAGS $LTLIB[]NAME; do
12308 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12309 + if test "X$x" = "X-L$additional_libdir"; then
12310 + haveit=yes
12311 + break
12312 + fi
12313 + done
12314 + if test -z "$haveit"; then
12315 + if test -d "$additional_libdir"; then
12316 + dnl Really add $additional_libdir to $LTLIBNAME.
12317 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
12318 + fi
12319 + fi
12320 + fi
12321 + fi
12322 + ;;
12323 + -R*)
12324 + dir=`echo "X$dep" | sed -e 's/^X-R//'`
12325 + if test "$enable_rpath" != no; then
12326 + dnl Potentially add DIR to rpathdirs.
12327 + dnl The rpathdirs will be appended to $LIBNAME at the end.
12328 + haveit=
12329 + for x in $rpathdirs; do
12330 + if test "X$x" = "X$dir"; then
12331 + haveit=yes
12332 + break
12333 + fi
12334 + done
12335 + if test -z "$haveit"; then
12336 + rpathdirs="$rpathdirs $dir"
12337 + fi
12338 + dnl Potentially add DIR to ltrpathdirs.
12339 + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
12340 + haveit=
12341 + for x in $ltrpathdirs; do
12342 + if test "X$x" = "X$dir"; then
12343 + haveit=yes
12344 + break
12345 + fi
12346 + done
12347 + if test -z "$haveit"; then
12348 + ltrpathdirs="$ltrpathdirs $dir"
12349 + fi
12350 + fi
12351 + ;;
12352 + -l*)
12353 + dnl Handle this in the next round.
12354 + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
12355 + ;;
12356 + *.la)
12357 + dnl Handle this in the next round. Throw away the .la's
12358 + dnl directory; it is already contained in a preceding -L
12359 + dnl option.
12360 + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
12361 + ;;
12362 + *)
12363 + dnl Most likely an immediate library name.
12364 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
12365 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
12366 + ;;
12367 + esac
12368 + done
12369 + fi
12370 + else
12371 + dnl Didn't find the library; assume it is in the system directories
12372 + dnl known to the linker and runtime loader. (All the system
12373 + dnl directories known to the linker should also be known to the
12374 + dnl runtime loader, otherwise the system is severely misconfigured.)
12375 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
12376 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
12377 + fi
12378 + fi
12379 + fi
12380 + done
12381 + done
12382 + if test "X$rpathdirs" != "X"; then
12383 + if test -n "$hardcode_libdir_separator"; then
12384 + dnl Weird platform: only the last -rpath option counts, the user must
12385 + dnl pass all path elements in one option. We can arrange that for a
12386 + dnl single library, but not when more than one $LIBNAMEs are used.
12387 + alldirs=
12388 + for found_dir in $rpathdirs; do
12389 + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
12390 + done
12391 + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
12392 + acl_save_libdir="$libdir"
12393 + libdir="$alldirs"
12394 + eval flag=\"$hardcode_libdir_flag_spec\"
12395 + libdir="$acl_save_libdir"
12396 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
12397 + else
12398 + dnl The -rpath options are cumulative.
12399 + for found_dir in $rpathdirs; do
12400 + acl_save_libdir="$libdir"
12401 + libdir="$found_dir"
12402 + eval flag=\"$hardcode_libdir_flag_spec\"
12403 + libdir="$acl_save_libdir"
12404 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
12405 + done
12406 + fi
12407 + fi
12408 + if test "X$ltrpathdirs" != "X"; then
12409 + dnl When using libtool, the option that works for both libraries and
12410 + dnl executables is -R. The -R options are cumulative.
12411 + for found_dir in $ltrpathdirs; do
12412 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
12413 + done
12414 + fi
12415 +])
12416 +
12417 +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
12418 +dnl unless already present in VAR.
12419 +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
12420 +dnl contains two or three consecutive elements that belong together.
12421 +AC_DEFUN([AC_LIB_APPENDTOVAR],
12422 +[
12423 + for element in [$2]; do
12424 + haveit=
12425 + for x in $[$1]; do
12426 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12427 + if test "X$x" = "X$element"; then
12428 + haveit=yes
12429 + break
12430 + fi
12431 + done
12432 + if test -z "$haveit"; then
12433 + [$1]="${[$1]}${[$1]:+ }$element"
12434 + fi
12435 + done
12436 +])
12437 --- /dev/null
12438 +++ lxpanel-0.5.6/m4/intmax.m4
12439 @@ -0,0 +1,32 @@
12440 +# intmax.m4 serial 1 (gettext-0.12)
12441 +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
12442 +dnl This file is free software, distributed under the terms of the GNU
12443 +dnl General Public License. As a special exception to the GNU General
12444 +dnl Public License, this file may be distributed as part of a program
12445 +dnl that contains a configuration script generated by Autoconf, under
12446 +dnl the same distribution terms as the rest of that program.
12447 +
12448 +dnl From Bruno Haible.
12449 +dnl Test whether the system has the 'intmax_t' type, but don't attempt to
12450 +dnl find a replacement if it is lacking.
12451 +
12452 +AC_DEFUN([gt_TYPE_INTMAX_T],
12453 +[
12454 + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
12455 + AC_REQUIRE([jm_AC_HEADER_STDINT_H])
12456 + AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
12457 + [AC_TRY_COMPILE([
12458 +#include <stddef.h>
12459 +#include <stdlib.h>
12460 +#if HAVE_STDINT_H_WITH_UINTMAX
12461 +#include <stdint.h>
12462 +#endif
12463 +#if HAVE_INTTYPES_H_WITH_UINTMAX
12464 +#include <inttypes.h>
12465 +#endif
12466 +], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
12467 + if test $gt_cv_c_intmax_t = yes; then
12468 + AC_DEFINE(HAVE_INTMAX_T, 1,
12469 + [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
12470 + fi
12471 +])
12472 --- /dev/null
12473 +++ lxpanel-0.5.6/m4/lib-ld.m4
12474 @@ -0,0 +1,112 @@
12475 +# lib-ld.m4 serial 3 (gettext-0.13)
12476 +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
12477 +dnl This file is free software, distributed under the terms of the GNU
12478 +dnl General Public License. As a special exception to the GNU General
12479 +dnl Public License, this file may be distributed as part of a program
12480 +dnl that contains a configuration script generated by Autoconf, under
12481 +dnl the same distribution terms as the rest of that program.
12482 +
12483 +dnl Subroutines of libtool.m4,
12484 +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
12485 +dnl with libtool.m4.
12486 +
12487 +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
12488 +AC_DEFUN([AC_LIB_PROG_LD_GNU],
12489 +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
12490 +[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
12491 +case `$LD -v 2>&1 </dev/null` in
12492 +*GNU* | *'with BFD'*)
12493 + acl_cv_prog_gnu_ld=yes ;;
12494 +*)
12495 + acl_cv_prog_gnu_ld=no ;;
12496 +esac])
12497 +with_gnu_ld=$acl_cv_prog_gnu_ld
12498 +])
12499 +
12500 +dnl From libtool-1.4. Sets the variable LD.
12501 +AC_DEFUN([AC_LIB_PROG_LD],
12502 +[AC_ARG_WITH(gnu-ld,
12503 +[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
12504 +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
12505 +AC_REQUIRE([AC_PROG_CC])dnl
12506 +AC_REQUIRE([AC_CANONICAL_HOST])dnl
12507 +# Prepare PATH_SEPARATOR.
12508 +# The user is always right.
12509 +if test "${PATH_SEPARATOR+set}" != set; then
12510 + echo "#! /bin/sh" >conf$$.sh
12511 + echo "exit 0" >>conf$$.sh
12512 + chmod +x conf$$.sh
12513 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
12514 + PATH_SEPARATOR=';'
12515 + else
12516 + PATH_SEPARATOR=:
12517 + fi
12518 + rm -f conf$$.sh
12519 +fi
12520 +ac_prog=ld
12521 +if test "$GCC" = yes; then
12522 + # Check if gcc -print-prog-name=ld gives a path.
12523 + AC_MSG_CHECKING([for ld used by GCC])
12524 + case $host in
12525 + *-*-mingw*)
12526 + # gcc leaves a trailing carriage return which upsets mingw
12527 + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
12528 + *)
12529 + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
12530 + esac
12531 + case $ac_prog in
12532 + # Accept absolute paths.
12533 + [[\\/]* | [A-Za-z]:[\\/]*)]
12534 + [re_direlt='/[^/][^/]*/\.\./']
12535 + # Canonicalize the path of ld
12536 + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
12537 + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
12538 + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
12539 + done
12540 + test -z "$LD" && LD="$ac_prog"
12541 + ;;
12542 + "")
12543 + # If it fails, then pretend we aren't using GCC.
12544 + ac_prog=ld
12545 + ;;
12546 + *)
12547 + # If it is relative, then search for the first ld in PATH.
12548 + with_gnu_ld=unknown
12549 + ;;
12550 + esac
12551 +elif test "$with_gnu_ld" = yes; then
12552 + AC_MSG_CHECKING([for GNU ld])
12553 +else
12554 + AC_MSG_CHECKING([for non-GNU ld])
12555 +fi
12556 +AC_CACHE_VAL(acl_cv_path_LD,
12557 +[if test -z "$LD"; then
12558 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
12559 + for ac_dir in $PATH; do
12560 + test -z "$ac_dir" && ac_dir=.
12561 + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
12562 + acl_cv_path_LD="$ac_dir/$ac_prog"
12563 + # Check to see if the program is GNU ld. I'd rather use --version,
12564 + # but apparently some GNU ld's only accept -v.
12565 + # Break only if it was the GNU/non-GNU ld that we prefer.
12566 + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
12567 + *GNU* | *'with BFD'*)
12568 + test "$with_gnu_ld" != no && break ;;
12569 + *)
12570 + test "$with_gnu_ld" != yes && break ;;
12571 + esac
12572 + fi
12573 + done
12574 + IFS="$ac_save_ifs"
12575 +else
12576 + acl_cv_path_LD="$LD" # Let the user override the test with a path.
12577 +fi])
12578 +LD="$acl_cv_path_LD"
12579 +if test -n "$LD"; then
12580 + AC_MSG_RESULT($LD)
12581 +else
12582 + AC_MSG_RESULT(no)
12583 +fi
12584 +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
12585 +AC_LIB_PROG_LD_GNU
12586 +])
12587 --- /dev/null
12588 +++ lxpanel-0.5.6/m4/iconv.m4
12589 @@ -0,0 +1,103 @@
12590 +# iconv.m4 serial AM4 (gettext-0.11.3)
12591 +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
12592 +dnl This file is free software, distributed under the terms of the GNU
12593 +dnl General Public License. As a special exception to the GNU General
12594 +dnl Public License, this file may be distributed as part of a program
12595 +dnl that contains a configuration script generated by Autoconf, under
12596 +dnl the same distribution terms as the rest of that program.
12597 +
12598 +dnl From Bruno Haible.
12599 +
12600 +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
12601 +[
12602 + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
12603 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
12604 + AC_REQUIRE([AC_LIB_RPATH])
12605 +
12606 + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
12607 + dnl accordingly.
12608 + AC_LIB_LINKFLAGS_BODY([iconv])
12609 +])
12610 +
12611 +AC_DEFUN([AM_ICONV_LINK],
12612 +[
12613 + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
12614 + dnl those with the standalone portable GNU libiconv installed).
12615 +
12616 + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
12617 + dnl accordingly.
12618 + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
12619 +
12620 + dnl Add $INCICONV to CPPFLAGS before performing the following checks,
12621 + dnl because if the user has installed libiconv and not disabled its use
12622 + dnl via --without-libiconv-prefix, he wants to use it. The first
12623 + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
12624 + am_save_CPPFLAGS="$CPPFLAGS"
12625 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
12626 +
12627 + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
12628 + am_cv_func_iconv="no, consider installing GNU libiconv"
12629 + am_cv_lib_iconv=no
12630 + AC_TRY_LINK([#include <stdlib.h>
12631 +#include <iconv.h>],
12632 + [iconv_t cd = iconv_open("","");
12633 + iconv(cd,NULL,NULL,NULL,NULL);
12634 + iconv_close(cd);],
12635 + am_cv_func_iconv=yes)
12636 + if test "$am_cv_func_iconv" != yes; then
12637 + am_save_LIBS="$LIBS"
12638 + LIBS="$LIBS $LIBICONV"
12639 + AC_TRY_LINK([#include <stdlib.h>
12640 +#include <iconv.h>],
12641 + [iconv_t cd = iconv_open("","");
12642 + iconv(cd,NULL,NULL,NULL,NULL);
12643 + iconv_close(cd);],
12644 + am_cv_lib_iconv=yes
12645 + am_cv_func_iconv=yes)
12646 + LIBS="$am_save_LIBS"
12647 + fi
12648 + ])
12649 + if test "$am_cv_func_iconv" = yes; then
12650 + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
12651 + fi
12652 + if test "$am_cv_lib_iconv" = yes; then
12653 + AC_MSG_CHECKING([how to link with libiconv])
12654 + AC_MSG_RESULT([$LIBICONV])
12655 + else
12656 + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
12657 + dnl either.
12658 + CPPFLAGS="$am_save_CPPFLAGS"
12659 + LIBICONV=
12660 + LTLIBICONV=
12661 + fi
12662 + AC_SUBST(LIBICONV)
12663 + AC_SUBST(LTLIBICONV)
12664 +])
12665 +
12666 +AC_DEFUN([AM_ICONV],
12667 +[
12668 + AM_ICONV_LINK
12669 + if test "$am_cv_func_iconv" = yes; then
12670 + AC_MSG_CHECKING([for iconv declaration])
12671 + AC_CACHE_VAL(am_cv_proto_iconv, [
12672 + AC_TRY_COMPILE([
12673 +#include <stdlib.h>
12674 +#include <iconv.h>
12675 +extern
12676 +#ifdef __cplusplus
12677 +"C"
12678 +#endif
12679 +#if defined(__STDC__) || defined(__cplusplus)
12680 +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
12681 +#else
12682 +size_t iconv();
12683 +#endif
12684 +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
12685 + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
12686 + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
12687 + AC_MSG_RESULT([$]{ac_t:-
12688 + }[$]am_cv_proto_iconv)
12689 + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
12690 + [Define as const if the declaration of iconv() needs const.])
12691 + fi
12692 +])
12693 --- /dev/null
12694 +++ lxpanel-0.5.6/m4/lib-prefix.m4
12695 @@ -0,0 +1,155 @@
12696 +# lib-prefix.m4 serial 3 (gettext-0.13)
12697 +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
12698 +dnl This file is free software, distributed under the terms of the GNU
12699 +dnl General Public License. As a special exception to the GNU General
12700 +dnl Public License, this file may be distributed as part of a program
12701 +dnl that contains a configuration script generated by Autoconf, under
12702 +dnl the same distribution terms as the rest of that program.
12703 +
12704 +dnl From Bruno Haible.
12705 +
12706 +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
12707 +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
12708 +dnl require excessive bracketing.
12709 +ifdef([AC_HELP_STRING],
12710 +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
12711 +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
12712 +
12713 +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
12714 +dnl to access previously installed libraries. The basic assumption is that
12715 +dnl a user will want packages to use other packages he previously installed
12716 +dnl with the same --prefix option.
12717 +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
12718 +dnl libraries, but is otherwise very convenient.
12719 +AC_DEFUN([AC_LIB_PREFIX],
12720 +[
12721 + AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
12722 + AC_REQUIRE([AC_PROG_CC])
12723 + AC_REQUIRE([AC_CANONICAL_HOST])
12724 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
12725 + dnl By default, look in $includedir and $libdir.
12726 + use_additional=yes
12727 + AC_LIB_WITH_FINAL_PREFIX([
12728 + eval additional_includedir=\"$includedir\"
12729 + eval additional_libdir=\"$libdir\"
12730 + ])
12731 + AC_LIB_ARG_WITH([lib-prefix],
12732 +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
12733 + --without-lib-prefix don't search for libraries in includedir and libdir],
12734 +[
12735 + if test "X$withval" = "Xno"; then
12736 + use_additional=no
12737 + else
12738 + if test "X$withval" = "X"; then
12739 + AC_LIB_WITH_FINAL_PREFIX([
12740 + eval additional_includedir=\"$includedir\"
12741 + eval additional_libdir=\"$libdir\"
12742 + ])
12743 + else
12744 + additional_includedir="$withval/include"
12745 + additional_libdir="$withval/lib"
12746 + fi
12747 + fi
12748 +])
12749 + if test $use_additional = yes; then
12750 + dnl Potentially add $additional_includedir to $CPPFLAGS.
12751 + dnl But don't add it
12752 + dnl 1. if it's the standard /usr/include,
12753 + dnl 2. if it's already present in $CPPFLAGS,
12754 + dnl 3. if it's /usr/local/include and we are using GCC on Linux,
12755 + dnl 4. if it doesn't exist as a directory.
12756 + if test "X$additional_includedir" != "X/usr/include"; then
12757 + haveit=
12758 + for x in $CPPFLAGS; do
12759 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12760 + if test "X$x" = "X-I$additional_includedir"; then
12761 + haveit=yes
12762 + break
12763 + fi
12764 + done
12765 + if test -z "$haveit"; then
12766 + if test "X$additional_includedir" = "X/usr/local/include"; then
12767 + if test -n "$GCC"; then
12768 + case $host_os in
12769 + linux*) haveit=yes;;
12770 + esac
12771 + fi
12772 + fi
12773 + if test -z "$haveit"; then
12774 + if test -d "$additional_includedir"; then
12775 + dnl Really add $additional_includedir to $CPPFLAGS.
12776 + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
12777 + fi
12778 + fi
12779 + fi
12780 + fi
12781 + dnl Potentially add $additional_libdir to $LDFLAGS.
12782 + dnl But don't add it
12783 + dnl 1. if it's the standard /usr/lib,
12784 + dnl 2. if it's already present in $LDFLAGS,
12785 + dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
12786 + dnl 4. if it doesn't exist as a directory.
12787 + if test "X$additional_libdir" != "X/usr/lib"; then
12788 + haveit=
12789 + for x in $LDFLAGS; do
12790 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
12791 + if test "X$x" = "X-L$additional_libdir"; then
12792 + haveit=yes
12793 + break
12794 + fi
12795 + done
12796 + if test -z "$haveit"; then
12797 + if test "X$additional_libdir" = "X/usr/local/lib"; then
12798 + if test -n "$GCC"; then
12799 + case $host_os in
12800 + linux*) haveit=yes;;
12801 + esac
12802 + fi
12803 + fi
12804 + if test -z "$haveit"; then
12805 + if test -d "$additional_libdir"; then
12806 + dnl Really add $additional_libdir to $LDFLAGS.
12807 + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
12808 + fi
12809 + fi
12810 + fi
12811 + fi
12812 + fi
12813 +])
12814 +
12815 +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
12816 +dnl acl_final_exec_prefix, containing the values to which $prefix and
12817 +dnl $exec_prefix will expand at the end of the configure script.
12818 +AC_DEFUN([AC_LIB_PREPARE_PREFIX],
12819 +[
12820 + dnl Unfortunately, prefix and exec_prefix get only finally determined
12821 + dnl at the end of configure.
12822 + if test "X$prefix" = "XNONE"; then
12823 + acl_final_prefix="$ac_default_prefix"
12824 + else
12825 + acl_final_prefix="$prefix"
12826 + fi
12827 + if test "X$exec_prefix" = "XNONE"; then
12828 + acl_final_exec_prefix='${prefix}'
12829 + else
12830 + acl_final_exec_prefix="$exec_prefix"
12831 + fi
12832 + acl_save_prefix="$prefix"
12833 + prefix="$acl_final_prefix"
12834 + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
12835 + prefix="$acl_save_prefix"
12836 +])
12837 +
12838 +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
12839 +dnl variables prefix and exec_prefix bound to the values they will have
12840 +dnl at the end of the configure script.
12841 +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
12842 +[
12843 + acl_save_prefix="$prefix"
12844 + prefix="$acl_final_prefix"
12845 + acl_save_exec_prefix="$exec_prefix"
12846 + exec_prefix="$acl_final_exec_prefix"
12847 + $1
12848 + exec_prefix="$acl_save_exec_prefix"
12849 + prefix="$acl_save_prefix"
12850 +])
12851 --- /dev/null
12852 +++ lxpanel-0.5.6/m4/inttypes.m4
12853 @@ -0,0 +1,27 @@
12854 +# inttypes.m4 serial 1 (gettext-0.11.4)
12855 +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
12856 +dnl This file is free software, distributed under the terms of the GNU
12857 +dnl General Public License. As a special exception to the GNU General
12858 +dnl Public License, this file may be distributed as part of a program
12859 +dnl that contains a configuration script generated by Autoconf, under
12860 +dnl the same distribution terms as the rest of that program.
12861 +
12862 +dnl From Paul Eggert.
12863 +
12864 +# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
12865 +# <sys/types.h>.
12866 +
12867 +AC_DEFUN([gt_HEADER_INTTYPES_H],
12868 +[
12869 + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
12870 + [
12871 + AC_TRY_COMPILE(
12872 + [#include <sys/types.h>
12873 +#include <inttypes.h>],
12874 + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
12875 + ])
12876 + if test $gt_cv_header_inttypes_h = yes; then
12877 + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
12878 + [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
12879 + fi
12880 +])
12881 --- /dev/null
12882 +++ lxpanel-0.5.6/m4/nls.m4
12883 @@ -0,0 +1,49 @@
12884 +# nls.m4 serial 1 (gettext-0.12)
12885 +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
12886 +dnl This file is free software, distributed under the terms of the GNU
12887 +dnl General Public License. As a special exception to the GNU General
12888 +dnl Public License, this file may be distributed as part of a program
12889 +dnl that contains a configuration script generated by Autoconf, under
12890 +dnl the same distribution terms as the rest of that program.
12891 +dnl
12892 +dnl This file can can be used in projects which are not available under
12893 +dnl the GNU General Public License or the GNU Library General Public
12894 +dnl License but which still want to provide support for the GNU gettext
12895 +dnl functionality.
12896 +dnl Please note that the actual code of the GNU gettext library is covered
12897 +dnl by the GNU Library General Public License, and the rest of the GNU
12898 +dnl gettext package package is covered by the GNU General Public License.
12899 +dnl They are *not* in the public domain.
12900 +
12901 +dnl Authors:
12902 +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
12903 +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
12904 +
12905 +AC_DEFUN([AM_NLS],
12906 +[
12907 + AC_MSG_CHECKING([whether NLS is requested])
12908 + dnl Default is enabled NLS
12909 + AC_ARG_ENABLE(nls,
12910 + [ --disable-nls do not use Native Language Support],
12911 + USE_NLS=$enableval, USE_NLS=yes)
12912 + AC_MSG_RESULT($USE_NLS)
12913 + AC_SUBST(USE_NLS)
12914 +])
12915 +
12916 +AC_DEFUN([AM_MKINSTALLDIRS],
12917 +[
12918 + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
12919 + dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
12920 + dnl Try to locate it.
12921 + MKINSTALLDIRS=
12922 + if test -n "$ac_aux_dir"; then
12923 + case "$ac_aux_dir" in
12924 + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
12925 + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
12926 + esac
12927 + fi
12928 + if test -z "$MKINSTALLDIRS"; then
12929 + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
12930 + fi
12931 + AC_SUBST(MKINSTALLDIRS)
12932 +])
12933 --- /dev/null
12934 +++ lxpanel-0.5.6/m4/lcmessage.m4
12935 @@ -0,0 +1,32 @@
12936 +# lcmessage.m4 serial 3 (gettext-0.11.3)
12937 +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
12938 +dnl This file is free software, distributed under the terms of the GNU
12939 +dnl General Public License. As a special exception to the GNU General
12940 +dnl Public License, this file may be distributed as part of a program
12941 +dnl that contains a configuration script generated by Autoconf, under
12942 +dnl the same distribution terms as the rest of that program.
12943 +dnl
12944 +dnl This file can can be used in projects which are not available under
12945 +dnl the GNU General Public License or the GNU Library General Public
12946 +dnl License but which still want to provide support for the GNU gettext
12947 +dnl functionality.
12948 +dnl Please note that the actual code of the GNU gettext library is covered
12949 +dnl by the GNU Library General Public License, and the rest of the GNU
12950 +dnl gettext package package is covered by the GNU General Public License.
12951 +dnl They are *not* in the public domain.
12952 +
12953 +dnl Authors:
12954 +dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
12955 +
12956 +# Check whether LC_MESSAGES is available in <locale.h>.
12957 +
12958 +AC_DEFUN([AM_LC_MESSAGES],
12959 +[
12960 + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
12961 + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
12962 + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
12963 + if test $am_cv_val_LC_MESSAGES = yes; then
12964 + AC_DEFINE(HAVE_LC_MESSAGES, 1,
12965 + [Define if your <locale.h> file defines LC_MESSAGES.])
12966 + fi
12967 +])
12968 --- /dev/null
12969 +++ lxpanel-0.5.6/m4/longlong.m4
12970 @@ -0,0 +1,25 @@
12971 +# longlong.m4 serial 4
12972 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
12973 +dnl This file is free software, distributed under the terms of the GNU
12974 +dnl General Public License. As a special exception to the GNU General
12975 +dnl Public License, this file may be distributed as part of a program
12976 +dnl that contains a configuration script generated by Autoconf, under
12977 +dnl the same distribution terms as the rest of that program.
12978 +
12979 +dnl From Paul Eggert.
12980 +
12981 +# Define HAVE_LONG_LONG if 'long long' works.
12982 +
12983 +AC_DEFUN([jm_AC_TYPE_LONG_LONG],
12984 +[
12985 + AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
12986 + [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
12987 + [long long llmax = (long long) -1;
12988 + return ll << i | ll >> i | llmax / ll | llmax % ll;],
12989 + ac_cv_type_long_long=yes,
12990 + ac_cv_type_long_long=no)])
12991 + if test $ac_cv_type_long_long = yes; then
12992 + AC_DEFINE(HAVE_LONG_LONG, 1,
12993 + [Define if you have the 'long long' type.])
12994 + fi
12995 +])
12996 --- /dev/null
12997 +++ lxpanel-0.5.6/m4/wint_t.m4
12998 @@ -0,0 +1,22 @@
12999 +# wint_t.m4 serial 1 (gettext-0.12)
13000 +dnl Copyright (C) 2003 Free Software Foundation, Inc.
13001 +dnl This file is free software, distributed under the terms of the GNU
13002 +dnl General Public License. As a special exception to the GNU General
13003 +dnl Public License, this file may be distributed as part of a program
13004 +dnl that contains a configuration script generated by Autoconf, under
13005 +dnl the same distribution terms as the rest of that program.
13006 +
13007 +dnl From Bruno Haible.
13008 +dnl Test whether <wchar.h> has the 'wint_t' type.
13009 +dnl Prerequisite: AC_PROG_CC
13010 +
13011 +AC_DEFUN([gt_TYPE_WINT_T],
13012 +[
13013 + AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
13014 + [AC_TRY_COMPILE([#include <wchar.h>
13015 + wint_t foo = (wchar_t)'\0';], ,
13016 + gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
13017 + if test $gt_cv_c_wint_t = yes; then
13018 + AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
13019 + fi
13020 +])
13021 --- /dev/null
13022 +++ lxpanel-0.5.6/m4/glibc21.m4
13023 @@ -0,0 +1,32 @@
13024 +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
13025 +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
13026 +dnl This file is free software, distributed under the terms of the GNU
13027 +dnl General Public License. As a special exception to the GNU General
13028 +dnl Public License, this file may be distributed as part of a program
13029 +dnl that contains a configuration script generated by Autoconf, under
13030 +dnl the same distribution terms as the rest of that program.
13031 +
13032 +# Test for the GNU C Library, version 2.1 or newer.
13033 +# From Bruno Haible.
13034 +
13035 +AC_DEFUN([jm_GLIBC21],
13036 + [
13037 + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
13038 + ac_cv_gnu_library_2_1,
13039 + [AC_EGREP_CPP([Lucky GNU user],
13040 + [
13041 +#include <features.h>
13042 +#ifdef __GNU_LIBRARY__
13043 + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
13044 + Lucky GNU user
13045 + #endif
13046 +#endif
13047 + ],
13048 + ac_cv_gnu_library_2_1=yes,
13049 + ac_cv_gnu_library_2_1=no)
13050 + ]
13051 + )
13052 + AC_SUBST(GLIBC21)
13053 + GLIBC21="$ac_cv_gnu_library_2_1"
13054 + ]
13055 +)
13056 --- /dev/null
13057 +++ lxpanel-0.5.6/m4/ulonglong.m4
13058 @@ -0,0 +1,25 @@
13059 +# ulonglong.m4 serial 3
13060 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
13061 +dnl This file is free software, distributed under the terms of the GNU
13062 +dnl General Public License. As a special exception to the GNU General
13063 +dnl Public License, this file may be distributed as part of a program
13064 +dnl that contains a configuration script generated by Autoconf, under
13065 +dnl the same distribution terms as the rest of that program.
13066 +
13067 +dnl From Paul Eggert.
13068 +
13069 +# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
13070 +
13071 +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
13072 +[
13073 + AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
13074 + [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
13075 + [unsigned long long ullmax = (unsigned long long) -1;
13076 + return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
13077 + ac_cv_type_unsigned_long_long=yes,
13078 + ac_cv_type_unsigned_long_long=no)])
13079 + if test $ac_cv_type_unsigned_long_long = yes; then
13080 + AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
13081 + [Define if you have the 'unsigned long long' type.])
13082 + fi
13083 +])
13084 --- /dev/null
13085 +++ lxpanel-0.5.6/m4/intdiv0.m4
13086 @@ -0,0 +1,72 @@
13087 +# intdiv0.m4 serial 1 (gettext-0.11.3)
13088 +dnl Copyright (C) 2002 Free Software Foundation, Inc.
13089 +dnl This file is free software, distributed under the terms of the GNU
13090 +dnl General Public License. As a special exception to the GNU General
13091 +dnl Public License, this file may be distributed as part of a program
13092 +dnl that contains a configuration script generated by Autoconf, under
13093 +dnl the same distribution terms as the rest of that program.
13094 +
13095 +dnl From Bruno Haible.
13096 +
13097 +AC_DEFUN([gt_INTDIV0],
13098 +[
13099 + AC_REQUIRE([AC_PROG_CC])dnl
13100 + AC_REQUIRE([AC_CANONICAL_HOST])dnl
13101 +
13102 + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
13103 + gt_cv_int_divbyzero_sigfpe,
13104 + [
13105 + AC_TRY_RUN([
13106 +#include <stdlib.h>
13107 +#include <signal.h>
13108 +
13109 +static void
13110 +#ifdef __cplusplus
13111 +sigfpe_handler (int sig)
13112 +#else
13113 +sigfpe_handler (sig) int sig;
13114 +#endif
13115 +{
13116 + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
13117 + exit (sig != SIGFPE);
13118 +}
13119 +
13120 +int x = 1;
13121 +int y = 0;
13122 +int z;
13123 +int nan;
13124 +
13125 +int main ()
13126 +{
13127 + signal (SIGFPE, sigfpe_handler);
13128 +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
13129 +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
13130 + signal (SIGTRAP, sigfpe_handler);
13131 +#endif
13132 +/* Linux/SPARC yields signal SIGILL. */
13133 +#if defined (__sparc__) && defined (__linux__)
13134 + signal (SIGILL, sigfpe_handler);
13135 +#endif
13136 +
13137 + z = x / y;
13138 + nan = y / y;
13139 + exit (1);
13140 +}
13141 +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
13142 + [
13143 + # Guess based on the CPU.
13144 + case "$host_cpu" in
13145 + alpha* | i[34567]86 | m68k | s390*)
13146 + gt_cv_int_divbyzero_sigfpe="guessing yes";;
13147 + *)
13148 + gt_cv_int_divbyzero_sigfpe="guessing no";;
13149 + esac
13150 + ])
13151 + ])
13152 + case "$gt_cv_int_divbyzero_sigfpe" in
13153 + *yes) value=1;;
13154 + *) value=0;;
13155 + esac
13156 + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
13157 + [Define if integer division by zero raises signal SIGFPE.])
13158 +])
13159 --- /dev/null
13160 +++ lxpanel-0.5.6/m4/uintmax_t.m4
13161 @@ -0,0 +1,32 @@
13162 +# uintmax_t.m4 serial 7 (gettext-0.12)
13163 +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
13164 +dnl This file is free software, distributed under the terms of the GNU
13165 +dnl General Public License. As a special exception to the GNU General
13166 +dnl Public License, this file may be distributed as part of a program
13167 +dnl that contains a configuration script generated by Autoconf, under
13168 +dnl the same distribution terms as the rest of that program.
13169 +
13170 +dnl From Paul Eggert.
13171 +
13172 +AC_PREREQ(2.13)
13173 +
13174 +# Define uintmax_t to 'unsigned long' or 'unsigned long long'
13175 +# if it is not already defined in <stdint.h> or <inttypes.h>.
13176 +
13177 +AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
13178 +[
13179 + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
13180 + AC_REQUIRE([jm_AC_HEADER_STDINT_H])
13181 + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
13182 + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
13183 + test $ac_cv_type_unsigned_long_long = yes \
13184 + && ac_type='unsigned long long' \
13185 + || ac_type='unsigned long'
13186 + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
13187 + [Define to unsigned long or unsigned long long
13188 + if <stdint.h> and <inttypes.h> don't define.])
13189 + else
13190 + AC_DEFINE(HAVE_UINTMAX_T, 1,
13191 + [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
13192 + fi
13193 +])
13194 --- /dev/null
13195 +++ lxpanel-0.5.6/m4/printf-posix.m4
13196 @@ -0,0 +1,46 @@
13197 +# printf-posix.m4 serial 2 (gettext-0.13.1)
13198 +dnl Copyright (C) 2003 Free Software Foundation, Inc.
13199 +dnl This file is free software, distributed under the terms of the GNU
13200 +dnl General Public License. As a special exception to the GNU General
13201 +dnl Public License, this file may be distributed as part of a program
13202 +dnl that contains a configuration script generated by Autoconf, under
13203 +dnl the same distribution terms as the rest of that program.
13204 +
13205 +dnl From Bruno Haible.
13206 +dnl Test whether the printf() function supports POSIX/XSI format strings with
13207 +dnl positions.
13208 +
13209 +AC_DEFUN([gt_PRINTF_POSIX],
13210 +[
13211 + AC_REQUIRE([AC_PROG_CC])
13212 + AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
13213 + gt_cv_func_printf_posix,
13214 + [
13215 + AC_TRY_RUN([
13216 +#include <stdio.h>
13217 +#include <string.h>
13218 +/* The string "%2$d %1$d", with dollar characters protected from the shell's
13219 + dollar expansion (possibly an autoconf bug). */
13220 +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
13221 +static char buf[100];
13222 +int main ()
13223 +{
13224 + sprintf (buf, format, 33, 55);
13225 + return (strcmp (buf, "55 33") != 0);
13226 +}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
13227 + [
13228 + AC_EGREP_CPP(notposix, [
13229 +#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
13230 + notposix
13231 +#endif
13232 + ], gt_cv_func_printf_posix="guessing no",
13233 + gt_cv_func_printf_posix="guessing yes")
13234 + ])
13235 + ])
13236 + case $gt_cv_func_printf_posix in
13237 + *yes)
13238 + AC_DEFINE(HAVE_POSIX_PRINTF, 1,
13239 + [Define if your printf() function supports format strings with positions.])
13240 + ;;
13241 + esac
13242 +])
13243 --- /dev/null
13244 +++ lxpanel-0.5.6/m4/inttypes-pri.m4
13245 @@ -0,0 +1,32 @@
13246 +# inttypes-pri.m4 serial 1 (gettext-0.11.4)
13247 +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
13248 +dnl This file is free software, distributed under the terms of the GNU
13249 +dnl General Public License. As a special exception to the GNU General
13250 +dnl Public License, this file may be distributed as part of a program
13251 +dnl that contains a configuration script generated by Autoconf, under
13252 +dnl the same distribution terms as the rest of that program.
13253 +
13254 +dnl From Bruno Haible.
13255 +
13256 +# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
13257 +# macros to non-string values. This is the case on AIX 4.3.3.
13258 +
13259 +AC_DEFUN([gt_INTTYPES_PRI],
13260 +[
13261 + AC_REQUIRE([gt_HEADER_INTTYPES_H])
13262 + if test $gt_cv_header_inttypes_h = yes; then
13263 + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
13264 + gt_cv_inttypes_pri_broken,
13265 + [
13266 + AC_TRY_COMPILE([#include <inttypes.h>
13267 +#ifdef PRId32
13268 +char *p = PRId32;
13269 +#endif
13270 +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
13271 + ])
13272 + fi
13273 + if test "$gt_cv_inttypes_pri_broken" = yes; then
13274 + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
13275 + [Define if <inttypes.h> exists and defines unusable PRI* macros.])
13276 + fi
13277 +])
13278 --- /dev/null
13279 +++ lxpanel-0.5.6/intl/log.c
13280 @@ -0,0 +1,98 @@
13281 +/* Log file output.
13282 + Copyright (C) 2003 Free Software Foundation, Inc.
13283 +
13284 + This program is free software; you can redistribute it and/or modify it
13285 + under the terms of the GNU Library General Public License as published
13286 + by the Free Software Foundation; either version 2, or (at your option)
13287 + any later version.
13288 +
13289 + This program is distributed in the hope that it will be useful,
13290 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13291 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13292 + Library General Public License for more details.
13293 +
13294 + You should have received a copy of the GNU Library General Public
13295 + License along with this program; if not, write to the Free Software
13296 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
13297 + USA. */
13298 +
13299 +/* Written by Bruno Haible <bruno@clisp.org>. */
13300 +
13301 +#ifdef HAVE_CONFIG_H
13302 +# include <config.h>
13303 +#endif
13304 +
13305 +#include <stdio.h>
13306 +#include <stdlib.h>
13307 +#include <string.h>
13308 +
13309 +/* Print an ASCII string with quotes and escape sequences where needed. */
13310 +static void
13311 +print_escaped (FILE *stream, const char *str)
13312 +{
13313 + putc ('"', stream);
13314 + for (; *str != '\0'; str++)
13315 + if (*str == '\n')
13316 + {
13317 + fputs ("\\n\"", stream);
13318 + if (str[1] == '\0')
13319 + return;
13320 + fputs ("\n\"", stream);
13321 + }
13322 + else
13323 + {
13324 + if (*str == '"' || *str == '\\')
13325 + putc ('\\', stream);
13326 + putc (*str, stream);
13327 + }
13328 + putc ('"', stream);
13329 +}
13330 +
13331 +/* Add to the log file an entry denoting a failed translation. */
13332 +void
13333 +_nl_log_untranslated (const char *logfilename, const char *domainname,
13334 + const char *msgid1, const char *msgid2, int plural)
13335 +{
13336 + static char *last_logfilename = NULL;
13337 + static FILE *last_logfile = NULL;
13338 + FILE *logfile;
13339 +
13340 + /* Can we reuse the last opened logfile? */
13341 + if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
13342 + {
13343 + /* Close the last used logfile. */
13344 + if (last_logfilename != NULL)
13345 + {
13346 + if (last_logfile != NULL)
13347 + {
13348 + fclose (last_logfile);
13349 + last_logfile = NULL;
13350 + }
13351 + free (last_logfilename);
13352 + last_logfilename = NULL;
13353 + }
13354 + /* Open the logfile. */
13355 + last_logfilename = (char *) malloc (strlen (logfilename) + 1);
13356 + if (last_logfilename == NULL)
13357 + return;
13358 + strcpy (last_logfilename, logfilename);
13359 + last_logfile = fopen (logfilename, "a");
13360 + if (last_logfile == NULL)
13361 + return;
13362 + }
13363 + logfile = last_logfile;
13364 +
13365 + fprintf (logfile, "domain ");
13366 + print_escaped (logfile, domainname);
13367 + fprintf (logfile, "\nmsgid ");
13368 + print_escaped (logfile, msgid1);
13369 + if (plural)
13370 + {
13371 + fprintf (logfile, "\nmsgid_plural ");
13372 + print_escaped (logfile, msgid2);
13373 + fprintf (logfile, "\nmsgstr[0] \"\"\n");
13374 + }
13375 + else
13376 + fprintf (logfile, "\nmsgstr \"\"\n");
13377 + putc ('\n', logfile);
13378 +}
13379 --- /dev/null
13380 +++ lxpanel-0.5.6/intl/eval-plural.h
13381 @@ -0,0 +1,108 @@
13382 +/* Plural expression evaluation.
13383 + Copyright (C) 2000-2003 Free Software Foundation, Inc.
13384 +
13385 + This program is free software; you can redistribute it and/or modify it
13386 + under the terms of the GNU Library General Public License as published
13387 + by the Free Software Foundation; either version 2, or (at your option)
13388 + any later version.
13389 +
13390 + This program is distributed in the hope that it will be useful,
13391 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13392 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13393 + Library General Public License for more details.
13394 +
13395 + You should have received a copy of the GNU Library General Public
13396 + License along with this program; if not, write to the Free Software
13397 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
13398 + USA. */
13399 +
13400 +#ifndef STATIC
13401 +#define STATIC static
13402 +#endif
13403 +
13404 +/* Evaluate the plural expression and return an index value. */
13405 +STATIC
13406 +unsigned long int
13407 +internal_function
13408 +plural_eval (struct expression *pexp, unsigned long int n)
13409 +{
13410 + switch (pexp->nargs)
13411 + {
13412 + case 0:
13413 + switch (pexp->operation)
13414 + {
13415 + case var:
13416 + return n;
13417 + case num:
13418 + return pexp->val.num;
13419 + default:
13420 + break;
13421 + }
13422 + /* NOTREACHED */
13423 + break;
13424 + case 1:
13425 + {
13426 + /* pexp->operation must be lnot. */
13427 + unsigned long int arg = plural_eval (pexp->val.args[0], n);
13428 + return ! arg;
13429 + }
13430 + case 2:
13431 + {
13432 + unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
13433 + if (pexp->operation == lor)
13434 + return leftarg || plural_eval (pexp->val.args[1], n);
13435 + else if (pexp->operation == land)
13436 + return leftarg && plural_eval (pexp->val.args[1], n);
13437 + else
13438 + {
13439 + unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
13440 +
13441 + switch (pexp->operation)
13442 + {
13443 + case mult:
13444 + return leftarg * rightarg;
13445 + case divide:
13446 +#if !INTDIV0_RAISES_SIGFPE
13447 + if (rightarg == 0)
13448 + raise (SIGFPE);
13449 +#endif
13450 + return leftarg / rightarg;
13451 + case module:
13452 +#if !INTDIV0_RAISES_SIGFPE
13453 + if (rightarg == 0)
13454 + raise (SIGFPE);
13455 +#endif
13456 + return leftarg % rightarg;
13457 + case plus:
13458 + return leftarg + rightarg;
13459 + case minus:
13460 + return leftarg - rightarg;
13461 + case less_than:
13462 + return leftarg < rightarg;
13463 + case greater_than:
13464 + return leftarg > rightarg;
13465 + case less_or_equal:
13466 + return leftarg <= rightarg;
13467 + case greater_or_equal:
13468 + return leftarg >= rightarg;
13469 + case equal:
13470 + return leftarg == rightarg;
13471 + case not_equal:
13472 + return leftarg != rightarg;
13473 + default:
13474 + break;
13475 + }
13476 + }
13477 + /* NOTREACHED */
13478 + break;
13479 + }
13480 + case 3:
13481 + {
13482 + /* pexp->operation must be qmop. */
13483 + unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
13484 + return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
13485 + }
13486 + }
13487 + /* NOTREACHED */
13488 + return 0;
13489 +}
13490 --- /dev/null
13491 +++ lxpanel-0.5.6/intl/dngettext.c
13492 @@ -0,0 +1,59 @@
13493 +/* Implementation of the dngettext(3) function.
13494 + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
13495 +
13496 + This program is free software; you can redistribute it and/or modify it
13497 + under the terms of the GNU Library General Public License as published
13498 + by the Free Software Foundation; either version 2, or (at your option)
13499 + any later version.
13500 +
13501 + This program is distributed in the hope that it will be useful,
13502 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13503 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13504 + Library General Public License for more details.
13505 +
13506 + You should have received a copy of the GNU Library General Public
13507 + License along with this program; if not, write to the Free Software
13508 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
13509 + USA. */
13510 +
13511 +#ifdef HAVE_CONFIG_H
13512 +# include <config.h>
13513 +#endif
13514 +
13515 +#include "gettextP.h"
13516 +
13517 +#include <locale.h>
13518 +
13519 +#ifdef _LIBC
13520 +# include <libintl.h>
13521 +#else
13522 +# include "libgnuintl.h"
13523 +#endif
13524 +
13525 +/* @@ end of prolog @@ */
13526 +
13527 +/* Names for the libintl functions are a problem. They must not clash
13528 + with existing names and they should follow ANSI C. But this source
13529 + code is also used in GNU C Library where the names have a __
13530 + prefix. So we have to make a difference here. */
13531 +#ifdef _LIBC
13532 +# define DNGETTEXT __dngettext
13533 +# define DCNGETTEXT __dcngettext
13534 +#else
13535 +# define DNGETTEXT libintl_dngettext
13536 +# define DCNGETTEXT libintl_dcngettext
13537 +#endif
13538 +
13539 +/* Look up MSGID in the DOMAINNAME message catalog of the current
13540 + LC_MESSAGES locale and skip message according to the plural form. */
13541 +char *
13542 +DNGETTEXT (const char *domainname,
13543 + const char *msgid1, const char *msgid2, unsigned long int n)
13544 +{
13545 + return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
13546 +}
13547 +
13548 +#ifdef _LIBC
13549 +/* Alias for function name in GNU C Library. */
13550 +weak_alias (__dngettext, dngettext);
13551 +#endif
13552 --- /dev/null
13553 +++ lxpanel-0.5.6/intl/finddomain.c
13554 @@ -0,0 +1,192 @@
13555 +/* Handle list of needed message catalogs
13556 + Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
13557 + Written by Ulrich Drepper <drepper@gnu.org>, 1995.
13558 +
13559 + This program is free software; you can redistribute it and/or modify it
13560 + under the terms of the GNU Library General Public License as published
13561 + by the Free Software Foundation; either version 2, or (at your option)
13562 + any later version.
13563 +
13564 + This program is distributed in the hope that it will be useful,
13565 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13566 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13567 + Library General Public License for more details.
13568 +
13569 + You should have received a copy of the GNU Library General Public
13570 + License along with this program; if not, write to the Free Software
13571 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
13572 + USA. */
13573 +
13574 +#ifdef HAVE_CONFIG_H
13575 +# include <config.h>
13576 +#endif
13577 +
13578 +#include <stdio.h>
13579 +#include <sys/types.h>
13580 +#include <stdlib.h>
13581 +#include <string.h>
13582 +
13583 +#if defined HAVE_UNISTD_H || defined _LIBC
13584 +# include <unistd.h>
13585 +#endif
13586 +
13587 +#include "gettextP.h"
13588 +#ifdef _LIBC
13589 +# include <libintl.h>
13590 +#else
13591 +# include "libgnuintl.h"
13592 +#endif
13593 +
13594 +/* @@ end of prolog @@ */
13595 +/* List of already loaded domains. */
13596 +static struct loaded_l10nfile *_nl_loaded_domains;
13597 +
13598 +
13599 +/* Return a data structure describing the message catalog described by
13600 + the DOMAINNAME and CATEGORY parameters with respect to the currently
13601 + established bindings. */
13602 +struct loaded_l10nfile *
13603 +internal_function
13604 +_nl_find_domain (const char *dirname, char *locale,
13605 + const char *domainname, struct binding *domainbinding)
13606 +{
13607 + struct loaded_l10nfile *retval;
13608 + const char *language;
13609 + const char *modifier;
13610 + const char *territory;
13611 + const char *codeset;
13612 + const char *normalized_codeset;
13613 + const char *special;
13614 + const char *sponsor;
13615 + const char *revision;
13616 + const char *alias_value;
13617 + int mask;
13618 +
13619 + /* LOCALE can consist of up to four recognized parts for the XPG syntax:
13620 +
13621 + language[_territory[.codeset]][@modifier]
13622 +
13623 + and six parts for the CEN syntax:
13624 +
13625 + language[_territory][+audience][+special][,[sponsor][_revision]]
13626 +
13627 + Beside the first part all of them are allowed to be missing. If
13628 + the full specified locale is not found, the less specific one are
13629 + looked for. The various parts will be stripped off according to
13630 + the following order:
13631 + (1) revision
13632 + (2) sponsor
13633 + (3) special
13634 + (4) codeset
13635 + (5) normalized codeset
13636 + (6) territory
13637 + (7) audience/modifier
13638 + */
13639 +
13640 + /* If we have already tested for this locale entry there has to
13641 + be one data set in the list of loaded domains. */
13642 + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
13643 + strlen (dirname) + 1, 0, locale, NULL, NULL,
13644 + NULL, NULL, NULL, NULL, NULL, domainname, 0);
13645 + if (retval != NULL)
13646 + {
13647 + /* We know something about this locale. */
13648 + int cnt;
13649 +
13650 + if (retval->decided == 0)
13651 + _nl_load_domain (retval, domainbinding);
13652 +
13653 + if (retval->data != NULL)
13654 + return retval;
13655 +
13656 + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
13657 + {
13658 + if (retval->successor[cnt]->decided == 0)
13659 + _nl_load_domain (retval->successor[cnt], domainbinding);
13660 +
13661 + if (retval->successor[cnt]->data != NULL)
13662 + break;
13663 + }
13664 + return cnt >= 0 ? retval : NULL;
13665 + /* NOTREACHED */
13666 + }
13667 +
13668 + /* See whether the locale value is an alias. If yes its value
13669 + *overwrites* the alias name. No test for the original value is
13670 + done. */
13671 + alias_value = _nl_expand_alias (locale);
13672 + if (alias_value != NULL)
13673 + {
13674 +#if defined _LIBC || defined HAVE_STRDUP
13675 + locale = strdup (alias_value);
13676 + if (locale == NULL)
13677 + return NULL;
13678 +#else
13679 + size_t len = strlen (alias_value) + 1;
13680 + locale = (char *) malloc (len);
13681 + if (locale == NULL)
13682 + return NULL;
13683 +
13684 + memcpy (locale, alias_value, len);
13685 +#endif
13686 + }
13687 +
13688 + /* Now we determine the single parts of the locale name. First
13689 + look for the language. Termination symbols are `_' and `@' if
13690 + we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
13691 + mask = _nl_explode_name (locale, &language, &modifier, &territory,
13692 + &codeset, &normalized_codeset, &special,
13693 + &sponsor, &revision);
13694 +
13695 + /* Create all possible locale entries which might be interested in
13696 + generalization. */
13697 + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
13698 + strlen (dirname) + 1, mask, language, territory,
13699 + codeset, normalized_codeset, modifier, special,
13700 + sponsor, revision, domainname, 1);
13701 + if (retval == NULL)
13702 + /* This means we are out of core. */
13703 + return NULL;
13704 +
13705 + if (retval->decided == 0)
13706 + _nl_load_domain (retval, domainbinding);
13707 + if (retval->data == NULL)
13708 + {
13709 + int cnt;
13710 + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
13711 + {
13712 + if (retval->successor[cnt]->decided == 0)
13713 + _nl_load_domain (retval->successor[cnt], domainbinding);
13714 + if (retval->successor[cnt]->data != NULL)
13715 + break;
13716 + }
13717 + }
13718 +
13719 + /* The room for an alias was dynamically allocated. Free it now. */
13720 + if (alias_value != NULL)
13721 + free (locale);
13722 +
13723 + /* The space for normalized_codeset is dynamically allocated. Free it. */
13724 + if (mask & XPG_NORM_CODESET)
13725 + free ((void *) normalized_codeset);
13726 +
13727 + return retval;
13728 +}
13729 +
13730 +
13731 +#ifdef _LIBC
13732 +libc_freeres_fn (free_mem)
13733 +{
13734 + struct loaded_l10nfile *runp = _nl_loaded_domains;
13735 +
13736 + while (runp != NULL)
13737 + {
13738 + struct loaded_l10nfile *here = runp;
13739 + if (runp->data != NULL)
13740 + _nl_unload_domain ((struct loaded_domain *) runp->data);
13741 + runp = runp->next;
13742 + free ((char *) here->filename);
13743 + free (here);
13744 + }
13745 +}
13746 +#endif
13747 --- /dev/null
13748 +++ lxpanel-0.5.6/intl/dcgettext.c
13749 @@ -0,0 +1,56 @@
13750 +/* Implementation of the dcgettext(3) function.
13751 + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
13752 +
13753 + This program is free software; you can redistribute it and/or modify it
13754 + under the terms of the GNU Library General Public License as published
13755 + by the Free Software Foundation; either version 2, or (at your option)
13756 + any later version.
13757 +
13758 + This program is distributed in the hope that it will be useful,
13759 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13760 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13761 + Library General Public License for more details.
13762 +
13763 + You should have received a copy of the GNU Library General Public
13764 + License along with this program; if not, write to the Free Software
13765 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
13766 + USA. */
13767 +
13768 +#ifdef HAVE_CONFIG_H
13769 +# include <config.h>
13770 +#endif
13771 +
13772 +#include "gettextP.h"
13773 +#ifdef _LIBC
13774 +# include <libintl.h>
13775 +#else
13776 +# include "libgnuintl.h"
13777 +#endif
13778 +
13779 +/* @@ end of prolog @@ */
13780 +
13781 +/* Names for the libintl functions are a problem. They must not clash
13782 + with existing names and they should follow ANSI C. But this source
13783 + code is also used in GNU C Library where the names have a __
13784 + prefix. So we have to make a difference here. */
13785 +#ifdef _LIBC
13786 +# define DCGETTEXT __dcgettext
13787 +# define DCIGETTEXT __dcigettext
13788 +#else
13789 +# define DCGETTEXT libintl_dcgettext
13790 +# define DCIGETTEXT libintl_dcigettext
13791 +#endif
13792 +
13793 +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
13794 + locale. */
13795 +char *
13796 +DCGETTEXT (const char *domainname, const char *msgid, int category)
13797 +{
13798 + return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
13799 +}
13800 +
13801 +#ifdef _LIBC
13802 +/* Alias for function name in GNU C Library. */
13803 +INTDEF(__dcgettext)
13804 +weak_alias (__dcgettext, dcgettext);
13805 +#endif
13806 --- /dev/null
13807 +++ lxpanel-0.5.6/intl/vasnprintf.c
13808 @@ -0,0 +1,887 @@
13809 +/* vsprintf with automatic memory allocation.
13810 + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
13811 +
13812 + This program is free software; you can redistribute it and/or modify it
13813 + under the terms of the GNU Library General Public License as published
13814 + by the Free Software Foundation; either version 2, or (at your option)
13815 + any later version.
13816 +
13817 + This program is distributed in the hope that it will be useful,
13818 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13819 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13820 + Library General Public License for more details.
13821 +
13822 + You should have received a copy of the GNU Library General Public
13823 + License along with this program; if not, write to the Free Software
13824 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
13825 + USA. */
13826 +
13827 +/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
13828 + This must come before <config.h> because <config.h> may include
13829 + <features.h>, and once <features.h> has been included, it's too late. */
13830 +#ifndef _GNU_SOURCE
13831 +# define _GNU_SOURCE 1
13832 +#endif
13833 +
13834 +#ifdef HAVE_CONFIG_H
13835 +# include <config.h>
13836 +#endif
13837 +#ifndef IN_LIBINTL
13838 +# include <alloca.h>
13839 +#endif
13840 +
13841 +/* Specification. */
13842 +#if WIDE_CHAR_VERSION
13843 +# include "vasnwprintf.h"
13844 +#else
13845 +# include "vasnprintf.h"
13846 +#endif
13847 +
13848 +#include <stdio.h> /* snprintf(), sprintf() */
13849 +#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
13850 +#include <string.h> /* memcpy(), strlen() */
13851 +#include <errno.h> /* errno */
13852 +#include <limits.h> /* CHAR_BIT */
13853 +#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
13854 +#if WIDE_CHAR_VERSION
13855 +# include "wprintf-parse.h"
13856 +#else
13857 +# include "printf-parse.h"
13858 +#endif
13859 +
13860 +/* Checked size_t computations. */
13861 +#include "xsize.h"
13862 +
13863 +#ifdef HAVE_WCHAR_T
13864 +# ifdef HAVE_WCSLEN
13865 +# define local_wcslen wcslen
13866 +# else
13867 + /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
13868 + a dependency towards this library, here is a local substitute.
13869 + Define this substitute only once, even if this file is included
13870 + twice in the same compilation unit. */
13871 +# ifndef local_wcslen_defined
13872 +# define local_wcslen_defined 1
13873 +static size_t
13874 +local_wcslen (const wchar_t *s)
13875 +{
13876 + const wchar_t *ptr;
13877 +
13878 + for (ptr = s; *ptr != (wchar_t) 0; ptr++)
13879 + ;
13880 + return ptr - s;
13881 +}
13882 +# endif
13883 +# endif
13884 +#endif
13885 +
13886 +#if WIDE_CHAR_VERSION
13887 +# define VASNPRINTF vasnwprintf
13888 +# define CHAR_T wchar_t
13889 +# define DIRECTIVE wchar_t_directive
13890 +# define DIRECTIVES wchar_t_directives
13891 +# define PRINTF_PARSE wprintf_parse
13892 +# define USE_SNPRINTF 1
13893 +# if HAVE_DECL__SNWPRINTF
13894 + /* On Windows, the function swprintf() has a different signature than
13895 + on Unix; we use the _snwprintf() function instead. */
13896 +# define SNPRINTF _snwprintf
13897 +# else
13898 + /* Unix. */
13899 +# define SNPRINTF swprintf
13900 +# endif
13901 +#else
13902 +# define VASNPRINTF vasnprintf
13903 +# define CHAR_T char
13904 +# define DIRECTIVE char_directive
13905 +# define DIRECTIVES char_directives
13906 +# define PRINTF_PARSE printf_parse
13907 +# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
13908 +# if HAVE_DECL__SNPRINTF
13909 + /* Windows. */
13910 +# define SNPRINTF _snprintf
13911 +# else
13912 + /* Unix. */
13913 +# define SNPRINTF snprintf
13914 +# endif
13915 +#endif
13916 +
13917 +CHAR_T *
13918 +VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
13919 +{
13920 + DIRECTIVES d;
13921 + arguments a;
13922 +
13923 + if (PRINTF_PARSE (format, &d, &a) < 0)
13924 + {
13925 + errno = EINVAL;
13926 + return NULL;
13927 + }
13928 +
13929 +#define CLEANUP() \
13930 + free (d.dir); \
13931 + if (a.arg) \
13932 + free (a.arg);
13933 +
13934 + if (printf_fetchargs (args, &a) < 0)
13935 + {
13936 + CLEANUP ();
13937 + errno = EINVAL;
13938 + return NULL;
13939 + }
13940 +
13941 + {
13942 + size_t buf_neededlength;
13943 + CHAR_T *buf;
13944 + CHAR_T *buf_malloced;
13945 + const CHAR_T *cp;
13946 + size_t i;
13947 + DIRECTIVE *dp;
13948 + /* Output string accumulator. */
13949 + CHAR_T *result;
13950 + size_t allocated;
13951 + size_t length;
13952 +
13953 + /* Allocate a small buffer that will hold a directive passed to
13954 + sprintf or snprintf. */
13955 + buf_neededlength =
13956 + xsum4 (7, d.max_width_length, d.max_precision_length, 6);
13957 +#if HAVE_ALLOCA
13958 + if (buf_neededlength < 4000 / sizeof (CHAR_T))
13959 + {
13960 + buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
13961 + buf_malloced = NULL;
13962 + }
13963 + else
13964 +#endif
13965 + {
13966 + size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
13967 + if (size_overflow_p (buf_memsize))
13968 + goto out_of_memory_1;
13969 + buf = (CHAR_T *) malloc (buf_memsize);
13970 + if (buf == NULL)
13971 + goto out_of_memory_1;
13972 + buf_malloced = buf;
13973 + }
13974 +
13975 + if (resultbuf != NULL)
13976 + {
13977 + result = resultbuf;
13978 + allocated = *lengthp;
13979 + }
13980 + else
13981 + {
13982 + result = NULL;
13983 + allocated = 0;
13984 + }
13985 + length = 0;
13986 + /* Invariants:
13987 + result is either == resultbuf or == NULL or malloc-allocated.
13988 + If length > 0, then result != NULL. */
13989 +
13990 + /* Ensures that allocated >= needed. Aborts through a jump to
13991 + out_of_memory if needed is SIZE_MAX or otherwise too big. */
13992 +#define ENSURE_ALLOCATION(needed) \
13993 + if ((needed) > allocated) \
13994 + { \
13995 + size_t memory_size; \
13996 + CHAR_T *memory; \
13997 + \
13998 + allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \
13999 + if ((needed) > allocated) \
14000 + allocated = (needed); \
14001 + memory_size = xtimes (allocated, sizeof (CHAR_T)); \
14002 + if (size_overflow_p (memory_size)) \
14003 + goto out_of_memory; \
14004 + if (result == resultbuf || result == NULL) \
14005 + memory = (CHAR_T *) malloc (memory_size); \
14006 + else \
14007 + memory = (CHAR_T *) realloc (result, memory_size); \
14008 + if (memory == NULL) \
14009 + goto out_of_memory; \
14010 + if (result == resultbuf && length > 0) \
14011 + memcpy (memory, result, length * sizeof (CHAR_T)); \
14012 + result = memory; \
14013 + }
14014 +
14015 + for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
14016 + {
14017 + if (cp != dp->dir_start)
14018 + {
14019 + size_t n = dp->dir_start - cp;
14020 + size_t augmented_length = xsum (length, n);
14021 +
14022 + ENSURE_ALLOCATION (augmented_length);
14023 + memcpy (result + length, cp, n * sizeof (CHAR_T));
14024 + length = augmented_length;
14025 + }
14026 + if (i == d.count)
14027 + break;
14028 +
14029 + /* Execute a single directive. */
14030 + if (dp->conversion == '%')
14031 + {
14032 + size_t augmented_length;
14033 +
14034 + if (!(dp->arg_index == ARG_NONE))
14035 + abort ();
14036 + augmented_length = xsum (length, 1);
14037 + ENSURE_ALLOCATION (augmented_length);
14038 + result[length] = '%';
14039 + length = augmented_length;
14040 + }
14041 + else
14042 + {
14043 + if (!(dp->arg_index != ARG_NONE))
14044 + abort ();
14045 +
14046 + if (dp->conversion == 'n')
14047 + {
14048 + switch (a.arg[dp->arg_index].type)
14049 + {
14050 + case TYPE_COUNT_SCHAR_POINTER:
14051 + *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
14052 + break;
14053 + case TYPE_COUNT_SHORT_POINTER:
14054 + *a.arg[dp->arg_index].a.a_count_short_pointer = length;
14055 + break;
14056 + case TYPE_COUNT_INT_POINTER:
14057 + *a.arg[dp->arg_index].a.a_count_int_pointer = length;
14058 + break;
14059 + case TYPE_COUNT_LONGINT_POINTER:
14060 + *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
14061 + break;
14062 +#ifdef HAVE_LONG_LONG
14063 + case TYPE_COUNT_LONGLONGINT_POINTER:
14064 + *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
14065 + break;
14066 +#endif
14067 + default:
14068 + abort ();
14069 + }
14070 + }
14071 + else
14072 + {
14073 + arg_type type = a.arg[dp->arg_index].type;
14074 + CHAR_T *p;
14075 + unsigned int prefix_count;
14076 + int prefixes[2];
14077 +#if !USE_SNPRINTF
14078 + size_t tmp_length;
14079 + CHAR_T tmpbuf[700];
14080 + CHAR_T *tmp;
14081 +
14082 + /* Allocate a temporary buffer of sufficient size for calling
14083 + sprintf. */
14084 + {
14085 + size_t width;
14086 + size_t precision;
14087 +
14088 + width = 0;
14089 + if (dp->width_start != dp->width_end)
14090 + {
14091 + if (dp->width_arg_index != ARG_NONE)
14092 + {
14093 + int arg;
14094 +
14095 + if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
14096 + abort ();
14097 + arg = a.arg[dp->width_arg_index].a.a_int;
14098 + width = (arg < 0 ? (unsigned int) (-arg) : arg);
14099 + }
14100 + else
14101 + {
14102 + const CHAR_T *digitp = dp->width_start;
14103 +
14104 + do
14105 + width = xsum (xtimes (width, 10), *digitp++ - '0');
14106 + while (digitp != dp->width_end);
14107 + }
14108 + }
14109 +
14110 + precision = 6;
14111 + if (dp->precision_start != dp->precision_end)
14112 + {
14113 + if (dp->precision_arg_index != ARG_NONE)
14114 + {
14115 + int arg;
14116 +
14117 + if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
14118 + abort ();
14119 + arg = a.arg[dp->precision_arg_index].a.a_int;
14120 + precision = (arg < 0 ? 0 : arg);
14121 + }
14122 + else
14123 + {
14124 + const CHAR_T *digitp = dp->precision_start + 1;
14125 +
14126 + precision = 0;
14127 + do
14128 + precision = xsum (xtimes (precision, 10), *digitp++ - '0');
14129 + while (digitp != dp->precision_end);
14130 + }
14131 + }
14132 +
14133 + switch (dp->conversion)
14134 + {
14135 +
14136 + case 'd': case 'i': case 'u':
14137 +# ifdef HAVE_LONG_LONG
14138 + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
14139 + tmp_length =
14140 + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
14141 + * 0.30103 /* binary -> decimal */
14142 + * 2 /* estimate for FLAG_GROUP */
14143 + )
14144 + + 1 /* turn floor into ceil */
14145 + + 1; /* account for leading sign */
14146 + else
14147 +# endif
14148 + if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
14149 + tmp_length =
14150 + (unsigned int) (sizeof (unsigned long) * CHAR_BIT
14151 + * 0.30103 /* binary -> decimal */
14152 + * 2 /* estimate for FLAG_GROUP */
14153 + )
14154 + + 1 /* turn floor into ceil */
14155 + + 1; /* account for leading sign */
14156 + else
14157 + tmp_length =
14158 + (unsigned int) (sizeof (unsigned int) * CHAR_BIT
14159 + * 0.30103 /* binary -> decimal */
14160 + * 2 /* estimate for FLAG_GROUP */
14161 + )
14162 + + 1 /* turn floor into ceil */
14163 + + 1; /* account for leading sign */
14164 + break;
14165 +
14166 + case 'o':
14167 +# ifdef HAVE_LONG_LONG
14168 + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
14169 + tmp_length =
14170 + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
14171 + * 0.333334 /* binary -> octal */
14172 + )
14173 + + 1 /* turn floor into ceil */
14174 + + 1; /* account for leading sign */
14175 + else
14176 +# endif
14177 + if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
14178 + tmp_length =
14179 + (unsigned int) (sizeof (unsigned long) * CHAR_BIT
14180 + * 0.333334 /* binary -> octal */
14181 + )
14182 + + 1 /* turn floor into ceil */
14183 + + 1; /* account for leading sign */
14184 + else
14185 + tmp_length =
14186 + (unsigned int) (sizeof (unsigned int) * CHAR_BIT
14187 + * 0.333334 /* binary -> octal */
14188 + )
14189 + + 1 /* turn floor into ceil */
14190 + + 1; /* account for leading sign */
14191 + break;
14192 +
14193 + case 'x': case 'X':
14194 +# ifdef HAVE_LONG_LONG
14195 + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
14196 + tmp_length =
14197 + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
14198 + * 0.25 /* binary -> hexadecimal */
14199 + )
14200 + + 1 /* turn floor into ceil */
14201 + + 2; /* account for leading sign or alternate form */
14202 + else
14203 +# endif
14204 + if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
14205 + tmp_length =
14206 + (unsigned int) (sizeof (unsigned long) * CHAR_BIT
14207 + * 0.25 /* binary -> hexadecimal */
14208 + )
14209 + + 1 /* turn floor into ceil */
14210 + + 2; /* account for leading sign or alternate form */
14211 + else
14212 + tmp_length =
14213 + (unsigned int) (sizeof (unsigned int) * CHAR_BIT
14214 + * 0.25 /* binary -> hexadecimal */
14215 + )
14216 + + 1 /* turn floor into ceil */
14217 + + 2; /* account for leading sign or alternate form */
14218 + break;
14219 +
14220 + case 'f': case 'F':
14221 +# ifdef HAVE_LONG_DOUBLE
14222 + if (type == TYPE_LONGDOUBLE)
14223 + tmp_length =
14224 + (unsigned int) (LDBL_MAX_EXP
14225 + * 0.30103 /* binary -> decimal */
14226 + * 2 /* estimate for FLAG_GROUP */
14227 + )
14228 + + 1 /* turn floor into ceil */
14229 + + 10; /* sign, decimal point etc. */
14230 + else
14231 +# endif
14232 + tmp_length =
14233 + (unsigned int) (DBL_MAX_EXP
14234 + * 0.30103 /* binary -> decimal */
14235 + * 2 /* estimate for FLAG_GROUP */
14236 + )
14237 + + 1 /* turn floor into ceil */
14238 + + 10; /* sign, decimal point etc. */
14239 + tmp_length = xsum (tmp_length, precision);
14240 + break;
14241 +
14242 + case 'e': case 'E': case 'g': case 'G':
14243 + case 'a': case 'A':
14244 + tmp_length =
14245 + 12; /* sign, decimal point, exponent etc. */
14246 + tmp_length = xsum (tmp_length, precision);
14247 + break;
14248 +
14249 + case 'c':
14250 +# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
14251 + if (type == TYPE_WIDE_CHAR)
14252 + tmp_length = MB_CUR_MAX;
14253 + else
14254 +# endif
14255 + tmp_length = 1;
14256 + break;
14257 +
14258 + case 's':
14259 +# ifdef HAVE_WCHAR_T
14260 + if (type == TYPE_WIDE_STRING)
14261 + {
14262 + tmp_length =
14263 + local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
14264 +
14265 +# if !WIDE_CHAR_VERSION
14266 + tmp_length = xtimes (tmp_length, MB_CUR_MAX);
14267 +# endif
14268 + }
14269 + else
14270 +# endif
14271 + tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
14272 + break;
14273 +
14274 + case 'p':
14275 + tmp_length =
14276 + (unsigned int) (sizeof (void *) * CHAR_BIT
14277 + * 0.25 /* binary -> hexadecimal */
14278 + )
14279 + + 1 /* turn floor into ceil */
14280 + + 2; /* account for leading 0x */
14281 + break;
14282 +
14283 + default:
14284 + abort ();
14285 + }
14286 +
14287 + if (tmp_length < width)
14288 + tmp_length = width;
14289 +
14290 + tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
14291 + }
14292 +
14293 + if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
14294 + tmp = tmpbuf;
14295 + else
14296 + {
14297 + size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
14298 +
14299 + if (size_overflow_p (tmp_memsize))
14300 + /* Overflow, would lead to out of memory. */
14301 + goto out_of_memory;
14302 + tmp = (CHAR_T *) malloc (tmp_memsize);
14303 + if (tmp == NULL)
14304 + /* Out of memory. */
14305 + goto out_of_memory;
14306 + }
14307 +#endif
14308 +
14309 + /* Construct the format string for calling snprintf or
14310 + sprintf. */
14311 + p = buf;
14312 + *p++ = '%';
14313 + if (dp->flags & FLAG_GROUP)
14314 + *p++ = '\'';
14315 + if (dp->flags & FLAG_LEFT)
14316 + *p++ = '-';
14317 + if (dp->flags & FLAG_SHOWSIGN)
14318 + *p++ = '+';
14319 + if (dp->flags & FLAG_SPACE)
14320 + *p++ = ' ';
14321 + if (dp->flags & FLAG_ALT)
14322 + *p++ = '#';
14323 + if (dp->flags & FLAG_ZERO)
14324 + *p++ = '0';
14325 + if (dp->width_start != dp->width_end)
14326 + {
14327 + size_t n = dp->width_end - dp->width_start;
14328 + memcpy (p, dp->width_start, n * sizeof (CHAR_T));
14329 + p += n;
14330 + }
14331 + if (dp->precision_start != dp->precision_end)
14332 + {
14333 + size_t n = dp->precision_end - dp->precision_start;
14334 + memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
14335 + p += n;
14336 + }
14337 +
14338 + switch (type)
14339 + {
14340 +#ifdef HAVE_LONG_LONG
14341 + case TYPE_LONGLONGINT:
14342 + case TYPE_ULONGLONGINT:
14343 + *p++ = 'l';
14344 + /*FALLTHROUGH*/
14345 +#endif
14346 + case TYPE_LONGINT:
14347 + case TYPE_ULONGINT:
14348 +#ifdef HAVE_WINT_T
14349 + case TYPE_WIDE_CHAR:
14350 +#endif
14351 +#ifdef HAVE_WCHAR_T
14352 + case TYPE_WIDE_STRING:
14353 +#endif
14354 + *p++ = 'l';
14355 + break;
14356 +#ifdef HAVE_LONG_DOUBLE
14357 + case TYPE_LONGDOUBLE:
14358 + *p++ = 'L';
14359 + break;
14360 +#endif
14361 + default:
14362 + break;
14363 + }
14364 + *p = dp->conversion;
14365 +#if USE_SNPRINTF
14366 + p[1] = '%';
14367 + p[2] = 'n';
14368 + p[3] = '\0';
14369 +#else
14370 + p[1] = '\0';
14371 +#endif
14372 +
14373 + /* Construct the arguments for calling snprintf or sprintf. */
14374 + prefix_count = 0;
14375 + if (dp->width_arg_index != ARG_NONE)
14376 + {
14377 + if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
14378 + abort ();
14379 + prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
14380 + }
14381 + if (dp->precision_arg_index != ARG_NONE)
14382 + {
14383 + if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
14384 + abort ();
14385 + prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
14386 + }
14387 +
14388 +#if USE_SNPRINTF
14389 + /* Prepare checking whether snprintf returns the count
14390 + via %n. */
14391 + ENSURE_ALLOCATION (xsum (length, 1));
14392 + result[length] = '\0';
14393 +#endif
14394 +
14395 + for (;;)
14396 + {
14397 + size_t maxlen;
14398 + int count;
14399 + int retcount;
14400 +
14401 + maxlen = allocated - length;
14402 + count = -1;
14403 + retcount = 0;
14404 +
14405 +#if USE_SNPRINTF
14406 +# define SNPRINTF_BUF(arg) \
14407 + switch (prefix_count) \
14408 + { \
14409 + case 0: \
14410 + retcount = SNPRINTF (result + length, maxlen, buf, \
14411 + arg, &count); \
14412 + break; \
14413 + case 1: \
14414 + retcount = SNPRINTF (result + length, maxlen, buf, \
14415 + prefixes[0], arg, &count); \
14416 + break; \
14417 + case 2: \
14418 + retcount = SNPRINTF (result + length, maxlen, buf, \
14419 + prefixes[0], prefixes[1], arg, \
14420 + &count); \
14421 + break; \
14422 + default: \
14423 + abort (); \
14424 + }
14425 +#else
14426 +# define SNPRINTF_BUF(arg) \
14427 + switch (prefix_count) \
14428 + { \
14429 + case 0: \
14430 + count = sprintf (tmp, buf, arg); \
14431 + break; \
14432 + case 1: \
14433 + count = sprintf (tmp, buf, prefixes[0], arg); \
14434 + break; \
14435 + case 2: \
14436 + count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
14437 + arg); \
14438 + break; \
14439 + default: \
14440 + abort (); \
14441 + }
14442 +#endif
14443 +
14444 + switch (type)
14445 + {
14446 + case TYPE_SCHAR:
14447 + {
14448 + int arg = a.arg[dp->arg_index].a.a_schar;
14449 + SNPRINTF_BUF (arg);
14450 + }
14451 + break;
14452 + case TYPE_UCHAR:
14453 + {
14454 + unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
14455 + SNPRINTF_BUF (arg);
14456 + }
14457 + break;
14458 + case TYPE_SHORT:
14459 + {
14460 + int arg = a.arg[dp->arg_index].a.a_short;
14461 + SNPRINTF_BUF (arg);
14462 + }
14463 + break;
14464 + case TYPE_USHORT:
14465 + {
14466 + unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
14467 + SNPRINTF_BUF (arg);
14468 + }
14469 + break;
14470 + case TYPE_INT:
14471 + {
14472 + int arg = a.arg[dp->arg_index].a.a_int;
14473 + SNPRINTF_BUF (arg);
14474 + }
14475 + break;
14476 + case TYPE_UINT:
14477 + {
14478 + unsigned int arg = a.arg[dp->arg_index].a.a_uint;
14479 + SNPRINTF_BUF (arg);
14480 + }
14481 + break;
14482 + case TYPE_LONGINT:
14483 + {
14484 + long int arg = a.arg[dp->arg_index].a.a_longint;
14485 + SNPRINTF_BUF (arg);
14486 + }
14487 + break;
14488 + case TYPE_ULONGINT:
14489 + {
14490 + unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
14491 + SNPRINTF_BUF (arg);
14492 + }
14493 + break;
14494 +#ifdef HAVE_LONG_LONG
14495 + case TYPE_LONGLONGINT:
14496 + {
14497 + long long int arg = a.arg[dp->arg_index].a.a_longlongint;
14498 + SNPRINTF_BUF (arg);
14499 + }
14500 + break;
14501 + case TYPE_ULONGLONGINT:
14502 + {
14503 + unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
14504 + SNPRINTF_BUF (arg);
14505 + }
14506 + break;
14507 +#endif
14508 + case TYPE_DOUBLE:
14509 + {
14510 + double arg = a.arg[dp->arg_index].a.a_double;
14511 + SNPRINTF_BUF (arg);
14512 + }
14513 + break;
14514 +#ifdef HAVE_LONG_DOUBLE
14515 + case TYPE_LONGDOUBLE:
14516 + {
14517 + long double arg = a.arg[dp->arg_index].a.a_longdouble;
14518 + SNPRINTF_BUF (arg);
14519 + }
14520 + break;
14521 +#endif
14522 + case TYPE_CHAR:
14523 + {
14524 + int arg = a.arg[dp->arg_index].a.a_char;
14525 + SNPRINTF_BUF (arg);
14526 + }
14527 + break;
14528 +#ifdef HAVE_WINT_T
14529 + case TYPE_WIDE_CHAR:
14530 + {
14531 + wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
14532 + SNPRINTF_BUF (arg);
14533 + }
14534 + break;
14535 +#endif
14536 + case TYPE_STRING:
14537 + {
14538 + const char *arg = a.arg[dp->arg_index].a.a_string;
14539 + SNPRINTF_BUF (arg);
14540 + }
14541 + break;
14542 +#ifdef HAVE_WCHAR_T
14543 + case TYPE_WIDE_STRING:
14544 + {
14545 + const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
14546 + SNPRINTF_BUF (arg);
14547 + }
14548 + break;
14549 +#endif
14550 + case TYPE_POINTER:
14551 + {
14552 + void *arg = a.arg[dp->arg_index].a.a_pointer;
14553 + SNPRINTF_BUF (arg);
14554 + }
14555 + break;
14556 + default:
14557 + abort ();
14558 + }
14559 +
14560 +#if USE_SNPRINTF
14561 + /* Portability: Not all implementations of snprintf()
14562 + are ISO C 99 compliant. Determine the number of
14563 + bytes that snprintf() has produced or would have
14564 + produced. */
14565 + if (count >= 0)
14566 + {
14567 + /* Verify that snprintf() has NUL-terminated its
14568 + result. */
14569 + if (count < maxlen && result[length + count] != '\0')
14570 + abort ();
14571 + /* Portability hack. */
14572 + if (retcount > count)
14573 + count = retcount;
14574 + }
14575 + else
14576 + {
14577 + /* snprintf() doesn't understand the '%n'
14578 + directive. */
14579 + if (p[1] != '\0')
14580 + {
14581 + /* Don't use the '%n' directive; instead, look
14582 + at the snprintf() return value. */
14583 + p[1] = '\0';
14584 + continue;
14585 + }
14586 + else
14587 + {
14588 + /* Look at the snprintf() return value. */
14589 + if (retcount < 0)
14590 + {
14591 + /* HP-UX 10.20 snprintf() is doubly deficient:
14592 + It doesn't understand the '%n' directive,
14593 + *and* it returns -1 (rather than the length
14594 + that would have been required) when the
14595 + buffer is too small. */
14596 + size_t bigger_need =
14597 + xsum (xtimes (allocated, 2), 12);
14598 + ENSURE_ALLOCATION (bigger_need);
14599 + continue;
14600 + }
14601 + else
14602 + count = retcount;
14603 + }
14604 + }
14605 +#endif
14606 +
14607 + /* Attempt to handle failure. */
14608 + if (count < 0)
14609 + {
14610 + if (!(result == resultbuf || result == NULL))
14611 + free (result);
14612 + if (buf_malloced != NULL)
14613 + free (buf_malloced);
14614 + CLEANUP ();
14615 + errno = EINVAL;
14616 + return NULL;
14617 + }
14618 +
14619 +#if !USE_SNPRINTF
14620 + if (count >= tmp_length)
14621 + /* tmp_length was incorrectly calculated - fix the
14622 + code above! */
14623 + abort ();
14624 +#endif
14625 +
14626 + /* Make room for the result. */
14627 + if (count >= maxlen)
14628 + {
14629 + /* Need at least count bytes. But allocate
14630 + proportionally, to avoid looping eternally if
14631 + snprintf() reports a too small count. */
14632 + size_t n =
14633 + xmax (xsum (length, count), xtimes (allocated, 2));
14634 +
14635 + ENSURE_ALLOCATION (n);
14636 +#if USE_SNPRINTF
14637 + continue;
14638 +#endif
14639 + }
14640 +
14641 +#if USE_SNPRINTF
14642 + /* The snprintf() result did fit. */
14643 +#else
14644 + /* Append the sprintf() result. */
14645 + memcpy (result + length, tmp, count * sizeof (CHAR_T));
14646 + if (tmp != tmpbuf)
14647 + free (tmp);
14648 +#endif
14649 +
14650 + length += count;
14651 + break;
14652 + }
14653 + }
14654 + }
14655 + }
14656 +
14657 + /* Add the final NUL. */
14658 + ENSURE_ALLOCATION (xsum (length, 1));
14659 + result[length] = '\0';
14660 +
14661 + if (result != resultbuf && length + 1 < allocated)
14662 + {
14663 + /* Shrink the allocated memory if possible. */
14664 + CHAR_T *memory;
14665 +
14666 + memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
14667 + if (memory != NULL)
14668 + result = memory;
14669 + }
14670 +
14671 + if (buf_malloced != NULL)
14672 + free (buf_malloced);
14673 + CLEANUP ();
14674 + *lengthp = length;
14675 + return result;
14676 +
14677 + out_of_memory:
14678 + if (!(result == resultbuf || result == NULL))
14679 + free (result);
14680 + if (buf_malloced != NULL)
14681 + free (buf_malloced);
14682 + out_of_memory_1:
14683 + CLEANUP ();
14684 + errno = ENOMEM;
14685 + return NULL;
14686 + }
14687 +}
14688 +
14689 +#undef SNPRINTF
14690 +#undef USE_SNPRINTF
14691 +#undef PRINTF_PARSE
14692 +#undef DIRECTIVES
14693 +#undef DIRECTIVE
14694 +#undef CHAR_T
14695 +#undef VASNPRINTF
14696 --- /dev/null
14697 +++ lxpanel-0.5.6/intl/dcigettext.c
14698 @@ -0,0 +1,1219 @@
14699 +/* Implementation of the internal dcigettext function.
14700 + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
14701 +
14702 + This program is free software; you can redistribute it and/or modify it
14703 + under the terms of the GNU Library General Public License as published
14704 + by the Free Software Foundation; either version 2, or (at your option)
14705 + any later version.
14706 +
14707 + This program is distributed in the hope that it will be useful,
14708 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14709 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14710 + Library General Public License for more details.
14711 +
14712 + You should have received a copy of the GNU Library General Public
14713 + License along with this program; if not, write to the Free Software
14714 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
14715 + USA. */
14716 +
14717 +/* Tell glibc's <string.h> to provide a prototype for mempcpy().
14718 + This must come before <config.h> because <config.h> may include
14719 + <features.h>, and once <features.h> has been included, it's too late. */
14720 +#ifndef _GNU_SOURCE
14721 +# define _GNU_SOURCE 1
14722 +#endif
14723 +
14724 +#ifdef HAVE_CONFIG_H
14725 +# include <config.h>
14726 +#endif
14727 +
14728 +#include <sys/types.h>
14729 +
14730 +#ifdef __GNUC__
14731 +# define alloca __builtin_alloca
14732 +# define HAVE_ALLOCA 1
14733 +#else
14734 +# ifdef _MSC_VER
14735 +# include <malloc.h>
14736 +# define alloca _alloca
14737 +# else
14738 +# if defined HAVE_ALLOCA_H || defined _LIBC
14739 +# include <alloca.h>
14740 +# else
14741 +# ifdef _AIX
14742 + #pragma alloca
14743 +# else
14744 +# ifndef alloca
14745 +char *alloca ();
14746 +# endif
14747 +# endif
14748 +# endif
14749 +# endif
14750 +#endif
14751 +
14752 +#include <errno.h>
14753 +#ifndef errno
14754 +extern int errno;
14755 +#endif
14756 +#ifndef __set_errno
14757 +# define __set_errno(val) errno = (val)
14758 +#endif
14759 +
14760 +#include <stddef.h>
14761 +#include <stdlib.h>
14762 +#include <string.h>
14763 +
14764 +#if defined HAVE_UNISTD_H || defined _LIBC
14765 +# include <unistd.h>
14766 +#endif
14767 +
14768 +#include <locale.h>
14769 +
14770 +#ifdef _LIBC
14771 + /* Guess whether integer division by zero raises signal SIGFPE.
14772 + Set to 1 only if you know for sure. In case of doubt, set to 0. */
14773 +# if defined __alpha__ || defined __arm__ || defined __i386__ \
14774 + || defined __m68k__ || defined __s390__
14775 +# define INTDIV0_RAISES_SIGFPE 1
14776 +# else
14777 +# define INTDIV0_RAISES_SIGFPE 0
14778 +# endif
14779 +#endif
14780 +#if !INTDIV0_RAISES_SIGFPE
14781 +# include <signal.h>
14782 +#endif
14783 +
14784 +#if defined HAVE_SYS_PARAM_H || defined _LIBC
14785 +# include <sys/param.h>
14786 +#endif
14787 +
14788 +#include "gettextP.h"
14789 +#include "plural-exp.h"
14790 +#ifdef _LIBC
14791 +# include <libintl.h>
14792 +#else
14793 +# include "libgnuintl.h"
14794 +#endif
14795 +#include "hash-string.h"
14796 +
14797 +/* Thread safetyness. */
14798 +#ifdef _LIBC
14799 +# include <bits/libc-lock.h>
14800 +#else
14801 +/* Provide dummy implementation if this is outside glibc. */
14802 +# define __libc_lock_define_initialized(CLASS, NAME)
14803 +# define __libc_lock_lock(NAME)
14804 +# define __libc_lock_unlock(NAME)
14805 +# define __libc_rwlock_define_initialized(CLASS, NAME)
14806 +# define __libc_rwlock_rdlock(NAME)
14807 +# define __libc_rwlock_unlock(NAME)
14808 +#endif
14809 +
14810 +/* Alignment of types. */
14811 +#if defined __GNUC__ && __GNUC__ >= 2
14812 +# define alignof(TYPE) __alignof__ (TYPE)
14813 +#else
14814 +# define alignof(TYPE) \
14815 + ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
14816 +#endif
14817 +
14818 +/* The internal variables in the standalone libintl.a must have different
14819 + names than the internal variables in GNU libc, otherwise programs
14820 + using libintl.a cannot be linked statically. */
14821 +#if !defined _LIBC
14822 +# define _nl_default_default_domain libintl_nl_default_default_domain
14823 +# define _nl_current_default_domain libintl_nl_current_default_domain
14824 +# define _nl_default_dirname libintl_nl_default_dirname
14825 +# define _nl_domain_bindings libintl_nl_domain_bindings
14826 +#endif
14827 +
14828 +/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
14829 +#ifndef offsetof
14830 +# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
14831 +#endif
14832 +
14833 +/* @@ end of prolog @@ */
14834 +
14835 +#ifdef _LIBC
14836 +/* Rename the non ANSI C functions. This is required by the standard
14837 + because some ANSI C functions will require linking with this object
14838 + file and the name space must not be polluted. */
14839 +# define getcwd __getcwd
14840 +# ifndef stpcpy
14841 +# define stpcpy __stpcpy
14842 +# endif
14843 +# define tfind __tfind
14844 +#else
14845 +# if !defined HAVE_GETCWD
14846 +char *getwd ();
14847 +# define getcwd(buf, max) getwd (buf)
14848 +# else
14849 +# if VMS
14850 +# define getcwd(buf, max) (getcwd) (buf, max, 0)
14851 +# else
14852 +char *getcwd ();
14853 +# endif
14854 +# endif
14855 +# ifndef HAVE_STPCPY
14856 +static char *stpcpy (char *dest, const char *src);
14857 +# endif
14858 +# ifndef HAVE_MEMPCPY
14859 +static void *mempcpy (void *dest, const void *src, size_t n);
14860 +# endif
14861 +#endif
14862 +
14863 +/* Amount to increase buffer size by in each try. */
14864 +#define PATH_INCR 32
14865 +
14866 +/* The following is from pathmax.h. */
14867 +/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
14868 + PATH_MAX but might cause redefinition warnings when sys/param.h is
14869 + later included (as on MORE/BSD 4.3). */
14870 +#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
14871 +# include <limits.h>
14872 +#endif
14873 +
14874 +#ifndef _POSIX_PATH_MAX
14875 +# define _POSIX_PATH_MAX 255
14876 +#endif
14877 +
14878 +#if !defined PATH_MAX && defined _PC_PATH_MAX
14879 +# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
14880 +#endif
14881 +
14882 +/* Don't include sys/param.h if it already has been. */
14883 +#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
14884 +# include <sys/param.h>
14885 +#endif
14886 +
14887 +#if !defined PATH_MAX && defined MAXPATHLEN
14888 +# define PATH_MAX MAXPATHLEN
14889 +#endif
14890 +
14891 +#ifndef PATH_MAX
14892 +# define PATH_MAX _POSIX_PATH_MAX
14893 +#endif
14894 +
14895 +/* Pathname support.
14896 + ISSLASH(C) tests whether C is a directory separator character.
14897 + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
14898 + it may be concatenated to a directory pathname.
14899 + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
14900 + */
14901 +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
14902 + /* Win32, OS/2, DOS */
14903 +# define ISSLASH(C) ((C) == '/' || (C) == '\\')
14904 +# define HAS_DEVICE(P) \
14905 + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
14906 + && (P)[1] == ':')
14907 +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
14908 +# define IS_PATH_WITH_DIR(P) \
14909 + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
14910 +#else
14911 + /* Unix */
14912 +# define ISSLASH(C) ((C) == '/')
14913 +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
14914 +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
14915 +#endif
14916 +
14917 +/* This is the type used for the search tree where known translations
14918 + are stored. */
14919 +struct known_translation_t
14920 +{
14921 + /* Domain in which to search. */
14922 + char *domainname;
14923 +
14924 + /* The category. */
14925 + int category;
14926 +
14927 + /* State of the catalog counter at the point the string was found. */
14928 + int counter;
14929 +
14930 + /* Catalog where the string was found. */
14931 + struct loaded_l10nfile *domain;
14932 +
14933 + /* And finally the translation. */
14934 + const char *translation;
14935 + size_t translation_length;
14936 +
14937 + /* Pointer to the string in question. */
14938 + char msgid[ZERO];
14939 +};
14940 +
14941 +/* Root of the search tree with known translations. We can use this
14942 + only if the system provides the `tsearch' function family. */
14943 +#if defined HAVE_TSEARCH || defined _LIBC
14944 +# include <search.h>
14945 +
14946 +static void *root;
14947 +
14948 +# ifdef _LIBC
14949 +# define tsearch __tsearch
14950 +# endif
14951 +
14952 +/* Function to compare two entries in the table of known translations. */
14953 +static int
14954 +transcmp (const void *p1, const void *p2)
14955 +{
14956 + const struct known_translation_t *s1;
14957 + const struct known_translation_t *s2;
14958 + int result;
14959 +
14960 + s1 = (const struct known_translation_t *) p1;
14961 + s2 = (const struct known_translation_t *) p2;
14962 +
14963 + result = strcmp (s1->msgid, s2->msgid);
14964 + if (result == 0)
14965 + {
14966 + result = strcmp (s1->domainname, s2->domainname);
14967 + if (result == 0)
14968 + /* We compare the category last (though this is the cheapest
14969 + operation) since it is hopefully always the same (namely
14970 + LC_MESSAGES). */
14971 + result = s1->category - s2->category;
14972 + }
14973 +
14974 + return result;
14975 +}
14976 +#endif
14977 +
14978 +#ifndef INTVARDEF
14979 +# define INTVARDEF(name)
14980 +#endif
14981 +#ifndef INTUSE
14982 +# define INTUSE(name) name
14983 +#endif
14984 +
14985 +/* Name of the default domain used for gettext(3) prior any call to
14986 + textdomain(3). The default value for this is "messages". */
14987 +const char _nl_default_default_domain[] attribute_hidden = "messages";
14988 +
14989 +/* Value used as the default domain for gettext(3). */
14990 +const char *_nl_current_default_domain attribute_hidden
14991 + = _nl_default_default_domain;
14992 +
14993 +/* Contains the default location of the message catalogs. */
14994 +#if defined __EMX__
14995 +extern const char _nl_default_dirname[];
14996 +#else
14997 +const char _nl_default_dirname[] = LOCALEDIR;
14998 +INTVARDEF (_nl_default_dirname)
14999 +#endif
15000 +
15001 +/* List with bindings of specific domains created by bindtextdomain()
15002 + calls. */
15003 +struct binding *_nl_domain_bindings;
15004 +
15005 +/* Prototypes for local functions. */
15006 +static char *plural_lookup (struct loaded_l10nfile *domain,
15007 + unsigned long int n,
15008 + const char *translation, size_t translation_len)
15009 + internal_function;
15010 +static const char *guess_category_value (int category,
15011 + const char *categoryname)
15012 + internal_function;
15013 +#ifdef _LIBC
15014 +# include "../locale/localeinfo.h"
15015 +# define category_to_name(category) _nl_category_names[category]
15016 +#else
15017 +static const char *category_to_name (int category) internal_function;
15018 +#endif
15019 +
15020 +
15021 +/* For those loosing systems which don't have `alloca' we have to add
15022 + some additional code emulating it. */
15023 +#ifdef HAVE_ALLOCA
15024 +/* Nothing has to be done. */
15025 +# define freea(p) /* nothing */
15026 +# define ADD_BLOCK(list, address) /* nothing */
15027 +# define FREE_BLOCKS(list) /* nothing */
15028 +#else
15029 +struct block_list
15030 +{
15031 + void *address;
15032 + struct block_list *next;
15033 +};
15034 +# define ADD_BLOCK(list, addr) \
15035 + do { \
15036 + struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
15037 + /* If we cannot get a free block we cannot add the new element to \
15038 + the list. */ \
15039 + if (newp != NULL) { \
15040 + newp->address = (addr); \
15041 + newp->next = (list); \
15042 + (list) = newp; \
15043 + } \
15044 + } while (0)
15045 +# define FREE_BLOCKS(list) \
15046 + do { \
15047 + while (list != NULL) { \
15048 + struct block_list *old = list; \
15049 + list = list->next; \
15050 + free (old->address); \
15051 + free (old); \
15052 + } \
15053 + } while (0)
15054 +# undef alloca
15055 +# define alloca(size) (malloc (size))
15056 +# define freea(p) free (p)
15057 +#endif /* have alloca */
15058 +
15059 +
15060 +#ifdef _LIBC
15061 +/* List of blocks allocated for translations. */
15062 +typedef struct transmem_list
15063 +{
15064 + struct transmem_list *next;
15065 + char data[ZERO];
15066 +} transmem_block_t;
15067 +static struct transmem_list *transmem_list;
15068 +#else
15069 +typedef unsigned char transmem_block_t;
15070 +#endif
15071 +
15072 +
15073 +/* Names for the libintl functions are a problem. They must not clash
15074 + with existing names and they should follow ANSI C. But this source
15075 + code is also used in GNU C Library where the names have a __
15076 + prefix. So we have to make a difference here. */
15077 +#ifdef _LIBC
15078 +# define DCIGETTEXT __dcigettext
15079 +#else
15080 +# define DCIGETTEXT libintl_dcigettext
15081 +#endif
15082 +
15083 +/* Lock variable to protect the global data in the gettext implementation. */
15084 +#ifdef _LIBC
15085 +__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
15086 +#endif
15087 +
15088 +/* Checking whether the binaries runs SUID must be done and glibc provides
15089 + easier methods therefore we make a difference here. */
15090 +#ifdef _LIBC
15091 +# define ENABLE_SECURE __libc_enable_secure
15092 +# define DETERMINE_SECURE
15093 +#else
15094 +# ifndef HAVE_GETUID
15095 +# define getuid() 0
15096 +# endif
15097 +# ifndef HAVE_GETGID
15098 +# define getgid() 0
15099 +# endif
15100 +# ifndef HAVE_GETEUID
15101 +# define geteuid() getuid()
15102 +# endif
15103 +# ifndef HAVE_GETEGID
15104 +# define getegid() getgid()
15105 +# endif
15106 +static int enable_secure;
15107 +# define ENABLE_SECURE (enable_secure == 1)
15108 +# define DETERMINE_SECURE \
15109 + if (enable_secure == 0) \
15110 + { \
15111 + if (getuid () != geteuid () || getgid () != getegid ()) \
15112 + enable_secure = 1; \
15113 + else \
15114 + enable_secure = -1; \
15115 + }
15116 +#endif
15117 +
15118 +/* Get the function to evaluate the plural expression. */
15119 +#include "eval-plural.h"
15120 +
15121 +/* Look up MSGID in the DOMAINNAME message catalog for the current
15122 + CATEGORY locale and, if PLURAL is nonzero, search over string
15123 + depending on the plural form determined by N. */
15124 +char *
15125 +DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
15126 + int plural, unsigned long int n, int category)
15127 +{
15128 +#ifndef HAVE_ALLOCA
15129 + struct block_list *block_list = NULL;
15130 +#endif
15131 + struct loaded_l10nfile *domain;
15132 + struct binding *binding;
15133 + const char *categoryname;
15134 + const char *categoryvalue;
15135 + char *dirname, *xdomainname;
15136 + char *single_locale;
15137 + char *retval;
15138 + size_t retlen;
15139 + int saved_errno;
15140 +#if defined HAVE_TSEARCH || defined _LIBC
15141 + struct known_translation_t *search;
15142 + struct known_translation_t **foundp = NULL;
15143 + size_t msgid_len;
15144 +#endif
15145 + size_t domainname_len;
15146 +
15147 + /* If no real MSGID is given return NULL. */
15148 + if (msgid1 == NULL)
15149 + return NULL;
15150 +
15151 +#ifdef _LIBC
15152 + if (category < 0 || category >= __LC_LAST || category == LC_ALL)
15153 + /* Bogus. */
15154 + return (plural == 0
15155 + ? (char *) msgid1
15156 + /* Use the Germanic plural rule. */
15157 + : n == 1 ? (char *) msgid1 : (char *) msgid2);
15158 +#endif
15159 +
15160 + __libc_rwlock_rdlock (_nl_state_lock);
15161 +
15162 + /* If DOMAINNAME is NULL, we are interested in the default domain. If
15163 + CATEGORY is not LC_MESSAGES this might not make much sense but the
15164 + definition left this undefined. */
15165 + if (domainname == NULL)
15166 + domainname = _nl_current_default_domain;
15167 +
15168 + /* OS/2 specific: backward compatibility with older libintl versions */
15169 +#ifdef LC_MESSAGES_COMPAT
15170 + if (category == LC_MESSAGES_COMPAT)
15171 + category = LC_MESSAGES;
15172 +#endif
15173 +
15174 +#if defined HAVE_TSEARCH || defined _LIBC
15175 + msgid_len = strlen (msgid1) + 1;
15176 +
15177 + /* Try to find the translation among those which we found at
15178 + some time. */
15179 + search = (struct known_translation_t *)
15180 + alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
15181 + memcpy (search->msgid, msgid1, msgid_len);
15182 + search->domainname = (char *) domainname;
15183 + search->category = category;
15184 +
15185 + foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
15186 + freea (search);
15187 + if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
15188 + {
15189 + /* Now deal with plural. */
15190 + if (plural)
15191 + retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
15192 + (*foundp)->translation_length);
15193 + else
15194 + retval = (char *) (*foundp)->translation;
15195 +
15196 + __libc_rwlock_unlock (_nl_state_lock);
15197 + return retval;
15198 + }
15199 +#endif
15200 +
15201 + /* Preserve the `errno' value. */
15202 + saved_errno = errno;
15203 +
15204 + /* See whether this is a SUID binary or not. */
15205 + DETERMINE_SECURE;
15206 +
15207 + /* First find matching binding. */
15208 + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
15209 + {
15210 + int compare = strcmp (domainname, binding->domainname);
15211 + if (compare == 0)
15212 + /* We found it! */
15213 + break;
15214 + if (compare < 0)
15215 + {
15216 + /* It is not in the list. */
15217 + binding = NULL;
15218 + break;
15219 + }
15220 + }
15221 +
15222 + if (binding == NULL)
15223 + dirname = (char *) INTUSE(_nl_default_dirname);
15224 + else if (IS_ABSOLUTE_PATH (binding->dirname))
15225 + dirname = binding->dirname;
15226 + else
15227 + {
15228 + /* We have a relative path. Make it absolute now. */
15229 + size_t dirname_len = strlen (binding->dirname) + 1;
15230 + size_t path_max;
15231 + char *ret;
15232 +
15233 + path_max = (unsigned int) PATH_MAX;
15234 + path_max += 2; /* The getcwd docs say to do this. */
15235 +
15236 + for (;;)
15237 + {
15238 + dirname = (char *) alloca (path_max + dirname_len);
15239 + ADD_BLOCK (block_list, dirname);
15240 +
15241 + __set_errno (0);
15242 + ret = getcwd (dirname, path_max);
15243 + if (ret != NULL || errno != ERANGE)
15244 + break;
15245 +
15246 + path_max += path_max / 2;
15247 + path_max += PATH_INCR;
15248 + }
15249 +
15250 + if (ret == NULL)
15251 + /* We cannot get the current working directory. Don't signal an
15252 + error but simply return the default string. */
15253 + goto return_untranslated;
15254 +
15255 + stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
15256 + }
15257 +
15258 + /* Now determine the symbolic name of CATEGORY and its value. */
15259 + categoryname = category_to_name (category);
15260 + categoryvalue = guess_category_value (category, categoryname);
15261 +
15262 + domainname_len = strlen (domainname);
15263 + xdomainname = (char *) alloca (strlen (categoryname)
15264 + + domainname_len + 5);
15265 + ADD_BLOCK (block_list, xdomainname);
15266 +
15267 + stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
15268 + domainname, domainname_len),
15269 + ".mo");
15270 +
15271 + /* Creating working area. */
15272 + single_locale = (char *) alloca (strlen (categoryvalue) + 1);
15273 + ADD_BLOCK (block_list, single_locale);
15274 +
15275 +
15276 + /* Search for the given string. This is a loop because we perhaps
15277 + got an ordered list of languages to consider for the translation. */
15278 + while (1)
15279 + {
15280 + /* Make CATEGORYVALUE point to the next element of the list. */
15281 + while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
15282 + ++categoryvalue;
15283 + if (categoryvalue[0] == '\0')
15284 + {
15285 + /* The whole contents of CATEGORYVALUE has been searched but
15286 + no valid entry has been found. We solve this situation
15287 + by implicitly appending a "C" entry, i.e. no translation
15288 + will take place. */
15289 + single_locale[0] = 'C';
15290 + single_locale[1] = '\0';
15291 + }
15292 + else
15293 + {
15294 + char *cp = single_locale;
15295 + while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
15296 + *cp++ = *categoryvalue++;
15297 + *cp = '\0';
15298 +
15299 + /* When this is a SUID binary we must not allow accessing files
15300 + outside the dedicated directories. */
15301 + if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
15302 + /* Ingore this entry. */
15303 + continue;
15304 + }
15305 +
15306 + /* If the current locale value is C (or POSIX) we don't load a
15307 + domain. Return the MSGID. */
15308 + if (strcmp (single_locale, "C") == 0
15309 + || strcmp (single_locale, "POSIX") == 0)
15310 + break;
15311 +
15312 + /* Find structure describing the message catalog matching the
15313 + DOMAINNAME and CATEGORY. */
15314 + domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
15315 +
15316 + if (domain != NULL)
15317 + {
15318 + retval = _nl_find_msg (domain, binding, msgid1, &retlen);
15319 +
15320 + if (retval == NULL)
15321 + {
15322 + int cnt;
15323 +
15324 + for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
15325 + {
15326 + retval = _nl_find_msg (domain->successor[cnt], binding,
15327 + msgid1, &retlen);
15328 +
15329 + if (retval != NULL)
15330 + {
15331 + domain = domain->successor[cnt];
15332 + break;
15333 + }
15334 + }
15335 + }
15336 +
15337 + if (retval != NULL)
15338 + {
15339 + /* Found the translation of MSGID1 in domain DOMAIN:
15340 + starting at RETVAL, RETLEN bytes. */
15341 + FREE_BLOCKS (block_list);
15342 +#if defined HAVE_TSEARCH || defined _LIBC
15343 + if (foundp == NULL)
15344 + {
15345 + /* Create a new entry and add it to the search tree. */
15346 + struct known_translation_t *newp;
15347 +
15348 + newp = (struct known_translation_t *)
15349 + malloc (offsetof (struct known_translation_t, msgid)
15350 + + msgid_len + domainname_len + 1);
15351 + if (newp != NULL)
15352 + {
15353 + newp->domainname =
15354 + mempcpy (newp->msgid, msgid1, msgid_len);
15355 + memcpy (newp->domainname, domainname, domainname_len + 1);
15356 + newp->category = category;
15357 + newp->counter = _nl_msg_cat_cntr;
15358 + newp->domain = domain;
15359 + newp->translation = retval;
15360 + newp->translation_length = retlen;
15361 +
15362 + /* Insert the entry in the search tree. */
15363 + foundp = (struct known_translation_t **)
15364 + tsearch (newp, &root, transcmp);
15365 + if (foundp == NULL
15366 + || __builtin_expect (*foundp != newp, 0))
15367 + /* The insert failed. */
15368 + free (newp);
15369 + }
15370 + }
15371 + else
15372 + {
15373 + /* We can update the existing entry. */
15374 + (*foundp)->counter = _nl_msg_cat_cntr;
15375 + (*foundp)->domain = domain;
15376 + (*foundp)->translation = retval;
15377 + (*foundp)->translation_length = retlen;
15378 + }
15379 +#endif
15380 + __set_errno (saved_errno);
15381 +
15382 + /* Now deal with plural. */
15383 + if (plural)
15384 + retval = plural_lookup (domain, n, retval, retlen);
15385 +
15386 + __libc_rwlock_unlock (_nl_state_lock);
15387 + return retval;
15388 + }
15389 + }
15390 + }
15391 +
15392 + return_untranslated:
15393 + /* Return the untranslated MSGID. */
15394 + FREE_BLOCKS (block_list);
15395 + __libc_rwlock_unlock (_nl_state_lock);
15396 +#ifndef _LIBC
15397 + if (!ENABLE_SECURE)
15398 + {
15399 + extern void _nl_log_untranslated (const char *logfilename,
15400 + const char *domainname,
15401 + const char *msgid1, const char *msgid2,
15402 + int plural);
15403 + const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
15404 +
15405 + if (logfilename != NULL && logfilename[0] != '\0')
15406 + _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
15407 + }
15408 +#endif
15409 + __set_errno (saved_errno);
15410 + return (plural == 0
15411 + ? (char *) msgid1
15412 + /* Use the Germanic plural rule. */
15413 + : n == 1 ? (char *) msgid1 : (char *) msgid2);
15414 +}
15415 +
15416 +
15417 +char *
15418 +internal_function
15419 +_nl_find_msg (struct loaded_l10nfile *domain_file,
15420 + struct binding *domainbinding, const char *msgid,
15421 + size_t *lengthp)
15422 +{
15423 + struct loaded_domain *domain;
15424 + nls_uint32 nstrings;
15425 + size_t act;
15426 + char *result;
15427 + size_t resultlen;
15428 +
15429 + if (domain_file->decided == 0)
15430 + _nl_load_domain (domain_file, domainbinding);
15431 +
15432 + if (domain_file->data == NULL)
15433 + return NULL;
15434 +
15435 + domain = (struct loaded_domain *) domain_file->data;
15436 +
15437 + nstrings = domain->nstrings;
15438 +
15439 + /* Locate the MSGID and its translation. */
15440 + if (domain->hash_tab != NULL)
15441 + {
15442 + /* Use the hashing table. */
15443 + nls_uint32 len = strlen (msgid);
15444 + nls_uint32 hash_val = hash_string (msgid);
15445 + nls_uint32 idx = hash_val % domain->hash_size;
15446 + nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
15447 +
15448 + while (1)
15449 + {
15450 + nls_uint32 nstr =
15451 + W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
15452 +
15453 + if (nstr == 0)
15454 + /* Hash table entry is empty. */
15455 + return NULL;
15456 +
15457 + nstr--;
15458 +
15459 + /* Compare msgid with the original string at index nstr.
15460 + We compare the lengths with >=, not ==, because plural entries
15461 + are represented by strings with an embedded NUL. */
15462 + if (nstr < nstrings
15463 + ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
15464 + && (strcmp (msgid,
15465 + domain->data + W (domain->must_swap,
15466 + domain->orig_tab[nstr].offset))
15467 + == 0)
15468 + : domain->orig_sysdep_tab[nstr - nstrings].length > len
15469 + && (strcmp (msgid,
15470 + domain->orig_sysdep_tab[nstr - nstrings].pointer)
15471 + == 0))
15472 + {
15473 + act = nstr;
15474 + goto found;
15475 + }
15476 +
15477 + if (idx >= domain->hash_size - incr)
15478 + idx -= domain->hash_size - incr;
15479 + else
15480 + idx += incr;
15481 + }
15482 + /* NOTREACHED */
15483 + }
15484 + else
15485 + {
15486 + /* Try the default method: binary search in the sorted array of
15487 + messages. */
15488 + size_t top, bottom;
15489 +
15490 + bottom = 0;
15491 + top = nstrings;
15492 + while (bottom < top)
15493 + {
15494 + int cmp_val;
15495 +
15496 + act = (bottom + top) / 2;
15497 + cmp_val = strcmp (msgid, (domain->data
15498 + + W (domain->must_swap,
15499 + domain->orig_tab[act].offset)));
15500 + if (cmp_val < 0)
15501 + top = act;
15502 + else if (cmp_val > 0)
15503 + bottom = act + 1;
15504 + else
15505 + goto found;
15506 + }
15507 + /* No translation was found. */
15508 + return NULL;
15509 + }
15510 +
15511 + found:
15512 + /* The translation was found at index ACT. If we have to convert the
15513 + string to use a different character set, this is the time. */
15514 + if (act < nstrings)
15515 + {
15516 + result = (char *)
15517 + (domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
15518 + resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
15519 + }
15520 + else
15521 + {
15522 + result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
15523 + resultlen = domain->trans_sysdep_tab[act - nstrings].length;
15524 + }
15525 +
15526 +#if defined _LIBC || HAVE_ICONV
15527 + if (domain->codeset_cntr
15528 + != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
15529 + {
15530 + /* The domain's codeset has changed through bind_textdomain_codeset()
15531 + since the message catalog was initialized or last accessed. We
15532 + have to reinitialize the converter. */
15533 + _nl_free_domain_conv (domain);
15534 + _nl_init_domain_conv (domain_file, domain, domainbinding);
15535 + }
15536 +
15537 + if (
15538 +# ifdef _LIBC
15539 + domain->conv != (__gconv_t) -1
15540 +# else
15541 +# if HAVE_ICONV
15542 + domain->conv != (iconv_t) -1
15543 +# endif
15544 +# endif
15545 + )
15546 + {
15547 + /* We are supposed to do a conversion. First allocate an
15548 + appropriate table with the same structure as the table
15549 + of translations in the file, where we can put the pointers
15550 + to the converted strings in.
15551 + There is a slight complication with plural entries. They
15552 + are represented by consecutive NUL terminated strings. We
15553 + handle this case by converting RESULTLEN bytes, including
15554 + NULs. */
15555 +
15556 + if (domain->conv_tab == NULL
15557 + && ((domain->conv_tab =
15558 + (char **) calloc (nstrings + domain->n_sysdep_strings,
15559 + sizeof (char *)))
15560 + == NULL))
15561 + /* Mark that we didn't succeed allocating a table. */
15562 + domain->conv_tab = (char **) -1;
15563 +
15564 + if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
15565 + /* Nothing we can do, no more memory. */
15566 + goto converted;
15567 +
15568 + if (domain->conv_tab[act] == NULL)
15569 + {
15570 + /* We haven't used this string so far, so it is not
15571 + translated yet. Do this now. */
15572 + /* We use a bit more efficient memory handling.
15573 + We allocate always larger blocks which get used over
15574 + time. This is faster than many small allocations. */
15575 + __libc_lock_define_initialized (static, lock)
15576 +# define INITIAL_BLOCK_SIZE 4080
15577 + static unsigned char *freemem;
15578 + static size_t freemem_size;
15579 +
15580 + const unsigned char *inbuf;
15581 + unsigned char *outbuf;
15582 + int malloc_count;
15583 +# ifndef _LIBC
15584 + transmem_block_t *transmem_list = NULL;
15585 +# endif
15586 +
15587 + __libc_lock_lock (lock);
15588 +
15589 + inbuf = (const unsigned char *) result;
15590 + outbuf = freemem + sizeof (size_t);
15591 +
15592 + malloc_count = 0;
15593 + while (1)
15594 + {
15595 + transmem_block_t *newmem;
15596 +# ifdef _LIBC
15597 + size_t non_reversible;
15598 + int res;
15599 +
15600 + if (freemem_size < sizeof (size_t))
15601 + goto resize_freemem;
15602 +
15603 + res = __gconv (domain->conv,
15604 + &inbuf, inbuf + resultlen,
15605 + &outbuf,
15606 + outbuf + freemem_size - sizeof (size_t),
15607 + &non_reversible);
15608 +
15609 + if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
15610 + break;
15611 +
15612 + if (res != __GCONV_FULL_OUTPUT)
15613 + {
15614 + __libc_lock_unlock (lock);
15615 + goto converted;
15616 + }
15617 +
15618 + inbuf = result;
15619 +# else
15620 +# if HAVE_ICONV
15621 + const char *inptr = (const char *) inbuf;
15622 + size_t inleft = resultlen;
15623 + char *outptr = (char *) outbuf;
15624 + size_t outleft;
15625 +
15626 + if (freemem_size < sizeof (size_t))
15627 + goto resize_freemem;
15628 +
15629 + outleft = freemem_size - sizeof (size_t);
15630 + if (iconv (domain->conv,
15631 + (ICONV_CONST char **) &inptr, &inleft,
15632 + &outptr, &outleft)
15633 + != (size_t) (-1))
15634 + {
15635 + outbuf = (unsigned char *) outptr;
15636 + break;
15637 + }
15638 + if (errno != E2BIG)
15639 + {
15640 + __libc_lock_unlock (lock);
15641 + goto converted;
15642 + }
15643 +# endif
15644 +# endif
15645 +
15646 + resize_freemem:
15647 + /* We must allocate a new buffer or resize the old one. */
15648 + if (malloc_count > 0)
15649 + {
15650 + ++malloc_count;
15651 + freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
15652 + newmem = (transmem_block_t *) realloc (transmem_list,
15653 + freemem_size);
15654 +# ifdef _LIBC
15655 + if (newmem != NULL)
15656 + transmem_list = transmem_list->next;
15657 + else
15658 + {
15659 + struct transmem_list *old = transmem_list;
15660 +
15661 + transmem_list = transmem_list->next;
15662 + free (old);
15663 + }
15664 +# endif
15665 + }
15666 + else
15667 + {
15668 + malloc_count = 1;
15669 + freemem_size = INITIAL_BLOCK_SIZE;
15670 + newmem = (transmem_block_t *) malloc (freemem_size);
15671 + }
15672 + if (__builtin_expect (newmem == NULL, 0))
15673 + {
15674 + freemem = NULL;
15675 + freemem_size = 0;
15676 + __libc_lock_unlock (lock);
15677 + goto converted;
15678 + }
15679 +
15680 +# ifdef _LIBC
15681 + /* Add the block to the list of blocks we have to free
15682 + at some point. */
15683 + newmem->next = transmem_list;
15684 + transmem_list = newmem;
15685 +
15686 + freemem = newmem->data;
15687 + freemem_size -= offsetof (struct transmem_list, data);
15688 +# else
15689 + transmem_list = newmem;
15690 + freemem = newmem;
15691 +# endif
15692 +
15693 + outbuf = freemem + sizeof (size_t);
15694 + }
15695 +
15696 + /* We have now in our buffer a converted string. Put this
15697 + into the table of conversions. */
15698 + *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
15699 + domain->conv_tab[act] = (char *) freemem;
15700 + /* Shrink freemem, but keep it aligned. */
15701 + freemem_size -= outbuf - freemem;
15702 + freemem = outbuf;
15703 + freemem += freemem_size & (alignof (size_t) - 1);
15704 + freemem_size = freemem_size & ~ (alignof (size_t) - 1);
15705 +
15706 + __libc_lock_unlock (lock);
15707 + }
15708 +
15709 + /* Now domain->conv_tab[act] contains the translation of all
15710 + the plural variants. */
15711 + result = domain->conv_tab[act] + sizeof (size_t);
15712 + resultlen = *(size_t *) domain->conv_tab[act];
15713 + }
15714 +
15715 + converted:
15716 + /* The result string is converted. */
15717 +
15718 +#endif /* _LIBC || HAVE_ICONV */
15719 +
15720 + *lengthp = resultlen;
15721 + return result;
15722 +}
15723 +
15724 +
15725 +/* Look up a plural variant. */
15726 +static char *
15727 +internal_function
15728 +plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
15729 + const char *translation, size_t translation_len)
15730 +{
15731 + struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
15732 + unsigned long int index;
15733 + const char *p;
15734 +
15735 + index = plural_eval (domaindata->plural, n);
15736 + if (index >= domaindata->nplurals)
15737 + /* This should never happen. It means the plural expression and the
15738 + given maximum value do not match. */
15739 + index = 0;
15740 +
15741 + /* Skip INDEX strings at TRANSLATION. */
15742 + p = translation;
15743 + while (index-- > 0)
15744 + {
15745 +#ifdef _LIBC
15746 + p = __rawmemchr (p, '\0');
15747 +#else
15748 + p = strchr (p, '\0');
15749 +#endif
15750 + /* And skip over the NUL byte. */
15751 + p++;
15752 +
15753 + if (p >= translation + translation_len)
15754 + /* This should never happen. It means the plural expression
15755 + evaluated to a value larger than the number of variants
15756 + available for MSGID1. */
15757 + return (char *) translation;
15758 + }
15759 + return (char *) p;
15760 +}
15761 +
15762 +#ifndef _LIBC
15763 +/* Return string representation of locale CATEGORY. */
15764 +static const char *
15765 +internal_function
15766 +category_to_name (int category)
15767 +{
15768 + const char *retval;
15769 +
15770 + switch (category)
15771 + {
15772 +#ifdef LC_COLLATE
15773 + case LC_COLLATE:
15774 + retval = "LC_COLLATE";
15775 + break;
15776 +#endif
15777 +#ifdef LC_CTYPE
15778 + case LC_CTYPE:
15779 + retval = "LC_CTYPE";
15780 + break;
15781 +#endif
15782 +#ifdef LC_MONETARY
15783 + case LC_MONETARY:
15784 + retval = "LC_MONETARY";
15785 + break;
15786 +#endif
15787 +#ifdef LC_NUMERIC
15788 + case LC_NUMERIC:
15789 + retval = "LC_NUMERIC";
15790 + break;
15791 +#endif
15792 +#ifdef LC_TIME
15793 + case LC_TIME:
15794 + retval = "LC_TIME";
15795 + break;
15796 +#endif
15797 +#ifdef LC_MESSAGES
15798 + case LC_MESSAGES:
15799 + retval = "LC_MESSAGES";
15800 + break;
15801 +#endif
15802 +#ifdef LC_RESPONSE
15803 + case LC_RESPONSE:
15804 + retval = "LC_RESPONSE";
15805 + break;
15806 +#endif
15807 +#ifdef LC_ALL
15808 + case LC_ALL:
15809 + /* This might not make sense but is perhaps better than any other
15810 + value. */
15811 + retval = "LC_ALL";
15812 + break;
15813 +#endif
15814 + default:
15815 + /* If you have a better idea for a default value let me know. */
15816 + retval = "LC_XXX";
15817 + }
15818 +
15819 + return retval;
15820 +}
15821 +#endif
15822 +
15823 +/* Guess value of current locale from value of the environment variables. */
15824 +static const char *
15825 +internal_function
15826 +guess_category_value (int category, const char *categoryname)
15827 +{
15828 + const char *language;
15829 + const char *retval;
15830 +
15831 + /* The highest priority value is the `LANGUAGE' environment
15832 + variable. But we don't use the value if the currently selected
15833 + locale is the C locale. This is a GNU extension. */
15834 + language = getenv ("LANGUAGE");
15835 + if (language != NULL && language[0] == '\0')
15836 + language = NULL;
15837 +
15838 + /* We have to proceed with the POSIX methods of looking to `LC_ALL',
15839 + `LC_xxx', and `LANG'. On some systems this can be done by the
15840 + `setlocale' function itself. */
15841 +#ifdef _LIBC
15842 + retval = __current_locale_name (category);
15843 +#else
15844 + retval = _nl_locale_name (category, categoryname);
15845 +#endif
15846 +
15847 + /* Ignore LANGUAGE if the locale is set to "C" because
15848 + 1. "C" locale usually uses the ASCII encoding, and most international
15849 + messages use non-ASCII characters. These characters get displayed
15850 + as question marks (if using glibc's iconv()) or as invalid 8-bit
15851 + characters (because other iconv()s refuse to convert most non-ASCII
15852 + characters to ASCII). In any case, the output is ugly.
15853 + 2. The precise output of some programs in the "C" locale is specified
15854 + by POSIX and should not depend on environment variables like
15855 + "LANGUAGE". We allow such programs to use gettext(). */
15856 + return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
15857 +}
15858 +
15859 +/* @@ begin of epilog @@ */
15860 +
15861 +/* We don't want libintl.a to depend on any other library. So we
15862 + avoid the non-standard function stpcpy. In GNU C Library this
15863 + function is available, though. Also allow the symbol HAVE_STPCPY
15864 + to be defined. */
15865 +#if !_LIBC && !HAVE_STPCPY
15866 +static char *
15867 +stpcpy (char *dest, const char *src)
15868 +{
15869 + while ((*dest++ = *src++) != '\0')
15870 + /* Do nothing. */ ;
15871 + return dest - 1;
15872 +}
15873 +#endif
15874 +
15875 +#if !_LIBC && !HAVE_MEMPCPY
15876 +static void *
15877 +mempcpy (void *dest, const void *src, size_t n)
15878 +{
15879 + return (void *) ((char *) memcpy (dest, src, n) + n);
15880 +}
15881 +#endif
15882 +
15883 +
15884 +#ifdef _LIBC
15885 +/* If we want to free all resources we have to do some work at
15886 + program's end. */
15887 +libc_freeres_fn (free_mem)
15888 +{
15889 + void *old;
15890 +
15891 + while (_nl_domain_bindings != NULL)
15892 + {
15893 + struct binding *oldp = _nl_domain_bindings;
15894 + _nl_domain_bindings = _nl_domain_bindings->next;
15895 + if (oldp->dirname != INTUSE(_nl_default_dirname))
15896 + /* Yes, this is a pointer comparison. */
15897 + free (oldp->dirname);
15898 + free (oldp->codeset);
15899 + free (oldp);
15900 + }
15901 +
15902 + if (_nl_current_default_domain != _nl_default_default_domain)
15903 + /* Yes, again a pointer comparison. */
15904 + free ((char *) _nl_current_default_domain);
15905 +
15906 + /* Remove the search tree with the known translations. */
15907 + __tdestroy (root, free);
15908 + root = NULL;
15909 +
15910 + while (transmem_list != NULL)
15911 + {
15912 + old = transmem_list;
15913 + transmem_list = transmem_list->next;
15914 + free (old);
15915 + }
15916 +}
15917 +#endif
15918 --- /dev/null
15919 +++ lxpanel-0.5.6/intl/ChangeLog
15920 @@ -0,0 +1,4 @@
15921 +2004-01-29 GNU <bug-gnu-gettext@gnu.org>
15922 +
15923 + * Version 0.14.1 released.
15924 +
15925 --- /dev/null
15926 +++ lxpanel-0.5.6/intl/os2compat.h
15927 @@ -0,0 +1,46 @@
15928 +/* OS/2 compatibility defines.
15929 + This file is intended to be included from config.h
15930 + Copyright (C) 2001-2002 Free Software Foundation, Inc.
15931 +
15932 + This program is free software; you can redistribute it and/or modify it
15933 + under the terms of the GNU Library General Public License as published
15934 + by the Free Software Foundation; either version 2, or (at your option)
15935 + any later version.
15936 +
15937 + This program is distributed in the hope that it will be useful,
15938 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15939 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15940 + Library General Public License for more details.
15941 +
15942 + You should have received a copy of the GNU Library General Public
15943 + License along with this program; if not, write to the Free Software
15944 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
15945 + USA. */
15946 +
15947 +/* When included from os2compat.h we need all the original definitions */
15948 +#ifndef OS2_AWARE
15949 +
15950 +#undef LIBDIR
15951 +#define LIBDIR _nlos2_libdir
15952 +extern char *_nlos2_libdir;
15953 +
15954 +#undef LOCALEDIR
15955 +#define LOCALEDIR _nlos2_localedir
15956 +extern char *_nlos2_localedir;
15957 +
15958 +#undef LOCALE_ALIAS_PATH
15959 +#define LOCALE_ALIAS_PATH _nlos2_localealiaspath
15960 +extern char *_nlos2_localealiaspath;
15961 +
15962 +#endif
15963 +
15964 +#undef HAVE_STRCASECMP
15965 +#define HAVE_STRCASECMP 1
15966 +#define strcasecmp stricmp
15967 +#define strncasecmp strnicmp
15968 +
15969 +/* We have our own getenv() which works even if library is compiled as DLL */
15970 +#define getenv _nl_getenv
15971 +
15972 +/* Older versions of gettext used -1 as the value of LC_MESSAGES */
15973 +#define LC_MESSAGES_COMPAT (-1)
15974 --- /dev/null
15975 +++ lxpanel-0.5.6/intl/plural-exp.c
15976 @@ -0,0 +1,154 @@
15977 +/* Expression parsing for plural form selection.
15978 + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
15979 + Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
15980 +
15981 + This program is free software; you can redistribute it and/or modify it
15982 + under the terms of the GNU Library General Public License as published
15983 + by the Free Software Foundation; either version 2, or (at your option)
15984 + any later version.
15985 +
15986 + This program is distributed in the hope that it will be useful,
15987 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15988 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15989 + Library General Public License for more details.
15990 +
15991 + You should have received a copy of the GNU Library General Public
15992 + License along with this program; if not, write to the Free Software
15993 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
15994 + USA. */
15995 +
15996 +#ifdef HAVE_CONFIG_H
15997 +# include <config.h>
15998 +#endif
15999 +
16000 +#include <ctype.h>
16001 +#include <stdlib.h>
16002 +#include <string.h>
16003 +
16004 +#include "plural-exp.h"
16005 +
16006 +#if (defined __GNUC__ && !defined __APPLE_CC__) \
16007 + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
16008 +
16009 +/* These structs are the constant expression for the germanic plural
16010 + form determination. It represents the expression "n != 1". */
16011 +static const struct expression plvar =
16012 +{
16013 + .nargs = 0,
16014 + .operation = var,
16015 +};
16016 +static const struct expression plone =
16017 +{
16018 + .nargs = 0,
16019 + .operation = num,
16020 + .val =
16021 + {
16022 + .num = 1
16023 + }
16024 +};
16025 +struct expression GERMANIC_PLURAL =
16026 +{
16027 + .nargs = 2,
16028 + .operation = not_equal,
16029 + .val =
16030 + {
16031 + .args =
16032 + {
16033 + [0] = (struct expression *) &plvar,
16034 + [1] = (struct expression *) &plone
16035 + }
16036 + }
16037 +};
16038 +
16039 +# define INIT_GERMANIC_PLURAL()
16040 +
16041 +#else
16042 +
16043 +/* For compilers without support for ISO C 99 struct/union initializers:
16044 + Initialization at run-time. */
16045 +
16046 +static struct expression plvar;
16047 +static struct expression plone;
16048 +struct expression GERMANIC_PLURAL;
16049 +
16050 +static void
16051 +init_germanic_plural ()
16052 +{
16053 + if (plone.val.num == 0)
16054 + {
16055 + plvar.nargs = 0;
16056 + plvar.operation = var;
16057 +
16058 + plone.nargs = 0;
16059 + plone.operation = num;
16060 + plone.val.num = 1;
16061 +
16062 + GERMANIC_PLURAL.nargs = 2;
16063 + GERMANIC_PLURAL.operation = not_equal;
16064 + GERMANIC_PLURAL.val.args[0] = &plvar;
16065 + GERMANIC_PLURAL.val.args[1] = &plone;
16066 + }
16067 +}
16068 +
16069 +# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
16070 +
16071 +#endif
16072 +
16073 +void
16074 +internal_function
16075 +EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
16076 + unsigned long int *npluralsp)
16077 +{
16078 + if (nullentry != NULL)
16079 + {
16080 + const char *plural;
16081 + const char *nplurals;
16082 +
16083 + plural = strstr (nullentry, "plural=");
16084 + nplurals = strstr (nullentry, "nplurals=");
16085 + if (plural == NULL || nplurals == NULL)
16086 + goto no_plural;
16087 + else
16088 + {
16089 + char *endp;
16090 + unsigned long int n;
16091 + struct parse_args args;
16092 +
16093 + /* First get the number. */
16094 + nplurals += 9;
16095 + while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
16096 + ++nplurals;
16097 + if (!(*nplurals >= '0' && *nplurals <= '9'))
16098 + goto no_plural;
16099 +#if defined HAVE_STRTOUL || defined _LIBC
16100 + n = strtoul (nplurals, &endp, 10);
16101 +#else
16102 + for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
16103 + n = n * 10 + (*endp - '0');
16104 +#endif
16105 + if (nplurals == endp)
16106 + goto no_plural;
16107 + *npluralsp = n;
16108 +
16109 + /* Due to the restrictions bison imposes onto the interface of the
16110 + scanner function we have to put the input string and the result
16111 + passed up from the parser into the same structure which address
16112 + is passed down to the parser. */
16113 + plural += 7;
16114 + args.cp = plural;
16115 + if (PLURAL_PARSE (&args) != 0)
16116 + goto no_plural;
16117 + *pluralp = args.res;
16118 + }
16119 + }
16120 + else
16121 + {
16122 + /* By default we are using the Germanic form: singular form only
16123 + for `one', the plural form otherwise. Yes, this is also what
16124 + English is using since English is a Germanic language. */
16125 + no_plural:
16126 + INIT_GERMANIC_PLURAL ();
16127 + *pluralp = &GERMANIC_PLURAL;
16128 + *npluralsp = 2;
16129 + }
16130 +}
16131 --- /dev/null
16132 +++ lxpanel-0.5.6/intl/wprintf-parse.h
16133 @@ -0,0 +1,75 @@
16134 +/* Parse printf format string.
16135 + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
16136 +
16137 + This program is free software; you can redistribute it and/or modify it
16138 + under the terms of the GNU Library General Public License as published
16139 + by the Free Software Foundation; either version 2, or (at your option)
16140 + any later version.
16141 +
16142 + This program is distributed in the hope that it will be useful,
16143 + but WITHOUT ANY WARRANTY; without even the implied warranty of
16144 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16145 + Library General Public License for more details.
16146 +
16147 + You should have received a copy of the GNU Library General Public
16148 + License along with this program; if not, write to the Free Software
16149 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16150 + USA. */
16151 +
16152 +#ifndef _WPRINTF_PARSE_H
16153 +#define _WPRINTF_PARSE_H
16154 +
16155 +#include "printf-args.h"
16156 +
16157 +
16158 +/* Flags */
16159 +#define FLAG_GROUP 1 /* ' flag */
16160 +#define FLAG_LEFT 2 /* - flag */
16161 +#define FLAG_SHOWSIGN 4 /* + flag */
16162 +#define FLAG_SPACE 8 /* space flag */
16163 +#define FLAG_ALT 16 /* # flag */
16164 +#define FLAG_ZERO 32
16165 +
16166 +/* arg_index value indicating that no argument is consumed. */
16167 +#define ARG_NONE (~(size_t)0)
16168 +
16169 +/* A parsed directive. */
16170 +typedef struct
16171 +{
16172 + const wchar_t* dir_start;
16173 + const wchar_t* dir_end;
16174 + int flags;
16175 + const wchar_t* width_start;
16176 + const wchar_t* width_end;
16177 + size_t width_arg_index;
16178 + const wchar_t* precision_start;
16179 + const wchar_t* precision_end;
16180 + size_t precision_arg_index;
16181 + wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
16182 + size_t arg_index;
16183 +}
16184 +wchar_t_directive;
16185 +
16186 +/* A parsed format string. */
16187 +typedef struct
16188 +{
16189 + size_t count;
16190 + wchar_t_directive *dir;
16191 + size_t max_width_length;
16192 + size_t max_precision_length;
16193 +}
16194 +wchar_t_directives;
16195 +
16196 +
16197 +/* Parses the format string. Fills in the number N of directives, and fills
16198 + in directives[0], ..., directives[N-1], and sets directives[N].dir_start
16199 + to the end of the format string. Also fills in the arg_type fields of the
16200 + arguments and the needed count of arguments. */
16201 +#ifdef STATIC
16202 +STATIC
16203 +#else
16204 +extern
16205 +#endif
16206 +int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
16207 +
16208 +#endif /* _WPRINTF_PARSE_H */
16209 --- /dev/null
16210 +++ lxpanel-0.5.6/intl/os2compat.c
16211 @@ -0,0 +1,98 @@
16212 +/* OS/2 compatibility functions.
16213 + Copyright (C) 2001-2002 Free Software Foundation, Inc.
16214 +
16215 + This program is free software; you can redistribute it and/or modify it
16216 + under the terms of the GNU Library General Public License as published
16217 + by the Free Software Foundation; either version 2, or (at your option)
16218 + any later version.
16219 +
16220 + This program is distributed in the hope that it will be useful,
16221 + but WITHOUT ANY WARRANTY; without even the implied warranty of
16222 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16223 + Library General Public License for more details.
16224 +
16225 + You should have received a copy of the GNU Library General Public
16226 + License along with this program; if not, write to the Free Software
16227 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16228 + USA. */
16229 +
16230 +#define OS2_AWARE
16231 +#ifdef HAVE_CONFIG_H
16232 +#include <config.h>
16233 +#endif
16234 +
16235 +#include <stdlib.h>
16236 +#include <string.h>
16237 +#include <sys/param.h>
16238 +
16239 +/* A version of getenv() that works from DLLs */
16240 +extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
16241 +
16242 +char *
16243 +_nl_getenv (const char *name)
16244 +{
16245 + unsigned char *value;
16246 + if (DosScanEnv (name, &value))
16247 + return NULL;
16248 + else
16249 + return value;
16250 +}
16251 +
16252 +/* A fixed size buffer. */
16253 +char libintl_nl_default_dirname[MAXPATHLEN+1];
16254 +
16255 +char *_nlos2_libdir = NULL;
16256 +char *_nlos2_localealiaspath = NULL;
16257 +char *_nlos2_localedir = NULL;
16258 +
16259 +static __attribute__((constructor)) void
16260 +nlos2_initialize ()
16261 +{
16262 + char *root = getenv ("UNIXROOT");
16263 + char *gnulocaledir = getenv ("GNULOCALEDIR");
16264 +
16265 + _nlos2_libdir = gnulocaledir;
16266 + if (!_nlos2_libdir)
16267 + {
16268 + if (root)
16269 + {
16270 + size_t sl = strlen (root);
16271 + _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
16272 + memcpy (_nlos2_libdir, root, sl);
16273 + memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
16274 + }
16275 + else
16276 + _nlos2_libdir = LIBDIR;
16277 + }
16278 +
16279 + _nlos2_localealiaspath = gnulocaledir;
16280 + if (!_nlos2_localealiaspath)
16281 + {
16282 + if (root)
16283 + {
16284 + size_t sl = strlen (root);
16285 + _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
16286 + memcpy (_nlos2_localealiaspath, root, sl);
16287 + memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
16288 + }
16289 + else
16290 + _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
16291 + }
16292 +
16293 + _nlos2_localedir = gnulocaledir;
16294 + if (!_nlos2_localedir)
16295 + {
16296 + if (root)
16297 + {
16298 + size_t sl = strlen (root);
16299 + _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
16300 + memcpy (_nlos2_localedir, root, sl);
16301 + memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
16302 + }
16303 + else
16304 + _nlos2_localedir = LOCALEDIR;
16305 + }
16306 +
16307 + if (strlen (_nlos2_localedir) <= MAXPATHLEN)
16308 + strcpy (libintl_nl_default_dirname, _nlos2_localedir);
16309 +}
16310 --- /dev/null
16311 +++ lxpanel-0.5.6/intl/printf-parse.h
16312 @@ -0,0 +1,75 @@
16313 +/* Parse printf format string.
16314 + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
16315 +
16316 + This program is free software; you can redistribute it and/or modify it
16317 + under the terms of the GNU Library General Public License as published
16318 + by the Free Software Foundation; either version 2, or (at your option)
16319 + any later version.
16320 +
16321 + This program is distributed in the hope that it will be useful,
16322 + but WITHOUT ANY WARRANTY; without even the implied warranty of
16323 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16324 + Library General Public License for more details.
16325 +
16326 + You should have received a copy of the GNU Library General Public
16327 + License along with this program; if not, write to the Free Software
16328 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16329 + USA. */
16330 +
16331 +#ifndef _PRINTF_PARSE_H
16332 +#define _PRINTF_PARSE_H
16333 +
16334 +#include "printf-args.h"
16335 +
16336 +
16337 +/* Flags */
16338 +#define FLAG_GROUP 1 /* ' flag */
16339 +#define FLAG_LEFT 2 /* - flag */
16340 +#define FLAG_SHOWSIGN 4 /* + flag */
16341 +#define FLAG_SPACE 8 /* space flag */
16342 +#define FLAG_ALT 16 /* # flag */
16343 +#define FLAG_ZERO 32
16344 +
16345 +/* arg_index value indicating that no argument is consumed. */
16346 +#define ARG_NONE (~(size_t)0)
16347 +
16348 +/* A parsed directive. */
16349 +typedef struct
16350 +{
16351 + const char* dir_start;
16352 + const char* dir_end;
16353 + int flags;
16354 + const char* width_start;
16355 + const char* width_end;
16356 + size_t width_arg_index;
16357 + const char* precision_start;
16358 + const char* precision_end;
16359 + size_t precision_arg_index;
16360 + char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
16361 + size_t arg_index;
16362 +}
16363 +char_directive;
16364 +
16365 +/* A parsed format string. */
16366 +typedef struct
16367 +{
16368 + size_t count;
16369 + char_directive *dir;
16370 + size_t max_width_length;
16371 + size_t max_precision_length;
16372 +}
16373 +char_directives;
16374 +
16375 +
16376 +/* Parses the format string. Fills in the number N of directives, and fills
16377 + in directives[0], ..., directives[N-1], and sets directives[N].dir_start
16378 + to the end of the format string. Also fills in the arg_type fields of the
16379 + arguments and the needed count of arguments. */
16380 +#ifdef STATIC
16381 +STATIC
16382 +#else
16383 +extern
16384 +#endif
16385 +int printf_parse (const char *format, char_directives *d, arguments *a);
16386 +
16387 +#endif /* _PRINTF_PARSE_H */
16388 --- /dev/null
16389 +++ lxpanel-0.5.6/intl/plural.y
16390 @@ -0,0 +1,381 @@
16391 +%{
16392 +/* Expression parsing for plural form selection.
16393 + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
16394 + Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
16395 +
16396 + This program is free software; you can redistribute it and/or modify it
16397 + under the terms of the GNU Library General Public License as published
16398 + by the Free Software Foundation; either version 2, or (at your option)
16399 + any later version.
16400 +
16401 + This program is distributed in the hope that it will be useful,
16402 + but WITHOUT ANY WARRANTY; without even the implied warranty of
16403 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16404 + Library General Public License for more details.
16405 +
16406 + You should have received a copy of the GNU Library General Public
16407 + License along with this program; if not, write to the Free Software
16408 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16409 + USA. */
16410 +
16411 +/* The bison generated parser uses alloca. AIX 3 forces us to put this
16412 + declaration at the beginning of the file. The declaration in bison's
16413 + skeleton file comes too late. This must come before <config.h>
16414 + because <config.h> may include arbitrary system headers. */
16415 +#if defined _AIX && !defined __GNUC__
16416 + #pragma alloca
16417 +#endif
16418 +
16419 +#ifdef HAVE_CONFIG_H
16420 +# include <config.h>
16421 +#endif
16422 +
16423 +#include <stddef.h>
16424 +#include <stdlib.h>
16425 +#include "plural-exp.h"
16426 +
16427 +/* The main function generated by the parser is called __gettextparse,
16428 + but we want it to be called PLURAL_PARSE. */
16429 +#ifndef _LIBC
16430 +# define __gettextparse PLURAL_PARSE
16431 +#endif
16432 +
16433 +#define YYLEX_PARAM &((struct parse_args *) arg)->cp
16434 +#define YYPARSE_PARAM arg
16435 +%}
16436 +%pure_parser
16437 +%expect 7
16438 +
16439 +%union {
16440 + unsigned long int num;
16441 + enum operator op;
16442 + struct expression *exp;
16443 +}
16444 +
16445 +%{
16446 +/* Prototypes for local functions. */
16447 +static int yylex (YYSTYPE *lval, const char **pexp);
16448 +static void yyerror (const char *str);
16449 +
16450 +/* Allocation of expressions. */
16451 +
16452 +static struct expression *
16453 +new_exp (int nargs, enum operator op, struct expression * const *args)
16454 +{
16455 + int i;
16456 + struct expression *newp;
16457 +
16458 + /* If any of the argument could not be malloc'ed, just return NULL. */
16459 + for (i = nargs - 1; i >= 0; i--)
16460 + if (args[i] == NULL)
16461 + goto fail;
16462 +
16463 + /* Allocate a new expression. */
16464 + newp = (struct expression *) malloc (sizeof (*newp));
16465 + if (newp != NULL)
16466 + {
16467 + newp->nargs = nargs;
16468 + newp->operation = op;
16469 + for (i = nargs - 1; i >= 0; i--)
16470 + newp->val.args[i] = args[i];
16471 + return newp;
16472 + }
16473 +
16474 + fail:
16475 + for (i = nargs - 1; i >= 0; i--)
16476 + FREE_EXPRESSION (args[i]);
16477 +
16478 + return NULL;
16479 +}
16480 +
16481 +static inline struct expression *
16482 +new_exp_0 (enum operator op)
16483 +{
16484 + return new_exp (0, op, NULL);
16485 +}
16486 +
16487 +static inline struct expression *
16488 +new_exp_1 (enum operator op, struct expression *right)
16489 +{
16490 + struct expression *args[1];
16491 +
16492 + args[0] = right;
16493 + return new_exp (1, op, args);
16494 +}
16495 +
16496 +static struct expression *
16497 +new_exp_2 (enum operator op, struct expression *left, struct expression *right)
16498 +{
16499 + struct expression *args[2];
16500 +
16501 + args[0] = left;
16502 + args[1] = right;
16503 + return new_exp (2, op, args);
16504 +}
16505 +
16506 +static inline struct expression *
16507 +new_exp_3 (enum operator op, struct expression *bexp,
16508 + struct expression *tbranch, struct expression *fbranch)
16509 +{
16510 + struct expression *args[3];
16511 +
16512 + args[0] = bexp;
16513 + args[1] = tbranch;
16514 + args[2] = fbranch;
16515 + return new_exp (3, op, args);
16516 +}
16517 +
16518 +%}
16519 +
16520 +/* This declares that all operators have the same associativity and the
16521 + precedence order as in C. See [Harbison, Steele: C, A Reference Manual].
16522 + There is no unary minus and no bitwise operators.
16523 + Operators with the same syntactic behaviour have been merged into a single
16524 + token, to save space in the array generated by bison. */
16525 +%right '?' /* ? */
16526 +%left '|' /* || */
16527 +%left '&' /* && */
16528 +%left EQUOP2 /* == != */
16529 +%left CMPOP2 /* < > <= >= */
16530 +%left ADDOP2 /* + - */
16531 +%left MULOP2 /* * / % */
16532 +%right '!' /* ! */
16533 +
16534 +%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
16535 +%token <num> NUMBER
16536 +%type <exp> exp
16537 +
16538 +%%
16539 +
16540 +start: exp
16541 + {
16542 + if ($1 == NULL)
16543 + YYABORT;
16544 + ((struct parse_args *) arg)->res = $1;
16545 + }
16546 + ;
16547 +
16548 +exp: exp '?' exp ':' exp
16549 + {
16550 + $$ = new_exp_3 (qmop, $1, $3, $5);
16551 + }
16552 + | exp '|' exp
16553 + {
16554 + $$ = new_exp_2 (lor, $1, $3);
16555 + }
16556 + | exp '&' exp
16557 + {
16558 + $$ = new_exp_2 (land, $1, $3);
16559 + }
16560 + | exp EQUOP2 exp
16561 + {
16562 + $$ = new_exp_2 ($2, $1, $3);
16563 + }
16564 + | exp CMPOP2 exp
16565 + {
16566 + $$ = new_exp_2 ($2, $1, $3);
16567 + }
16568 + | exp ADDOP2 exp
16569 + {
16570 + $$ = new_exp_2 ($2, $1, $3);
16571 + }
16572 + | exp MULOP2 exp
16573 + {
16574 + $$ = new_exp_2 ($2, $1, $3);
16575 + }
16576 + | '!' exp
16577 + {
16578 + $$ = new_exp_1 (lnot, $2);
16579 + }
16580 + | 'n'
16581 + {
16582 + $$ = new_exp_0 (var);
16583 + }
16584 + | NUMBER
16585 + {
16586 + if (($$ = new_exp_0 (num)) != NULL)
16587 + $$->val.num = $1;
16588 + }
16589 + | '(' exp ')'
16590 + {
16591 + $$ = $2;
16592 + }
16593 + ;
16594 +
16595 +%%
16596 +
16597 +void
16598 +internal_function
16599 +FREE_EXPRESSION (struct expression *exp)
16600 +{
16601 + if (exp == NULL)
16602 + return;
16603 +
16604 + /* Handle the recursive case. */
16605 + switch (exp->nargs)
16606 + {
16607 + case 3:
16608 + FREE_EXPRESSION (exp->val.args[2]);
16609 + /* FALLTHROUGH */
16610 + case 2:
16611 + FREE_EXPRESSION (exp->val.args[1]);
16612 + /* FALLTHROUGH */
16613 + case 1:
16614 + FREE_EXPRESSION (exp->val.args[0]);
16615 + /* FALLTHROUGH */
16616 + default:
16617 + break;
16618 + }
16619 +
16620 + free (exp);
16621 +}
16622 +
16623 +
16624 +static int
16625 +yylex (YYSTYPE *lval, const char **pexp)
16626 +{
16627 + const char *exp = *pexp;
16628 + int result;
16629 +
16630 + while (1)
16631 + {
16632 + if (exp[0] == '\0')
16633 + {
16634 + *pexp = exp;
16635 + return YYEOF;
16636 + }
16637 +
16638 + if (exp[0] != ' ' && exp[0] != '\t')
16639 + break;
16640 +
16641 + ++exp;
16642 + }
16643 +
16644 + result = *exp++;
16645 + switch (result)
16646 + {
16647 + case '0': case '1': case '2': case '3': case '4':
16648 + case '5': case '6': case '7': case '8': case '9':
16649 + {
16650 + unsigned long int n = result - '0';
16651 + while (exp[0] >= '0' && exp[0] <= '9')
16652 + {
16653 + n *= 10;
16654 + n += exp[0] - '0';
16655 + ++exp;
16656 + }
16657 + lval->num = n;
16658 + result = NUMBER;
16659 + }
16660 + break;
16661 +
16662 + case '=':
16663 + if (exp[0] == '=')
16664 + {
16665 + ++exp;
16666 + lval->op = equal;
16667 + result = EQUOP2;
16668 + }
16669 + else
16670 + result = YYERRCODE;
16671 + break;
16672 +
16673 + case '!':
16674 + if (exp[0] == '=')
16675 + {
16676 + ++exp;
16677 + lval->op = not_equal;
16678 + result = EQUOP2;
16679 + }
16680 + break;
16681 +
16682 + case '&':
16683 + case '|':
16684 + if (exp[0] == result)
16685 + ++exp;
16686 + else
16687 + result = YYERRCODE;
16688 + break;
16689 +
16690 + case '<':
16691 + if (exp[0] == '=')
16692 + {
16693 + ++exp;
16694 + lval->op = less_or_equal;
16695 + }
16696 + else
16697 + lval->op = less_than;
16698 + result = CMPOP2;
16699 + break;
16700 +
16701 + case '>':
16702 + if (exp[0] == '=')
16703 + {
16704 + ++exp;
16705 + lval->op = greater_or_equal;
16706 + }
16707 + else
16708 + lval->op = greater_than;
16709 + result = CMPOP2;
16710 + break;
16711 +
16712 + case '*':
16713 + lval->op = mult;
16714 + result = MULOP2;
16715 + break;
16716 +
16717 + case '/':
16718 + lval->op = divide;
16719 + result = MULOP2;
16720 + break;
16721 +
16722 + case '%':
16723 + lval->op = module;
16724 + result = MULOP2;
16725 + break;
16726 +
16727 + case '+':
16728 + lval->op = plus;
16729 + result = ADDOP2;
16730 + break;
16731 +
16732 + case '-':
16733 + lval->op = minus;
16734 + result = ADDOP2;
16735 + break;
16736 +
16737 + case 'n':
16738 + case '?':
16739 + case ':':
16740 + case '(':
16741 + case ')':
16742 + /* Nothing, just return the character. */
16743 + break;
16744 +
16745 + case ';':
16746 + case '\n':
16747 + case '\0':
16748 + /* Be safe and let the user call this function again. */
16749 + --exp;
16750 + result = YYEOF;
16751 + break;
16752 +
16753 + default:
16754 + result = YYERRCODE;
16755 +#if YYDEBUG != 0
16756 + --exp;
16757 +#endif
16758 + break;
16759 + }
16760 +
16761 + *pexp = exp;
16762 +
16763 + return result;
16764 +}
16765 +
16766 +
16767 +static void
16768 +yyerror (const char *str)
16769 +{
16770 + /* Do nothing. We don't print error messages here. */
16771 +}
16772 --- /dev/null
16773 +++ lxpanel-0.5.6/intl/VERSION
16774 @@ -0,0 +1 @@
16775 +GNU gettext library from gettext-0.14.1
16776 --- /dev/null
16777 +++ lxpanel-0.5.6/intl/config.charset
16778 @@ -0,0 +1,608 @@
16779 +#! /bin/sh
16780 +# Output a system dependent table of character encoding aliases.
16781 +#
16782 +# Copyright (C) 2000-2004 Free Software Foundation, Inc.
16783 +#
16784 +# This program is free software; you can redistribute it and/or modify it
16785 +# under the terms of the GNU Library General Public License as published
16786 +# by the Free Software Foundation; either version 2, or (at your option)
16787 +# any later version.
16788 +#
16789 +# This program is distributed in the hope that it will be useful,
16790 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
16791 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16792 +# Library General Public License for more details.
16793 +#
16794 +# You should have received a copy of the GNU Library General Public
16795 +# License along with this program; if not, write to the Free Software
16796 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16797 +# USA.
16798 +#
16799 +# The table consists of lines of the form
16800 +# ALIAS CANONICAL
16801 +#
16802 +# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
16803 +# ALIAS is compared in a case sensitive way.
16804 +#
16805 +# CANONICAL is the GNU canonical name for this character encoding.
16806 +# It must be an encoding supported by libiconv. Support by GNU libc is
16807 +# also desirable. CANONICAL is case insensitive. Usually an upper case
16808 +# MIME charset name is preferred.
16809 +# The current list of GNU canonical charset names is as follows.
16810 +#
16811 +# name MIME? used by which systems
16812 +# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin
16813 +# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin
16814 +# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin
16815 +# ISO-8859-3 Y glibc solaris
16816 +# ISO-8859-4 Y osf solaris freebsd darwin
16817 +# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
16818 +# ISO-8859-6 Y glibc aix hpux solaris
16819 +# ISO-8859-7 Y glibc aix hpux irix osf solaris
16820 +# ISO-8859-8 Y glibc aix hpux osf solaris
16821 +# ISO-8859-9 Y glibc aix hpux irix osf solaris
16822 +# ISO-8859-13 glibc
16823 +# ISO-8859-14 glibc
16824 +# ISO-8859-15 glibc aix osf solaris freebsd
16825 +# KOI8-R Y glibc solaris freebsd darwin
16826 +# KOI8-U Y glibc freebsd darwin
16827 +# KOI8-T glibc
16828 +# CP437 dos
16829 +# CP775 dos
16830 +# CP850 aix osf dos
16831 +# CP852 dos
16832 +# CP855 dos
16833 +# CP856 aix
16834 +# CP857 dos
16835 +# CP861 dos
16836 +# CP862 dos
16837 +# CP864 dos
16838 +# CP865 dos
16839 +# CP866 freebsd darwin dos
16840 +# CP869 dos
16841 +# CP874 woe32 dos
16842 +# CP922 aix
16843 +# CP932 aix woe32 dos
16844 +# CP943 aix
16845 +# CP949 osf woe32 dos
16846 +# CP950 woe32 dos
16847 +# CP1046 aix
16848 +# CP1124 aix
16849 +# CP1125 dos
16850 +# CP1129 aix
16851 +# CP1250 woe32
16852 +# CP1251 glibc solaris darwin woe32
16853 +# CP1252 aix woe32
16854 +# CP1253 woe32
16855 +# CP1254 woe32
16856 +# CP1255 glibc woe32
16857 +# CP1256 woe32
16858 +# CP1257 woe32
16859 +# GB2312 Y glibc aix hpux irix solaris freebsd darwin
16860 +# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin
16861 +# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin
16862 +# EUC-TW glibc aix hpux irix osf solaris
16863 +# BIG5 Y glibc aix hpux osf solaris freebsd darwin
16864 +# BIG5-HKSCS glibc solaris
16865 +# GBK glibc aix osf solaris woe32 dos
16866 +# GB18030 glibc solaris
16867 +# SHIFT_JIS Y hpux osf solaris freebsd darwin
16868 +# JOHAB glibc solaris woe32
16869 +# TIS-620 glibc aix hpux osf solaris
16870 +# VISCII Y glibc
16871 +# TCVN5712-1 glibc
16872 +# GEORGIAN-PS glibc
16873 +# HP-ROMAN8 hpux
16874 +# HP-ARABIC8 hpux
16875 +# HP-GREEK8 hpux
16876 +# HP-HEBREW8 hpux
16877 +# HP-TURKISH8 hpux
16878 +# HP-KANA8 hpux
16879 +# DEC-KANJI osf
16880 +# DEC-HANYU osf
16881 +# UTF-8 Y glibc aix hpux osf solaris
16882 +#
16883 +# Note: Names which are not marked as being a MIME name should not be used in
16884 +# Internet protocols for information interchange (mail, news, etc.).
16885 +#
16886 +# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
16887 +# must understand both names and treat them as equivalent.
16888 +#
16889 +# The first argument passed to this file is the canonical host specification,
16890 +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
16891 +# or
16892 +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
16893 +
16894 +host="$1"
16895 +os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
16896 +echo "# This file contains a table of character encoding aliases,"
16897 +echo "# suitable for operating system '${os}'."
16898 +echo "# It was automatically generated from config.charset."
16899 +# List of references, updated during installation:
16900 +echo "# Packages using this file: "
16901 +case "$os" in
16902 + linux-gnulibc1*)
16903 + # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
16904 + # localcharset.c falls back to using the full locale name
16905 + # from the environment variables.
16906 + echo "C ASCII"
16907 + echo "POSIX ASCII"
16908 + for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
16909 + en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
16910 + en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
16911 + es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
16912 + et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
16913 + fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
16914 + it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
16915 + sv_FI sv_SE; do
16916 + echo "$l ISO-8859-1"
16917 + echo "$l.iso-8859-1 ISO-8859-1"
16918 + echo "$l.iso-8859-15 ISO-8859-15"
16919 + echo "$l.iso-8859-15@euro ISO-8859-15"
16920 + echo "$l@euro ISO-8859-15"
16921 + echo "$l.cp-437 CP437"
16922 + echo "$l.cp-850 CP850"
16923 + echo "$l.cp-1252 CP1252"
16924 + echo "$l.cp-1252@euro CP1252"
16925 + #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
16926 + echo "$l.utf-8 UTF-8"
16927 + echo "$l.utf-8@euro UTF-8"
16928 + done
16929 + for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
16930 + sl_SI sr sr_CS sr_YU; do
16931 + echo "$l ISO-8859-2"
16932 + echo "$l.iso-8859-2 ISO-8859-2"
16933 + echo "$l.cp-852 CP852"
16934 + echo "$l.cp-1250 CP1250"
16935 + echo "$l.utf-8 UTF-8"
16936 + done
16937 + for l in mk mk_MK ru ru_RU; do
16938 + echo "$l ISO-8859-5"
16939 + echo "$l.iso-8859-5 ISO-8859-5"
16940 + echo "$l.koi8-r KOI8-R"
16941 + echo "$l.cp-866 CP866"
16942 + echo "$l.cp-1251 CP1251"
16943 + echo "$l.utf-8 UTF-8"
16944 + done
16945 + for l in ar ar_SA; do
16946 + echo "$l ISO-8859-6"
16947 + echo "$l.iso-8859-6 ISO-8859-6"
16948 + echo "$l.cp-864 CP864"
16949 + #echo "$l.cp-868 CP868" # not a commonly used encoding
16950 + echo "$l.cp-1256 CP1256"
16951 + echo "$l.utf-8 UTF-8"
16952 + done
16953 + for l in el el_GR gr gr_GR; do
16954 + echo "$l ISO-8859-7"
16955 + echo "$l.iso-8859-7 ISO-8859-7"
16956 + echo "$l.cp-869 CP869"
16957 + echo "$l.cp-1253 CP1253"
16958 + echo "$l.cp-1253@euro CP1253"
16959 + echo "$l.utf-8 UTF-8"
16960 + echo "$l.utf-8@euro UTF-8"
16961 + done
16962 + for l in he he_IL iw iw_IL; do
16963 + echo "$l ISO-8859-8"
16964 + echo "$l.iso-8859-8 ISO-8859-8"
16965 + echo "$l.cp-862 CP862"
16966 + echo "$l.cp-1255 CP1255"
16967 + echo "$l.utf-8 UTF-8"
16968 + done
16969 + for l in tr tr_TR; do
16970 + echo "$l ISO-8859-9"
16971 + echo "$l.iso-8859-9 ISO-8859-9"
16972 + echo "$l.cp-857 CP857"
16973 + echo "$l.cp-1254 CP1254"
16974 + echo "$l.utf-8 UTF-8"
16975 + done
16976 + for l in lt lt_LT lv lv_LV; do
16977 + #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
16978 + echo "$l ISO-8859-13"
16979 + done
16980 + for l in ru_UA uk uk_UA; do
16981 + echo "$l KOI8-U"
16982 + done
16983 + for l in zh zh_CN; do
16984 + #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
16985 + echo "$l GB2312"
16986 + done
16987 + for l in ja ja_JP ja_JP.EUC; do
16988 + echo "$l EUC-JP"
16989 + done
16990 + for l in ko ko_KR; do
16991 + echo "$l EUC-KR"
16992 + done
16993 + for l in th th_TH; do
16994 + echo "$l TIS-620"
16995 + done
16996 + for l in fa fa_IR; do
16997 + #echo "$l ISIRI-3342" # a broken encoding
16998 + echo "$l.utf-8 UTF-8"
16999 + done
17000 + ;;
17001 + linux* | *-gnu*)
17002 + # With glibc-2.1 or newer, we don't need any canonicalization,
17003 + # because glibc has iconv and both glibc and libiconv support all
17004 + # GNU canonical names directly. Therefore, the Makefile does not
17005 + # need to install the alias file at all.
17006 + # The following applies only to glibc-2.0.x and older libcs.
17007 + echo "ISO_646.IRV:1983 ASCII"
17008 + ;;
17009 + aix*)
17010 + echo "ISO8859-1 ISO-8859-1"
17011 + echo "ISO8859-2 ISO-8859-2"
17012 + echo "ISO8859-5 ISO-8859-5"
17013 + echo "ISO8859-6 ISO-8859-6"
17014 + echo "ISO8859-7 ISO-8859-7"
17015 + echo "ISO8859-8 ISO-8859-8"
17016 + echo "ISO8859-9 ISO-8859-9"
17017 + echo "ISO8859-15 ISO-8859-15"
17018 + echo "IBM-850 CP850"
17019 + echo "IBM-856 CP856"
17020 + echo "IBM-921 ISO-8859-13"
17021 + echo "IBM-922 CP922"
17022 + echo "IBM-932 CP932"
17023 + echo "IBM-943 CP943"
17024 + echo "IBM-1046 CP1046"
17025 + echo "IBM-1124 CP1124"
17026 + echo "IBM-1129 CP1129"
17027 + echo "IBM-1252 CP1252"
17028 + echo "IBM-eucCN GB2312"
17029 + echo "IBM-eucJP EUC-JP"
17030 + echo "IBM-eucKR EUC-KR"
17031 + echo "IBM-eucTW EUC-TW"
17032 + echo "big5 BIG5"
17033 + echo "GBK GBK"
17034 + echo "TIS-620 TIS-620"
17035 + echo "UTF-8 UTF-8"
17036 + ;;
17037 + hpux*)
17038 + echo "iso88591 ISO-8859-1"
17039 + echo "iso88592 ISO-8859-2"
17040 + echo "iso88595 ISO-8859-5"
17041 + echo "iso88596 ISO-8859-6"
17042 + echo "iso88597 ISO-8859-7"
17043 + echo "iso88598 ISO-8859-8"
17044 + echo "iso88599 ISO-8859-9"
17045 + echo "iso885915 ISO-8859-15"
17046 + echo "roman8 HP-ROMAN8"
17047 + echo "arabic8 HP-ARABIC8"
17048 + echo "greek8 HP-GREEK8"
17049 + echo "hebrew8 HP-HEBREW8"
17050 + echo "turkish8 HP-TURKISH8"
17051 + echo "kana8 HP-KANA8"
17052 + echo "tis620 TIS-620"
17053 + echo "big5 BIG5"
17054 + echo "eucJP EUC-JP"
17055 + echo "eucKR EUC-KR"
17056 + echo "eucTW EUC-TW"
17057 + echo "hp15CN GB2312"
17058 + #echo "ccdc ?" # what is this?
17059 + echo "SJIS SHIFT_JIS"
17060 + echo "utf8 UTF-8"
17061 + ;;
17062 + irix*)
17063 + echo "ISO8859-1 ISO-8859-1"
17064 + echo "ISO8859-2 ISO-8859-2"
17065 + echo "ISO8859-5 ISO-8859-5"
17066 + echo "ISO8859-7 ISO-8859-7"
17067 + echo "ISO8859-9 ISO-8859-9"
17068 + echo "eucCN GB2312"
17069 + echo "eucJP EUC-JP"
17070 + echo "eucKR EUC-KR"
17071 + echo "eucTW EUC-TW"
17072 + ;;
17073 + osf*)
17074 + echo "ISO8859-1 ISO-8859-1"
17075 + echo "ISO8859-2 ISO-8859-2"
17076 + echo "ISO8859-4 ISO-8859-4"
17077 + echo "ISO8859-5 ISO-8859-5"
17078 + echo "ISO8859-7 ISO-8859-7"
17079 + echo "ISO8859-8 ISO-8859-8"
17080 + echo "ISO8859-9 ISO-8859-9"
17081 + echo "ISO8859-15 ISO-8859-15"
17082 + echo "cp850 CP850"
17083 + echo "big5 BIG5"
17084 + echo "dechanyu DEC-HANYU"
17085 + echo "dechanzi GB2312"
17086 + echo "deckanji DEC-KANJI"
17087 + echo "deckorean EUC-KR"
17088 + echo "eucJP EUC-JP"
17089 + echo "eucKR EUC-KR"
17090 + echo "eucTW EUC-TW"
17091 + echo "GBK GBK"
17092 + echo "KSC5601 CP949"
17093 + echo "sdeckanji EUC-JP"
17094 + echo "SJIS SHIFT_JIS"
17095 + echo "TACTIS TIS-620"
17096 + echo "UTF-8 UTF-8"
17097 + ;;
17098 + solaris*)
17099 + echo "646 ASCII"
17100 + echo "ISO8859-1 ISO-8859-1"
17101 + echo "ISO8859-2 ISO-8859-2"
17102 + echo "ISO8859-3 ISO-8859-3"
17103 + echo "ISO8859-4 ISO-8859-4"
17104 + echo "ISO8859-5 ISO-8859-5"
17105 + echo "ISO8859-6 ISO-8859-6"
17106 + echo "ISO8859-7 ISO-8859-7"
17107 + echo "ISO8859-8 ISO-8859-8"
17108 + echo "ISO8859-9 ISO-8859-9"
17109 + echo "ISO8859-15 ISO-8859-15"
17110 + echo "koi8-r KOI8-R"
17111 + echo "ansi-1251 CP1251"
17112 + echo "BIG5 BIG5"
17113 + echo "Big5-HKSCS BIG5-HKSCS"
17114 + echo "gb2312 GB2312"
17115 + echo "GBK GBK"
17116 + echo "GB18030 GB18030"
17117 + echo "cns11643 EUC-TW"
17118 + echo "5601 EUC-KR"
17119 + echo "ko_KR.johap92 JOHAB"
17120 + echo "eucJP EUC-JP"
17121 + echo "PCK SHIFT_JIS"
17122 + echo "TIS620.2533 TIS-620"
17123 + #echo "sun_eu_greek ?" # what is this?
17124 + echo "UTF-8 UTF-8"
17125 + ;;
17126 + freebsd* | os2*)
17127 + # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
17128 + # localcharset.c falls back to using the full locale name
17129 + # from the environment variables.
17130 + # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
17131 + # reuse FreeBSD's locale data for OS/2.
17132 + echo "C ASCII"
17133 + echo "US-ASCII ASCII"
17134 + for l in la_LN lt_LN; do
17135 + echo "$l.ASCII ASCII"
17136 + done
17137 + for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
17138 + fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
17139 + lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
17140 + echo "$l.ISO_8859-1 ISO-8859-1"
17141 + echo "$l.DIS_8859-15 ISO-8859-15"
17142 + done
17143 + for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
17144 + echo "$l.ISO_8859-2 ISO-8859-2"
17145 + done
17146 + for l in la_LN lt_LT; do
17147 + echo "$l.ISO_8859-4 ISO-8859-4"
17148 + done
17149 + for l in ru_RU ru_SU; do
17150 + echo "$l.KOI8-R KOI8-R"
17151 + echo "$l.ISO_8859-5 ISO-8859-5"
17152 + echo "$l.CP866 CP866"
17153 + done
17154 + echo "uk_UA.KOI8-U KOI8-U"
17155 + echo "zh_TW.BIG5 BIG5"
17156 + echo "zh_TW.Big5 BIG5"
17157 + echo "zh_CN.EUC GB2312"
17158 + echo "ja_JP.EUC EUC-JP"
17159 + echo "ja_JP.SJIS SHIFT_JIS"
17160 + echo "ja_JP.Shift_JIS SHIFT_JIS"
17161 + echo "ko_KR.EUC EUC-KR"
17162 + ;;
17163 + netbsd*)
17164 + echo "646 ASCII"
17165 + echo "ISO8859-1 ISO-8859-1"
17166 + echo "ISO8859-2 ISO-8859-2"
17167 + echo "ISO8859-4 ISO-8859-4"
17168 + echo "ISO8859-5 ISO-8859-5"
17169 + echo "ISO8859-15 ISO-8859-15"
17170 + echo "eucCN GB2312"
17171 + echo "eucJP EUC-JP"
17172 + echo "eucKR EUC-KR"
17173 + echo "eucTW EUC-TW"
17174 + echo "BIG5 BIG5"
17175 + echo "SJIS SHIFT_JIS"
17176 + ;;
17177 + darwin*)
17178 + # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
17179 + # localcharset.c falls back to using the full locale name
17180 + # from the environment variables.
17181 + echo "C ASCII"
17182 + for l in en_AU en_CA en_GB en_US la_LN; do
17183 + echo "$l.US-ASCII ASCII"
17184 + done
17185 + for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
17186 + fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
17187 + nl_NL no_NO pt_PT sv_SE; do
17188 + echo "$l ISO-8859-1"
17189 + echo "$l.ISO8859-1 ISO-8859-1"
17190 + echo "$l.ISO8859-15 ISO-8859-15"
17191 + done
17192 + for l in la_LN; do
17193 + echo "$l.ISO8859-1 ISO-8859-1"
17194 + echo "$l.ISO8859-15 ISO-8859-15"
17195 + done
17196 + for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
17197 + echo "$l.ISO8859-2 ISO-8859-2"
17198 + done
17199 + for l in la_LN lt_LT; do
17200 + echo "$l.ISO8859-4 ISO-8859-4"
17201 + done
17202 + for l in ru_RU; do
17203 + echo "$l.KOI8-R KOI8-R"
17204 + echo "$l.ISO8859-5 ISO-8859-5"
17205 + echo "$l.CP866 CP866"
17206 + done
17207 + for l in bg_BG; do
17208 + echo "$l.CP1251 CP1251"
17209 + done
17210 + echo "uk_UA.KOI8-U KOI8-U"
17211 + echo "zh_TW.BIG5 BIG5"
17212 + echo "zh_TW.Big5 BIG5"
17213 + echo "zh_CN.EUC GB2312"
17214 + echo "ja_JP.EUC EUC-JP"
17215 + echo "ja_JP.SJIS SHIFT_JIS"
17216 + echo "ko_KR.EUC EUC-KR"
17217 + ;;
17218 + beos*)
17219 + # BeOS has a single locale, and it has UTF-8 encoding.
17220 + echo "* UTF-8"
17221 + ;;
17222 + msdosdjgpp*)
17223 + # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
17224 + # localcharset.c falls back to using the full locale name
17225 + # from the environment variables.
17226 + echo "#"
17227 + echo "# The encodings given here may not all be correct."
17228 + echo "# If you find that the encoding given for your language and"
17229 + echo "# country is not the one your DOS machine actually uses, just"
17230 + echo "# correct it in this file, and send a mail to"
17231 + echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
17232 + echo "# and Bruno Haible <bruno@clisp.org>."
17233 + echo "#"
17234 + echo "C ASCII"
17235 + # ISO-8859-1 languages
17236 + echo "ca CP850"
17237 + echo "ca_ES CP850"
17238 + echo "da CP865" # not CP850 ??
17239 + echo "da_DK CP865" # not CP850 ??
17240 + echo "de CP850"
17241 + echo "de_AT CP850"
17242 + echo "de_CH CP850"
17243 + echo "de_DE CP850"
17244 + echo "en CP850"
17245 + echo "en_AU CP850" # not CP437 ??
17246 + echo "en_CA CP850"
17247 + echo "en_GB CP850"
17248 + echo "en_NZ CP437"
17249 + echo "en_US CP437"
17250 + echo "en_ZA CP850" # not CP437 ??
17251 + echo "es CP850"
17252 + echo "es_AR CP850"
17253 + echo "es_BO CP850"
17254 + echo "es_CL CP850"
17255 + echo "es_CO CP850"
17256 + echo "es_CR CP850"
17257 + echo "es_CU CP850"
17258 + echo "es_DO CP850"
17259 + echo "es_EC CP850"
17260 + echo "es_ES CP850"
17261 + echo "es_GT CP850"
17262 + echo "es_HN CP850"
17263 + echo "es_MX CP850"
17264 + echo "es_NI CP850"
17265 + echo "es_PA CP850"
17266 + echo "es_PY CP850"
17267 + echo "es_PE CP850"
17268 + echo "es_SV CP850"
17269 + echo "es_UY CP850"
17270 + echo "es_VE CP850"
17271 + echo "et CP850"
17272 + echo "et_EE CP850"
17273 + echo "eu CP850"
17274 + echo "eu_ES CP850"
17275 + echo "fi CP850"
17276 + echo "fi_FI CP850"
17277 + echo "fr CP850"
17278 + echo "fr_BE CP850"
17279 + echo "fr_CA CP850"
17280 + echo "fr_CH CP850"
17281 + echo "fr_FR CP850"
17282 + echo "ga CP850"
17283 + echo "ga_IE CP850"
17284 + echo "gd CP850"
17285 + echo "gd_GB CP850"
17286 + echo "gl CP850"
17287 + echo "gl_ES CP850"
17288 + echo "id CP850" # not CP437 ??
17289 + echo "id_ID CP850" # not CP437 ??
17290 + echo "is CP861" # not CP850 ??
17291 + echo "is_IS CP861" # not CP850 ??
17292 + echo "it CP850"
17293 + echo "it_CH CP850"
17294 + echo "it_IT CP850"
17295 + echo "lt CP775"
17296 + echo "lt_LT CP775"
17297 + echo "lv CP775"
17298 + echo "lv_LV CP775"
17299 + echo "nb CP865" # not CP850 ??
17300 + echo "nb_NO CP865" # not CP850 ??
17301 + echo "nl CP850"
17302 + echo "nl_BE CP850"
17303 + echo "nl_NL CP850"
17304 + echo "nn CP865" # not CP850 ??
17305 + echo "nn_NO CP865" # not CP850 ??
17306 + echo "no CP865" # not CP850 ??
17307 + echo "no_NO CP865" # not CP850 ??
17308 + echo "pt CP850"
17309 + echo "pt_BR CP850"
17310 + echo "pt_PT CP850"
17311 + echo "sv CP850"
17312 + echo "sv_SE CP850"
17313 + # ISO-8859-2 languages
17314 + echo "cs CP852"
17315 + echo "cs_CZ CP852"
17316 + echo "hr CP852"
17317 + echo "hr_HR CP852"
17318 + echo "hu CP852"
17319 + echo "hu_HU CP852"
17320 + echo "pl CP852"
17321 + echo "pl_PL CP852"
17322 + echo "ro CP852"
17323 + echo "ro_RO CP852"
17324 + echo "sk CP852"
17325 + echo "sk_SK CP852"
17326 + echo "sl CP852"
17327 + echo "sl_SI CP852"
17328 + echo "sq CP852"
17329 + echo "sq_AL CP852"
17330 + echo "sr CP852" # CP852 or CP866 or CP855 ??
17331 + echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
17332 + echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
17333 + # ISO-8859-3 languages
17334 + echo "mt CP850"
17335 + echo "mt_MT CP850"
17336 + # ISO-8859-5 languages
17337 + echo "be CP866"
17338 + echo "be_BE CP866"
17339 + echo "bg CP866" # not CP855 ??
17340 + echo "bg_BG CP866" # not CP855 ??
17341 + echo "mk CP866" # not CP855 ??
17342 + echo "mk_MK CP866" # not CP855 ??
17343 + echo "ru CP866"
17344 + echo "ru_RU CP866"
17345 + echo "uk CP1125"
17346 + echo "uk_UA CP1125"
17347 + # ISO-8859-6 languages
17348 + echo "ar CP864"
17349 + echo "ar_AE CP864"
17350 + echo "ar_DZ CP864"
17351 + echo "ar_EG CP864"
17352 + echo "ar_IQ CP864"
17353 + echo "ar_IR CP864"
17354 + echo "ar_JO CP864"
17355 + echo "ar_KW CP864"
17356 + echo "ar_MA CP864"
17357 + echo "ar_OM CP864"
17358 + echo "ar_QA CP864"
17359 + echo "ar_SA CP864"
17360 + echo "ar_SY CP864"
17361 + # ISO-8859-7 languages
17362 + echo "el CP869"
17363 + echo "el_GR CP869"
17364 + # ISO-8859-8 languages
17365 + echo "he CP862"
17366 + echo "he_IL CP862"
17367 + # ISO-8859-9 languages
17368 + echo "tr CP857"
17369 + echo "tr_TR CP857"
17370 + # Japanese
17371 + echo "ja CP932"
17372 + echo "ja_JP CP932"
17373 + # Chinese
17374 + echo "zh_CN GBK"
17375 + echo "zh_TW CP950" # not CP938 ??
17376 + # Korean
17377 + echo "kr CP949" # not CP934 ??
17378 + echo "kr_KR CP949" # not CP934 ??
17379 + # Thai
17380 + echo "th CP874"
17381 + echo "th_TH CP874"
17382 + # Other
17383 + echo "eo CP850"
17384 + echo "eo_EO CP850"
17385 + ;;
17386 +esac
17387 --- /dev/null
17388 +++ lxpanel-0.5.6/intl/intl-compat.c
17389 @@ -0,0 +1,131 @@
17390 +/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
17391 + Library.
17392 + Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
17393 +
17394 + This program is free software; you can redistribute it and/or modify it
17395 + under the terms of the GNU Library General Public License as published
17396 + by the Free Software Foundation; either version 2, or (at your option)
17397 + any later version.
17398 +
17399 + This program is distributed in the hope that it will be useful,
17400 + but WITHOUT ANY WARRANTY; without even the implied warranty of
17401 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17402 + Library General Public License for more details.
17403 +
17404 + You should have received a copy of the GNU Library General Public
17405 + License along with this program; if not, write to the Free Software
17406 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
17407 + USA. */
17408 +
17409 +#ifdef HAVE_CONFIG_H
17410 +# include <config.h>
17411 +#endif
17412 +
17413 +#include "gettextP.h"
17414 +
17415 +/* @@ end of prolog @@ */
17416 +
17417 +/* This file redirects the gettext functions (without prefix) to those
17418 + defined in the included GNU libintl library (with "libintl_" prefix).
17419 + It is compiled into libintl in order to make the AM_GNU_GETTEXT test
17420 + of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
17421 + has the redirections primarily in the <libintl.h> include file.
17422 + It is also compiled into libgnuintl so that libgnuintl.so can be used
17423 + as LD_PRELOADable library on glibc systems, to provide the extra
17424 + features that the functions in the libc don't have (namely, logging). */
17425 +
17426 +
17427 +#undef gettext
17428 +#undef dgettext
17429 +#undef dcgettext
17430 +#undef ngettext
17431 +#undef dngettext
17432 +#undef dcngettext
17433 +#undef textdomain
17434 +#undef bindtextdomain
17435 +#undef bind_textdomain_codeset
17436 +
17437 +
17438 +/* When building a DLL, we must export some functions. Note that because
17439 + the functions are only defined for binary backward compatibility, we
17440 + don't need to use __declspec(dllimport) in any case. */
17441 +#if defined _MSC_VER && BUILDING_DLL
17442 +# define DLL_EXPORTED __declspec(dllexport)
17443 +#else
17444 +# define DLL_EXPORTED
17445 +#endif
17446 +
17447 +
17448 +DLL_EXPORTED
17449 +char *
17450 +gettext (const char *msgid)
17451 +{
17452 + return libintl_gettext (msgid);
17453 +}
17454 +
17455 +
17456 +DLL_EXPORTED
17457 +char *
17458 +dgettext (const char *domainname, const char *msgid)
17459 +{
17460 + return libintl_dgettext (domainname, msgid);
17461 +}
17462 +
17463 +
17464 +DLL_EXPORTED
17465 +char *
17466 +dcgettext (const char *domainname, const char *msgid, int category)
17467 +{
17468 + return libintl_dcgettext (domainname, msgid, category);
17469 +}
17470 +
17471 +
17472 +DLL_EXPORTED
17473 +char *
17474 +ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
17475 +{
17476 + return libintl_ngettext (msgid1, msgid2, n);
17477 +}
17478 +
17479 +
17480 +DLL_EXPORTED
17481 +char *
17482 +dngettext (const char *domainname,
17483 + const char *msgid1, const char *msgid2, unsigned long int n)
17484 +{
17485 + return libintl_dngettext (domainname, msgid1, msgid2, n);
17486 +}
17487 +
17488 +
17489 +DLL_EXPORTED
17490 +char *
17491 +dcngettext (const char *domainname,
17492 + const char *msgid1, const char *msgid2, unsigned long int n,
17493 + int category)
17494 +{
17495 + return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
17496 +}
17497 +
17498 +
17499 +DLL_EXPORTED
17500 +char *
17501 +textdomain (const char *domainname)
17502 +{
17503 + return libintl_textdomain (domainname);
17504 +}
17505 +
17506 +
17507 +DLL_EXPORTED
17508 +char *
17509 +bindtextdomain (const char *domainname, const char *dirname)
17510 +{
17511 + return libintl_bindtextdomain (domainname, dirname);
17512 +}
17513 +
17514 +
17515 +DLL_EXPORTED
17516 +char *
17517 +bind_textdomain_codeset (const char *domainname, const char *codeset)
17518 +{
17519 + return libintl_bind_textdomain_codeset (domainname, codeset);
17520 +}
17521 --- /dev/null
17522 +++ lxpanel-0.5.6/intl/dcngettext.c
17523 @@ -0,0 +1,57 @@
17524 +/* Implementation of the dcngettext(3) function.
17525 + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
17526 +
17527 + This program is free software; you can redistribute it and/or modify it
17528 + under the terms of the GNU Library General Public License as published
17529 + by the Free Software Foundation; either version 2, or (at your option)
17530 + any later version.
17531 +
17532 + This program is distributed in the hope that it will be useful,
17533 + but WITHOUT ANY WARRANTY; without even the implied warranty of
17534 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17535 + Library General Public License for more details.
17536 +
17537 + You should have received a copy of the GNU Library General Public
17538 + License along with this program; if not, write to the Free Software
17539 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
17540 + USA. */
17541 +
17542 +#ifdef HAVE_CONFIG_H
17543 +# include <config.h>
17544 +#endif
17545 +
17546 +#include "gettextP.h"
17547 +#ifdef _LIBC
17548 +# include <libintl.h>
17549 +#else
17550 +# include "libgnuintl.h"
17551 +#endif
17552 +
17553 +/* @@ end of prolog @@ */
17554 +
17555 +/* Names for the libintl functions are a problem. They must not clash
17556 + with existing names and they should follow ANSI C. But this source
17557 + code is also used in GNU C Library where the names have a __
17558 + prefix. So we have to make a difference here. */
17559 +#ifdef _LIBC
17560 +# define DCNGETTEXT __dcngettext
17561 +# define DCIGETTEXT __dcigettext
17562 +#else
17563 +# define DCNGETTEXT libintl_dcngettext
17564 +# define DCIGETTEXT libintl_dcigettext
17565 +#endif
17566 +
17567 +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
17568 + locale. */
17569 +char *
17570 +DCNGETTEXT (const char *domainname,
17571 + const char *msgid1, const char *msgid2, unsigned long int n,
17572 + int category)
17573 +{
17574 + return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
17575 +}
17576 +
17577 +#ifdef _LIBC
17578 +/* Alias for function name in GNU C Library. */
17579 +weak_alias (__dcngettext, dcngettext);
17580 +#endif
17581 --- /dev/null
17582 +++ lxpanel-0.5.6/intl/Makefile.in
17583 @@ -0,0 +1,493 @@
17584 +# Makefile for directory with message catalog handling library of GNU gettext
17585 +# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
17586 +#
17587 +# This program is free software; you can redistribute it and/or modify it
17588 +# under the terms of the GNU Library General Public License as published
17589 +# by the Free Software Foundation; either version 2, or (at your option)
17590 +# any later version.
17591 +#
17592 +# This program is distributed in the hope that it will be useful,
17593 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
17594 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17595 +# Library General Public License for more details.
17596 +#
17597 +# You should have received a copy of the GNU Library General Public
17598 +# License along with this program; if not, write to the Free Software
17599 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
17600 +# USA.
17601 +
17602 +PACKAGE = @PACKAGE@
17603 +VERSION = @VERSION@
17604 +
17605 +SHELL = /bin/sh
17606 +
17607 +srcdir = @srcdir@
17608 +top_srcdir = @top_srcdir@
17609 +top_builddir = ..
17610 +VPATH = $(srcdir)
17611 +
17612 +prefix = @prefix@
17613 +exec_prefix = @exec_prefix@
17614 +transform = @program_transform_name@
17615 +libdir = @libdir@
17616 +includedir = @includedir@
17617 +datadir = @datadir@
17618 +localedir = $(datadir)/locale
17619 +gettextsrcdir = $(datadir)/gettext/intl
17620 +aliaspath = $(localedir)
17621 +subdir = intl
17622 +
17623 +INSTALL = @INSTALL@
17624 +INSTALL_DATA = @INSTALL_DATA@
17625 +MKINSTALLDIRS = @MKINSTALLDIRS@
17626 +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
17627 +
17628 +l = @INTL_LIBTOOL_SUFFIX_PREFIX@
17629 +
17630 +AR = ar
17631 +CC = @CC@
17632 +LIBTOOL = @LIBTOOL@
17633 +RANLIB = @RANLIB@
17634 +YACC = @INTLBISON@ -y -d
17635 +YFLAGS = --name-prefix=__gettext
17636 +
17637 +DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
17638 +-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
17639 +-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
17640 +-Dset_relocation_prefix=libintl_set_relocation_prefix \
17641 +-Drelocate=libintl_relocate \
17642 +-DDEPENDS_ON_LIBICONV=1 @DEFS@
17643 +CPPFLAGS = @CPPFLAGS@
17644 +CFLAGS = @CFLAGS@
17645 +LDFLAGS = @LDFLAGS@
17646 +LIBS = @LIBS@
17647 +
17648 +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
17649 +
17650 +HEADERS = \
17651 + gmo.h \
17652 + gettextP.h \
17653 + hash-string.h \
17654 + loadinfo.h \
17655 + plural-exp.h \
17656 + eval-plural.h \
17657 + localcharset.h \
17658 + relocatable.h \
17659 + xsize.h \
17660 + printf-args.h printf-args.c \
17661 + printf-parse.h wprintf-parse.h printf-parse.c \
17662 + vasnprintf.h vasnwprintf.h vasnprintf.c \
17663 + os2compat.h \
17664 + libgnuintl.h.in
17665 +SOURCES = \
17666 + bindtextdom.c \
17667 + dcgettext.c \
17668 + dgettext.c \
17669 + gettext.c \
17670 + finddomain.c \
17671 + loadmsgcat.c \
17672 + localealias.c \
17673 + textdomain.c \
17674 + l10nflist.c \
17675 + explodename.c \
17676 + dcigettext.c \
17677 + dcngettext.c \
17678 + dngettext.c \
17679 + ngettext.c \
17680 + plural.y \
17681 + plural-exp.c \
17682 + localcharset.c \
17683 + relocatable.c \
17684 + localename.c \
17685 + log.c \
17686 + printf.c \
17687 + osdep.c \
17688 + os2compat.c \
17689 + intl-compat.c
17690 +OBJECTS = \
17691 + bindtextdom.$lo \
17692 + dcgettext.$lo \
17693 + dgettext.$lo \
17694 + gettext.$lo \
17695 + finddomain.$lo \
17696 + loadmsgcat.$lo \
17697 + localealias.$lo \
17698 + textdomain.$lo \
17699 + l10nflist.$lo \
17700 + explodename.$lo \
17701 + dcigettext.$lo \
17702 + dcngettext.$lo \
17703 + dngettext.$lo \
17704 + ngettext.$lo \
17705 + plural.$lo \
17706 + plural-exp.$lo \
17707 + localcharset.$lo \
17708 + relocatable.$lo \
17709 + localename.$lo \
17710 + log.$lo \
17711 + printf.$lo \
17712 + osdep.$lo \
17713 + intl-compat.$lo
17714 +DISTFILES.common = Makefile.in \
17715 +config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
17716 +DISTFILES.generated = plural.c
17717 +DISTFILES.normal = VERSION
17718 +DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
17719 +libgnuintl.h_vms Makefile.vms \
17720 +libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
17721 +DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
17722 +COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
17723 +
17724 +all: all-@USE_INCLUDED_LIBINTL@
17725 +all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
17726 +all-no: all-no-@BUILD_INCLUDED_LIBINTL@
17727 +all-no-yes: libgnuintl.$la
17728 +all-no-no:
17729 +
17730 +libintl.a libgnuintl.a: $(OBJECTS)
17731 + rm -f $@
17732 + $(AR) cru $@ $(OBJECTS)
17733 + $(RANLIB) $@
17734 +
17735 +libintl.la libgnuintl.la: $(OBJECTS)
17736 + $(LIBTOOL) --mode=link \
17737 + $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
17738 + $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
17739 + -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
17740 + -rpath $(libdir) \
17741 + -no-undefined
17742 +
17743 +# Libtool's library version information for libintl.
17744 +# Before making a gettext release, the gettext maintainer must change this
17745 +# according to the libtool documentation, section "Library interface versions".
17746 +# Maintainers of other packages that include the intl directory must *not*
17747 +# change these values.
17748 +LTV_CURRENT=7
17749 +LTV_REVISION=0
17750 +LTV_AGE=4
17751 +
17752 +.SUFFIXES:
17753 +.SUFFIXES: .c .y .o .lo .sin .sed
17754 +
17755 +.c.o:
17756 + $(COMPILE) $<
17757 +
17758 +.y.c:
17759 + $(YACC) $(YFLAGS) --output $@ $<
17760 + rm -f $*.h
17761 +
17762 +bindtextdom.lo: $(srcdir)/bindtextdom.c
17763 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
17764 +dcgettext.lo: $(srcdir)/dcgettext.c
17765 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
17766 +dgettext.lo: $(srcdir)/dgettext.c
17767 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
17768 +gettext.lo: $(srcdir)/gettext.c
17769 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
17770 +finddomain.lo: $(srcdir)/finddomain.c
17771 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
17772 +loadmsgcat.lo: $(srcdir)/loadmsgcat.c
17773 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
17774 +localealias.lo: $(srcdir)/localealias.c
17775 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
17776 +textdomain.lo: $(srcdir)/textdomain.c
17777 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
17778 +l10nflist.lo: $(srcdir)/l10nflist.c
17779 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
17780 +explodename.lo: $(srcdir)/explodename.c
17781 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
17782 +dcigettext.lo: $(srcdir)/dcigettext.c
17783 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
17784 +dcngettext.lo: $(srcdir)/dcngettext.c
17785 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
17786 +dngettext.lo: $(srcdir)/dngettext.c
17787 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
17788 +ngettext.lo: $(srcdir)/ngettext.c
17789 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
17790 +plural.lo: $(srcdir)/plural.c
17791 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
17792 +plural-exp.lo: $(srcdir)/plural-exp.c
17793 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
17794 +localcharset.lo: $(srcdir)/localcharset.c
17795 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
17796 +relocatable.lo: $(srcdir)/relocatable.c
17797 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
17798 +localename.lo: $(srcdir)/localename.c
17799 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
17800 +log.lo: $(srcdir)/log.c
17801 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
17802 +printf.lo: $(srcdir)/printf.c
17803 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
17804 +osdep.lo: $(srcdir)/osdep.c
17805 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
17806 +intl-compat.lo: $(srcdir)/intl-compat.c
17807 + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
17808 +
17809 +ref-add.sed: $(srcdir)/ref-add.sin
17810 + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
17811 + mv t-ref-add.sed ref-add.sed
17812 +ref-del.sed: $(srcdir)/ref-del.sin
17813 + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
17814 + mv t-ref-del.sed ref-del.sed
17815 +
17816 +INCLUDES = -I. -I$(srcdir) -I..
17817 +
17818 +libgnuintl.h: $(srcdir)/libgnuintl.h.in
17819 + sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
17820 + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
17821 + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
17822 + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
17823 + < $(srcdir)/libgnuintl.h.in > libgnuintl.h
17824 +
17825 +libintl.h: libgnuintl.h
17826 + cp libgnuintl.h libintl.h
17827 +
17828 +charset.alias: $(srcdir)/config.charset
17829 + $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
17830 + mv t-$@ $@
17831 +
17832 +check: all
17833 +
17834 +# We must not install the libintl.h/libintl.a files if we are on a
17835 +# system which has the GNU gettext() function in its C library or in a
17836 +# separate library.
17837 +# If you want to use the one which comes with this version of the
17838 +# package, you have to use `configure --with-included-gettext'.
17839 +install: install-exec install-data
17840 +install-exec: all
17841 + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
17842 + && test '@USE_INCLUDED_LIBINTL@' = yes; then \
17843 + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
17844 + $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
17845 + $(LIBTOOL) --mode=install \
17846 + $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
17847 + if test "@RELOCATABLE@" = yes; then \
17848 + dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
17849 + if test -n "$$dependencies"; then \
17850 + rm -f $(DESTDIR)$(libdir)/libintl.la; \
17851 + fi; \
17852 + fi; \
17853 + else \
17854 + : ; \
17855 + fi
17856 + if test "$(PACKAGE)" = "gettext-tools" \
17857 + && test '@USE_INCLUDED_LIBINTL@' = no; then \
17858 + $(mkinstalldirs) $(DESTDIR)$(libdir); \
17859 + $(LIBTOOL) --mode=install \
17860 + $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
17861 + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
17862 + $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
17863 + $(LIBTOOL) --mode=uninstall \
17864 + rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
17865 + else \
17866 + : ; \
17867 + fi
17868 + if test '@USE_INCLUDED_LIBINTL@' = yes; then \
17869 + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
17870 + temp=$(DESTDIR)$(libdir)/t-charset.alias; \
17871 + dest=$(DESTDIR)$(libdir)/charset.alias; \
17872 + if test -f $(DESTDIR)$(libdir)/charset.alias; then \
17873 + orig=$(DESTDIR)$(libdir)/charset.alias; \
17874 + sed -f ref-add.sed $$orig > $$temp; \
17875 + $(INSTALL_DATA) $$temp $$dest; \
17876 + rm -f $$temp; \
17877 + else \
17878 + if test @GLIBC21@ = no; then \
17879 + orig=charset.alias; \
17880 + sed -f ref-add.sed $$orig > $$temp; \
17881 + $(INSTALL_DATA) $$temp $$dest; \
17882 + rm -f $$temp; \
17883 + fi; \
17884 + fi; \
17885 + $(mkinstalldirs) $(DESTDIR)$(localedir); \
17886 + test -f $(DESTDIR)$(localedir)/locale.alias \
17887 + && orig=$(DESTDIR)$(localedir)/locale.alias \
17888 + || orig=$(srcdir)/locale.alias; \
17889 + temp=$(DESTDIR)$(localedir)/t-locale.alias; \
17890 + dest=$(DESTDIR)$(localedir)/locale.alias; \
17891 + sed -f ref-add.sed $$orig > $$temp; \
17892 + $(INSTALL_DATA) $$temp $$dest; \
17893 + rm -f $$temp; \
17894 + else \
17895 + : ; \
17896 + fi
17897 +install-data: all
17898 + if test "$(PACKAGE)" = "gettext-tools"; then \
17899 + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
17900 + $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
17901 + $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
17902 + dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
17903 + for file in $$dists; do \
17904 + $(INSTALL_DATA) $(srcdir)/$$file \
17905 + $(DESTDIR)$(gettextsrcdir)/$$file; \
17906 + done; \
17907 + chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
17908 + dists="$(DISTFILES.generated)"; \
17909 + for file in $$dists; do \
17910 + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
17911 + $(INSTALL_DATA) $$dir/$$file \
17912 + $(DESTDIR)$(gettextsrcdir)/$$file; \
17913 + done; \
17914 + dists="$(DISTFILES.obsolete)"; \
17915 + for file in $$dists; do \
17916 + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
17917 + done; \
17918 + else \
17919 + : ; \
17920 + fi
17921 +
17922 +install-strip: install
17923 +
17924 +installdirs:
17925 + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
17926 + && test '@USE_INCLUDED_LIBINTL@' = yes; then \
17927 + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
17928 + else \
17929 + : ; \
17930 + fi
17931 + if test "$(PACKAGE)" = "gettext-tools" \
17932 + && test '@USE_INCLUDED_LIBINTL@' = no; then \
17933 + $(mkinstalldirs) $(DESTDIR)$(libdir); \
17934 + else \
17935 + : ; \
17936 + fi
17937 + if test '@USE_INCLUDED_LIBINTL@' = yes; then \
17938 + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
17939 + $(mkinstalldirs) $(DESTDIR)$(localedir); \
17940 + else \
17941 + : ; \
17942 + fi
17943 + if test "$(PACKAGE)" = "gettext-tools"; then \
17944 + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
17945 + else \
17946 + : ; \
17947 + fi
17948 +
17949 +# Define this as empty until I found a useful application.
17950 +installcheck:
17951 +
17952 +uninstall:
17953 + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
17954 + && test '@USE_INCLUDED_LIBINTL@' = yes; then \
17955 + rm -f $(DESTDIR)$(includedir)/libintl.h; \
17956 + $(LIBTOOL) --mode=uninstall \
17957 + rm -f $(DESTDIR)$(libdir)/libintl.$la; \
17958 + else \
17959 + : ; \
17960 + fi
17961 + if test "$(PACKAGE)" = "gettext-tools" \
17962 + && test '@USE_INCLUDED_LIBINTL@' = no; then \
17963 + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
17964 + else \
17965 + : ; \
17966 + fi
17967 + if test '@USE_INCLUDED_LIBINTL@' = yes; then \
17968 + if test -f $(DESTDIR)$(libdir)/charset.alias; then \
17969 + temp=$(DESTDIR)$(libdir)/t-charset.alias; \
17970 + dest=$(DESTDIR)$(libdir)/charset.alias; \
17971 + sed -f ref-del.sed $$dest > $$temp; \
17972 + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
17973 + rm -f $$dest; \
17974 + else \
17975 + $(INSTALL_DATA) $$temp $$dest; \
17976 + fi; \
17977 + rm -f $$temp; \
17978 + fi; \
17979 + if test -f $(DESTDIR)$(localedir)/locale.alias; then \
17980 + temp=$(DESTDIR)$(localedir)/t-locale.alias; \
17981 + dest=$(DESTDIR)$(localedir)/locale.alias; \
17982 + sed -f ref-del.sed $$dest > $$temp; \
17983 + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
17984 + rm -f $$dest; \
17985 + else \
17986 + $(INSTALL_DATA) $$temp $$dest; \
17987 + fi; \
17988 + rm -f $$temp; \
17989 + fi; \
17990 + else \
17991 + : ; \
17992 + fi
17993 + if test "$(PACKAGE)" = "gettext-tools"; then \
17994 + for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
17995 + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
17996 + done; \
17997 + else \
17998 + : ; \
17999 + fi
18000 +
18001 +info dvi ps pdf html:
18002 +
18003 +$(OBJECTS): ../config.h libgnuintl.h
18004 +bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
18005 +dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
18006 +explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
18007 +dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
18008 +dcigettext.$lo: $(srcdir)/eval-plural.h
18009 +localcharset.$lo: $(srcdir)/localcharset.h
18010 +localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
18011 +printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
18012 +
18013 +tags: TAGS
18014 +
18015 +TAGS: $(HEADERS) $(SOURCES)
18016 + here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
18017 +
18018 +ctags: CTAGS
18019 +
18020 +CTAGS: $(HEADERS) $(SOURCES)
18021 + here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
18022 +
18023 +id: ID
18024 +
18025 +ID: $(HEADERS) $(SOURCES)
18026 + here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
18027 +
18028 +
18029 +mostlyclean:
18030 + rm -f *.a *.la *.o *.obj *.lo core core.*
18031 + rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
18032 + rm -f -r .libs _libs
18033 +
18034 +clean: mostlyclean
18035 +
18036 +distclean: clean
18037 + rm -f Makefile ID TAGS
18038 + if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
18039 + rm -f ChangeLog.inst $(DISTFILES.normal); \
18040 + else \
18041 + : ; \
18042 + fi
18043 +
18044 +maintainer-clean: distclean
18045 + @echo "This command is intended for maintainers to use;"
18046 + @echo "it deletes files that may require special tools to rebuild."
18047 +
18048 +
18049 +# GNU gettext needs not contain the file `VERSION' but contains some
18050 +# other files which should not be distributed in other packages.
18051 +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
18052 +dist distdir: Makefile
18053 + if test "$(PACKAGE)" = "gettext-tools"; then \
18054 + : ; \
18055 + else \
18056 + if test "$(PACKAGE)" = "gettext-runtime"; then \
18057 + additional="$(DISTFILES.gettext)"; \
18058 + else \
18059 + additional="$(DISTFILES.normal)"; \
18060 + fi; \
18061 + $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
18062 + for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
18063 + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
18064 + cp -p $$dir/$$file $(distdir); \
18065 + done; \
18066 + fi
18067 +
18068 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
18069 + cd $(top_builddir) && $(SHELL) ./config.status
18070 +# This would be more efficient, but doesn't work any more with autoconf-2.57,
18071 +# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
18072 +# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
18073 +
18074 +# Tell versions [3.59,3.63) of GNU make not to export all variables.
18075 +# Otherwise a system limit (for SysV at least) may be exceeded.
18076 +.NOEXPORT:
18077 --- /dev/null
18078 +++ lxpanel-0.5.6/intl/plural.c
18079 @@ -0,0 +1,1490 @@
18080 +/* A Bison parser, made from plural.y
18081 + by GNU bison 1.35. */
18082 +
18083 +#define YYBISON 1 /* Identify Bison output. */
18084 +
18085 +#define yyparse __gettextparse
18086 +#define yylex __gettextlex
18087 +#define yyerror __gettexterror
18088 +#define yylval __gettextlval
18089 +#define yychar __gettextchar
18090 +#define yydebug __gettextdebug
18091 +#define yynerrs __gettextnerrs
18092 +# define EQUOP2 257
18093 +# define CMPOP2 258
18094 +# define ADDOP2 259
18095 +# define MULOP2 260
18096 +# define NUMBER 261
18097 +
18098 +#line 1 "plural.y"
18099 +
18100 +/* Expression parsing for plural form selection.
18101 + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
18102 + Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
18103 +
18104 + This program is free software; you can redistribute it and/or modify it
18105 + under the terms of the GNU Library General Public License as published
18106 + by the Free Software Foundation; either version 2, or (at your option)
18107 + any later version.
18108 +
18109 + This program is distributed in the hope that it will be useful,
18110 + but WITHOUT ANY WARRANTY; without even the implied warranty of
18111 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18112 + Library General Public License for more details.
18113 +
18114 + You should have received a copy of the GNU Library General Public
18115 + License along with this program; if not, write to the Free Software
18116 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
18117 + USA. */
18118 +
18119 +/* The bison generated parser uses alloca. AIX 3 forces us to put this
18120 + declaration at the beginning of the file. The declaration in bison's
18121 + skeleton file comes too late. This must come before <config.h>
18122 + because <config.h> may include arbitrary system headers. */
18123 +#if defined _AIX && !defined __GNUC__
18124 + #pragma alloca
18125 +#endif
18126 +
18127 +#ifdef HAVE_CONFIG_H
18128 +# include <config.h>
18129 +#endif
18130 +
18131 +#include <stddef.h>
18132 +#include <stdlib.h>
18133 +#include "plural-exp.h"
18134 +
18135 +/* The main function generated by the parser is called __gettextparse,
18136 + but we want it to be called PLURAL_PARSE. */
18137 +#ifndef _LIBC
18138 +# define __gettextparse PLURAL_PARSE
18139 +#endif
18140 +
18141 +#define YYLEX_PARAM &((struct parse_args *) arg)->cp
18142 +#define YYPARSE_PARAM arg
18143 +
18144 +#line 49 "plural.y"
18145 +#ifndef YYSTYPE
18146 +typedef union {
18147 + unsigned long int num;
18148 + enum operator op;
18149 + struct expression *exp;
18150 +} yystype;
18151 +# define YYSTYPE yystype
18152 +# define YYSTYPE_IS_TRIVIAL 1
18153 +#endif
18154 +#line 55 "plural.y"
18155 +
18156 +/* Prototypes for local functions. */
18157 +static int yylex (YYSTYPE *lval, const char **pexp);
18158 +static void yyerror (const char *str);
18159 +
18160 +/* Allocation of expressions. */
18161 +
18162 +static struct expression *
18163 +new_exp (int nargs, enum operator op, struct expression * const *args)
18164 +{
18165 + int i;
18166 + struct expression *newp;
18167 +
18168 + /* If any of the argument could not be malloc'ed, just return NULL. */
18169 + for (i = nargs - 1; i >= 0; i--)
18170 + if (args[i] == NULL)
18171 + goto fail;
18172 +
18173 + /* Allocate a new expression. */
18174 + newp = (struct expression *) malloc (sizeof (*newp));
18175 + if (newp != NULL)
18176 + {
18177 + newp->nargs = nargs;
18178 + newp->operation = op;
18179 + for (i = nargs - 1; i >= 0; i--)
18180 + newp->val.args[i] = args[i];
18181 + return newp;
18182 + }
18183 +
18184 + fail:
18185 + for (i = nargs - 1; i >= 0; i--)
18186 + FREE_EXPRESSION (args[i]);
18187 +
18188 + return NULL;
18189 +}
18190 +
18191 +static inline struct expression *
18192 +new_exp_0 (enum operator op)
18193 +{
18194 + return new_exp (0, op, NULL);
18195 +}
18196 +
18197 +static inline struct expression *
18198 +new_exp_1 (enum operator op, struct expression *right)
18199 +{
18200 + struct expression *args[1];
18201 +
18202 + args[0] = right;
18203 + return new_exp (1, op, args);
18204 +}
18205 +
18206 +static struct expression *
18207 +new_exp_2 (enum operator op, struct expression *left, struct expression *right)
18208 +{
18209 + struct expression *args[2];
18210 +
18211 + args[0] = left;
18212 + args[1] = right;
18213 + return new_exp (2, op, args);
18214 +}
18215 +
18216 +static inline struct expression *
18217 +new_exp_3 (enum operator op, struct expression *bexp,
18218 + struct expression *tbranch, struct expression *fbranch)
18219 +{
18220 + struct expression *args[3];
18221 +
18222 + args[0] = bexp;
18223 + args[1] = tbranch;
18224 + args[2] = fbranch;
18225 + return new_exp (3, op, args);
18226 +}
18227 +
18228 +#ifndef YYDEBUG
18229 +# define YYDEBUG 0
18230 +#endif
18231 +
18232 +
18233 +
18234 +#define YYFINAL 27
18235 +#define YYFLAG -32768
18236 +#define YYNTBASE 16
18237 +
18238 +/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
18239 +#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
18240 +
18241 +/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
18242 +static const char yytranslate[] =
18243 +{
18244 + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18245 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18246 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18247 + 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
18248 + 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
18249 + 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
18250 + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
18251 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18252 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18253 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18254 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18255 + 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18256 + 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
18257 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18258 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18259 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18260 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18261 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18262 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18263 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18264 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18265 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18266 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18267 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18268 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18269 + 2, 2, 2, 2, 2, 2, 1, 6, 7, 8,
18270 + 9, 11
18271 +};
18272 +
18273 +#if YYDEBUG
18274 +static const short yyprhs[] =
18275 +{
18276 + 0, 0, 2, 8, 12, 16, 20, 24, 28, 32,
18277 + 35, 37, 39
18278 +};
18279 +static const short yyrhs[] =
18280 +{
18281 + 17, 0, 17, 3, 17, 12, 17, 0, 17, 4,
18282 + 17, 0, 17, 5, 17, 0, 17, 6, 17, 0,
18283 + 17, 7, 17, 0, 17, 8, 17, 0, 17, 9,
18284 + 17, 0, 10, 17, 0, 13, 0, 11, 0, 14,
18285 + 17, 15, 0
18286 +};
18287 +
18288 +#endif
18289 +
18290 +#if YYDEBUG
18291 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
18292 +static const short yyrline[] =
18293 +{
18294 + 0, 150, 158, 162, 166, 170, 174, 178, 182, 186,
18295 + 190, 194, 199
18296 +};
18297 +#endif
18298 +
18299 +
18300 +#if (YYDEBUG) || defined YYERROR_VERBOSE
18301 +
18302 +/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
18303 +static const char *const yytname[] =
18304 +{
18305 + "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
18306 + "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
18307 + "start", "exp", 0
18308 +};
18309 +#endif
18310 +
18311 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
18312 +static const short yyr1[] =
18313 +{
18314 + 0, 16, 17, 17, 17, 17, 17, 17, 17, 17,
18315 + 17, 17, 17
18316 +};
18317 +
18318 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
18319 +static const short yyr2[] =
18320 +{
18321 + 0, 1, 5, 3, 3, 3, 3, 3, 3, 2,
18322 + 1, 1, 3
18323 +};
18324 +
18325 +/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
18326 + doesn't specify something else to do. Zero means the default is an
18327 + error. */
18328 +static const short yydefact[] =
18329 +{
18330 + 0, 0, 11, 10, 0, 1, 9, 0, 0, 0,
18331 + 0, 0, 0, 0, 0, 12, 0, 3, 4, 5,
18332 + 6, 7, 8, 0, 2, 0, 0, 0
18333 +};
18334 +
18335 +static const short yydefgoto[] =
18336 +{
18337 + 25, 5
18338 +};
18339 +
18340 +static const short yypact[] =
18341 +{
18342 + -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9,
18343 + -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16,
18344 + 26, -3,-32768, -9, 34, 21, 53,-32768
18345 +};
18346 +
18347 +static const short yypgoto[] =
18348 +{
18349 + -32768, -1
18350 +};
18351 +
18352 +
18353 +#define YYLAST 53
18354 +
18355 +
18356 +static const short yytable[] =
18357 +{
18358 + 6, 1, 2, 7, 3, 4, 14, 16, 17, 18,
18359 + 19, 20, 21, 22, 8, 9, 10, 11, 12, 13,
18360 + 14, 26, 24, 12, 13, 14, 15, 8, 9, 10,
18361 + 11, 12, 13, 14, 13, 14, 23, 8, 9, 10,
18362 + 11, 12, 13, 14, 10, 11, 12, 13, 14, 11,
18363 + 12, 13, 14, 27
18364 +};
18365 +
18366 +static const short yycheck[] =
18367 +{
18368 + 1, 10, 11, 4, 13, 14, 9, 8, 9, 10,
18369 + 11, 12, 13, 14, 3, 4, 5, 6, 7, 8,
18370 + 9, 0, 23, 7, 8, 9, 15, 3, 4, 5,
18371 + 6, 7, 8, 9, 8, 9, 12, 3, 4, 5,
18372 + 6, 7, 8, 9, 5, 6, 7, 8, 9, 6,
18373 + 7, 8, 9, 0
18374 +};
18375 +#define YYPURE 1
18376 +
18377 +/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
18378 +#line 3 "/usr/local/share/bison/bison.simple"
18379 +
18380 +/* Skeleton output parser for bison,
18381 +
18382 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
18383 + Foundation, Inc.
18384 +
18385 + This program is free software; you can redistribute it and/or modify
18386 + it under the terms of the GNU General Public License as published by
18387 + the Free Software Foundation; either version 2, or (at your option)
18388 + any later version.
18389 +
18390 + This program is distributed in the hope that it will be useful,
18391 + but WITHOUT ANY WARRANTY; without even the implied warranty of
18392 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18393 + GNU General Public License for more details.
18394 +
18395 + You should have received a copy of the GNU General Public License
18396 + along with this program; if not, write to the Free Software
18397 + Foundation, Inc., 59 Temple Place - Suite 330,
18398 + Boston, MA 02111-1307, USA. */
18399 +
18400 +/* As a special exception, when this file is copied by Bison into a
18401 + Bison output file, you may use that output file without restriction.
18402 + This special exception was added by the Free Software Foundation
18403 + in version 1.24 of Bison. */
18404 +
18405 +/* This is the parser code that is written into each bison parser when
18406 + the %semantic_parser declaration is not specified in the grammar.
18407 + It was written by Richard Stallman by simplifying the hairy parser
18408 + used when %semantic_parser is specified. */
18409 +
18410 +/* All symbols defined below should begin with yy or YY, to avoid
18411 + infringing on user name space. This should be done even for local
18412 + variables, as they might otherwise be expanded by user macros.
18413 + There are some unavoidable exceptions within include files to
18414 + define necessary library symbols; they are noted "INFRINGES ON
18415 + USER NAME SPACE" below. */
18416 +
18417 +#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
18418 +
18419 +/* The parser invokes alloca or malloc; define the necessary symbols. */
18420 +
18421 +# if YYSTACK_USE_ALLOCA
18422 +# define YYSTACK_ALLOC alloca
18423 +# else
18424 +# ifndef YYSTACK_USE_ALLOCA
18425 +# if defined (alloca) || defined (_ALLOCA_H)
18426 +# define YYSTACK_ALLOC alloca
18427 +# else
18428 +# ifdef __GNUC__
18429 +# define YYSTACK_ALLOC __builtin_alloca
18430 +# endif
18431 +# endif
18432 +# endif
18433 +# endif
18434 +
18435 +# ifdef YYSTACK_ALLOC
18436 + /* Pacify GCC's `empty if-body' warning. */
18437 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
18438 +# else
18439 +# if defined (__STDC__) || defined (__cplusplus)
18440 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
18441 +# define YYSIZE_T size_t
18442 +# endif
18443 +# define YYSTACK_ALLOC malloc
18444 +# define YYSTACK_FREE free
18445 +# endif
18446 +#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
18447 +
18448 +
18449 +#if (! defined (yyoverflow) \
18450 + && (! defined (__cplusplus) \
18451 + || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
18452 +
18453 +/* A type that is properly aligned for any stack member. */
18454 +union yyalloc
18455 +{
18456 + short yyss;
18457 + YYSTYPE yyvs;
18458 +# if YYLSP_NEEDED
18459 + YYLTYPE yyls;
18460 +# endif
18461 +};
18462 +
18463 +/* The size of the maximum gap between one aligned stack and the next. */
18464 +# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
18465 +
18466 +/* The size of an array large to enough to hold all stacks, each with
18467 + N elements. */
18468 +# if YYLSP_NEEDED
18469 +# define YYSTACK_BYTES(N) \
18470 + ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
18471 + + 2 * YYSTACK_GAP_MAX)
18472 +# else
18473 +# define YYSTACK_BYTES(N) \
18474 + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
18475 + + YYSTACK_GAP_MAX)
18476 +# endif
18477 +
18478 +/* Copy COUNT objects from FROM to TO. The source and destination do
18479 + not overlap. */
18480 +# ifndef YYCOPY
18481 +# if 1 < __GNUC__
18482 +# define YYCOPY(To, From, Count) \
18483 + __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
18484 +# else
18485 +# define YYCOPY(To, From, Count) \
18486 + do \
18487 + { \
18488 + register YYSIZE_T yyi; \
18489 + for (yyi = 0; yyi < (Count); yyi++) \
18490 + (To)[yyi] = (From)[yyi]; \
18491 + } \
18492 + while (0)
18493 +# endif
18494 +# endif
18495 +
18496 +/* Relocate STACK from its old location to the new one. The
18497 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
18498 + elements in the stack, and YYPTR gives the new location of the
18499 + stack. Advance YYPTR to a properly aligned location for the next
18500 + stack. */
18501 +# define YYSTACK_RELOCATE(Stack) \
18502 + do \
18503 + { \
18504 + YYSIZE_T yynewbytes; \
18505 + YYCOPY (&yyptr->Stack, Stack, yysize); \
18506 + Stack = &yyptr->Stack; \
18507 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
18508 + yyptr += yynewbytes / sizeof (*yyptr); \
18509 + } \
18510 + while (0)
18511 +
18512 +#endif
18513 +
18514 +
18515 +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
18516 +# define YYSIZE_T __SIZE_TYPE__
18517 +#endif
18518 +#if ! defined (YYSIZE_T) && defined (size_t)
18519 +# define YYSIZE_T size_t
18520 +#endif
18521 +#if ! defined (YYSIZE_T)
18522 +# if defined (__STDC__) || defined (__cplusplus)
18523 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
18524 +# define YYSIZE_T size_t
18525 +# endif
18526 +#endif
18527 +#if ! defined (YYSIZE_T)
18528 +# define YYSIZE_T unsigned int
18529 +#endif
18530 +
18531 +#define yyerrok (yyerrstatus = 0)
18532 +#define yyclearin (yychar = YYEMPTY)
18533 +#define YYEMPTY -2
18534 +#define YYEOF 0
18535 +#define YYACCEPT goto yyacceptlab
18536 +#define YYABORT goto yyabortlab
18537 +#define YYERROR goto yyerrlab1
18538 +/* Like YYERROR except do call yyerror. This remains here temporarily
18539 + to ease the transition to the new meaning of YYERROR, for GCC.
18540 + Once GCC version 2 has supplanted version 1, this can go. */
18541 +#define YYFAIL goto yyerrlab
18542 +#define YYRECOVERING() (!!yyerrstatus)
18543 +#define YYBACKUP(Token, Value) \
18544 +do \
18545 + if (yychar == YYEMPTY && yylen == 1) \
18546 + { \
18547 + yychar = (Token); \
18548 + yylval = (Value); \
18549 + yychar1 = YYTRANSLATE (yychar); \
18550 + YYPOPSTACK; \
18551 + goto yybackup; \
18552 + } \
18553 + else \
18554 + { \
18555 + yyerror ("syntax error: cannot back up"); \
18556 + YYERROR; \
18557 + } \
18558 +while (0)
18559 +
18560 +#define YYTERROR 1
18561 +#define YYERRCODE 256
18562 +
18563 +
18564 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions
18565 + are run).
18566 +
18567 + When YYLLOC_DEFAULT is run, CURRENT is set the location of the
18568 + first token. By default, to implement support for ranges, extend
18569 + its range to the last symbol. */
18570 +
18571 +#ifndef YYLLOC_DEFAULT
18572 +# define YYLLOC_DEFAULT(Current, Rhs, N) \
18573 + Current.last_line = Rhs[N].last_line; \
18574 + Current.last_column = Rhs[N].last_column;
18575 +#endif
18576 +
18577 +
18578 +/* YYLEX -- calling `yylex' with the right arguments. */
18579 +
18580 +#if YYPURE
18581 +# if YYLSP_NEEDED
18582 +# ifdef YYLEX_PARAM
18583 +# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
18584 +# else
18585 +# define YYLEX yylex (&yylval, &yylloc)
18586 +# endif
18587 +# else /* !YYLSP_NEEDED */
18588 +# ifdef YYLEX_PARAM
18589 +# define YYLEX yylex (&yylval, YYLEX_PARAM)
18590 +# else
18591 +# define YYLEX yylex (&yylval)
18592 +# endif
18593 +# endif /* !YYLSP_NEEDED */
18594 +#else /* !YYPURE */
18595 +# define YYLEX yylex ()
18596 +#endif /* !YYPURE */
18597 +
18598 +
18599 +/* Enable debugging if requested. */
18600 +#if YYDEBUG
18601 +
18602 +# ifndef YYFPRINTF
18603 +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
18604 +# define YYFPRINTF fprintf
18605 +# endif
18606 +
18607 +# define YYDPRINTF(Args) \
18608 +do { \
18609 + if (yydebug) \
18610 + YYFPRINTF Args; \
18611 +} while (0)
18612 +/* Nonzero means print parse trace. It is left uninitialized so that
18613 + multiple parsers can coexist. */
18614 +int yydebug;
18615 +#else /* !YYDEBUG */
18616 +# define YYDPRINTF(Args)
18617 +#endif /* !YYDEBUG */
18618 +
18619 +/* YYINITDEPTH -- initial size of the parser's stacks. */
18620 +#ifndef YYINITDEPTH
18621 +# define YYINITDEPTH 200
18622 +#endif
18623 +
18624 +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
18625 + if the built-in stack extension method is used).
18626 +
18627 + Do not make this value too large; the results are undefined if
18628 + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
18629 + evaluated with infinite-precision integer arithmetic. */
18630 +
18631 +#if YYMAXDEPTH == 0
18632 +# undef YYMAXDEPTH
18633 +#endif
18634 +
18635 +#ifndef YYMAXDEPTH
18636 +# define YYMAXDEPTH 10000
18637 +#endif
18638 +\f
18639 +#ifdef YYERROR_VERBOSE
18640 +
18641 +# ifndef yystrlen
18642 +# if defined (__GLIBC__) && defined (_STRING_H)
18643 +# define yystrlen strlen
18644 +# else
18645 +/* Return the length of YYSTR. */
18646 +static YYSIZE_T
18647 +# if defined (__STDC__) || defined (__cplusplus)
18648 +yystrlen (const char *yystr)
18649 +# else
18650 +yystrlen (yystr)
18651 + const char *yystr;
18652 +# endif
18653 +{
18654 + register const char *yys = yystr;
18655 +
18656 + while (*yys++ != '\0')
18657 + continue;
18658 +
18659 + return yys - yystr - 1;
18660 +}
18661 +# endif
18662 +# endif
18663 +
18664 +# ifndef yystpcpy
18665 +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
18666 +# define yystpcpy stpcpy
18667 +# else
18668 +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
18669 + YYDEST. */
18670 +static char *
18671 +# if defined (__STDC__) || defined (__cplusplus)
18672 +yystpcpy (char *yydest, const char *yysrc)
18673 +# else
18674 +yystpcpy (yydest, yysrc)
18675 + char *yydest;
18676 + const char *yysrc;
18677 +# endif
18678 +{
18679 + register char *yyd = yydest;
18680 + register const char *yys = yysrc;
18681 +
18682 + while ((*yyd++ = *yys++) != '\0')
18683 + continue;
18684 +
18685 + return yyd - 1;
18686 +}
18687 +# endif
18688 +# endif
18689 +#endif
18690 +\f
18691 +#line 315 "/usr/local/share/bison/bison.simple"
18692 +
18693 +
18694 +/* The user can define YYPARSE_PARAM as the name of an argument to be passed
18695 + into yyparse. The argument should have type void *.
18696 + It should actually point to an object.
18697 + Grammar actions can access the variable by casting it
18698 + to the proper pointer type. */
18699 +
18700 +#ifdef YYPARSE_PARAM
18701 +# if defined (__STDC__) || defined (__cplusplus)
18702 +# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
18703 +# define YYPARSE_PARAM_DECL
18704 +# else
18705 +# define YYPARSE_PARAM_ARG YYPARSE_PARAM
18706 +# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
18707 +# endif
18708 +#else /* !YYPARSE_PARAM */
18709 +# define YYPARSE_PARAM_ARG
18710 +# define YYPARSE_PARAM_DECL
18711 +#endif /* !YYPARSE_PARAM */
18712 +
18713 +/* Prevent warning if -Wstrict-prototypes. */
18714 +#ifdef __GNUC__
18715 +# ifdef YYPARSE_PARAM
18716 +int yyparse (void *);
18717 +# else
18718 +int yyparse (void);
18719 +# endif
18720 +#endif
18721 +
18722 +/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
18723 + variables are global, or local to YYPARSE. */
18724 +
18725 +#define YY_DECL_NON_LSP_VARIABLES \
18726 +/* The lookahead symbol. */ \
18727 +int yychar; \
18728 + \
18729 +/* The semantic value of the lookahead symbol. */ \
18730 +YYSTYPE yylval; \
18731 + \
18732 +/* Number of parse errors so far. */ \
18733 +int yynerrs;
18734 +
18735 +#if YYLSP_NEEDED
18736 +# define YY_DECL_VARIABLES \
18737 +YY_DECL_NON_LSP_VARIABLES \
18738 + \
18739 +/* Location data for the lookahead symbol. */ \
18740 +YYLTYPE yylloc;
18741 +#else
18742 +# define YY_DECL_VARIABLES \
18743 +YY_DECL_NON_LSP_VARIABLES
18744 +#endif
18745 +
18746 +
18747 +/* If nonreentrant, generate the variables here. */
18748 +
18749 +#if !YYPURE
18750 +YY_DECL_VARIABLES
18751 +#endif /* !YYPURE */
18752 +
18753 +int
18754 +yyparse (YYPARSE_PARAM_ARG)
18755 + YYPARSE_PARAM_DECL
18756 +{
18757 + /* If reentrant, generate the variables here. */
18758 +#if YYPURE
18759 + YY_DECL_VARIABLES
18760 +#endif /* !YYPURE */
18761 +
18762 + register int yystate;
18763 + register int yyn;
18764 + int yyresult;
18765 + /* Number of tokens to shift before error messages enabled. */
18766 + int yyerrstatus;
18767 + /* Lookahead token as an internal (translated) token number. */
18768 + int yychar1 = 0;
18769 +
18770 + /* Three stacks and their tools:
18771 + `yyss': related to states,
18772 + `yyvs': related to semantic values,
18773 + `yyls': related to locations.
18774 +
18775 + Refer to the stacks thru separate pointers, to allow yyoverflow
18776 + to reallocate them elsewhere. */
18777 +
18778 + /* The state stack. */
18779 + short yyssa[YYINITDEPTH];
18780 + short *yyss = yyssa;
18781 + register short *yyssp;
18782 +
18783 + /* The semantic value stack. */
18784 + YYSTYPE yyvsa[YYINITDEPTH];
18785 + YYSTYPE *yyvs = yyvsa;
18786 + register YYSTYPE *yyvsp;
18787 +
18788 +#if YYLSP_NEEDED
18789 + /* The location stack. */
18790 + YYLTYPE yylsa[YYINITDEPTH];
18791 + YYLTYPE *yyls = yylsa;
18792 + YYLTYPE *yylsp;
18793 +#endif
18794 +
18795 +#if YYLSP_NEEDED
18796 +# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
18797 +#else
18798 +# define YYPOPSTACK (yyvsp--, yyssp--)
18799 +#endif
18800 +
18801 + YYSIZE_T yystacksize = YYINITDEPTH;
18802 +
18803 +
18804 + /* The variables used to return semantic value and location from the
18805 + action routines. */
18806 + YYSTYPE yyval;
18807 +#if YYLSP_NEEDED
18808 + YYLTYPE yyloc;
18809 +#endif
18810 +
18811 + /* When reducing, the number of symbols on the RHS of the reduced
18812 + rule. */
18813 + int yylen;
18814 +
18815 + YYDPRINTF ((stderr, "Starting parse\n"));
18816 +
18817 + yystate = 0;
18818 + yyerrstatus = 0;
18819 + yynerrs = 0;
18820 + yychar = YYEMPTY; /* Cause a token to be read. */
18821 +
18822 + /* Initialize stack pointers.
18823 + Waste one element of value and location stack
18824 + so that they stay on the same level as the state stack.
18825 + The wasted elements are never initialized. */
18826 +
18827 + yyssp = yyss;
18828 + yyvsp = yyvs;
18829 +#if YYLSP_NEEDED
18830 + yylsp = yyls;
18831 +#endif
18832 + goto yysetstate;
18833 +
18834 +/*------------------------------------------------------------.
18835 +| yynewstate -- Push a new state, which is found in yystate. |
18836 +`------------------------------------------------------------*/
18837 + yynewstate:
18838 + /* In all cases, when you get here, the value and location stacks
18839 + have just been pushed. so pushing a state here evens the stacks.
18840 + */
18841 + yyssp++;
18842 +
18843 + yysetstate:
18844 + *yyssp = yystate;
18845 +
18846 + if (yyssp >= yyss + yystacksize - 1)
18847 + {
18848 + /* Get the current used size of the three stacks, in elements. */
18849 + YYSIZE_T yysize = yyssp - yyss + 1;
18850 +
18851 +#ifdef yyoverflow
18852 + {
18853 + /* Give user a chance to reallocate the stack. Use copies of
18854 + these so that the &'s don't force the real ones into
18855 + memory. */
18856 + YYSTYPE *yyvs1 = yyvs;
18857 + short *yyss1 = yyss;
18858 +
18859 + /* Each stack pointer address is followed by the size of the
18860 + data in use in that stack, in bytes. */
18861 +# if YYLSP_NEEDED
18862 + YYLTYPE *yyls1 = yyls;
18863 + /* This used to be a conditional around just the two extra args,
18864 + but that might be undefined if yyoverflow is a macro. */
18865 + yyoverflow ("parser stack overflow",
18866 + &yyss1, yysize * sizeof (*yyssp),
18867 + &yyvs1, yysize * sizeof (*yyvsp),
18868 + &yyls1, yysize * sizeof (*yylsp),
18869 + &yystacksize);
18870 + yyls = yyls1;
18871 +# else
18872 + yyoverflow ("parser stack overflow",
18873 + &yyss1, yysize * sizeof (*yyssp),
18874 + &yyvs1, yysize * sizeof (*yyvsp),
18875 + &yystacksize);
18876 +# endif
18877 + yyss = yyss1;
18878 + yyvs = yyvs1;
18879 + }
18880 +#else /* no yyoverflow */
18881 +# ifndef YYSTACK_RELOCATE
18882 + goto yyoverflowlab;
18883 +# else
18884 + /* Extend the stack our own way. */
18885 + if (yystacksize >= YYMAXDEPTH)
18886 + goto yyoverflowlab;
18887 + yystacksize *= 2;
18888 + if (yystacksize > YYMAXDEPTH)
18889 + yystacksize = YYMAXDEPTH;
18890 +
18891 + {
18892 + short *yyss1 = yyss;
18893 + union yyalloc *yyptr =
18894 + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
18895 + if (! yyptr)
18896 + goto yyoverflowlab;
18897 + YYSTACK_RELOCATE (yyss);
18898 + YYSTACK_RELOCATE (yyvs);
18899 +# if YYLSP_NEEDED
18900 + YYSTACK_RELOCATE (yyls);
18901 +# endif
18902 +# undef YYSTACK_RELOCATE
18903 + if (yyss1 != yyssa)
18904 + YYSTACK_FREE (yyss1);
18905 + }
18906 +# endif
18907 +#endif /* no yyoverflow */
18908 +
18909 + yyssp = yyss + yysize - 1;
18910 + yyvsp = yyvs + yysize - 1;
18911 +#if YYLSP_NEEDED
18912 + yylsp = yyls + yysize - 1;
18913 +#endif
18914 +
18915 + YYDPRINTF ((stderr, "Stack size increased to %lu\n",
18916 + (unsigned long int) yystacksize));
18917 +
18918 + if (yyssp >= yyss + yystacksize - 1)
18919 + YYABORT;
18920 + }
18921 +
18922 + YYDPRINTF ((stderr, "Entering state %d\n", yystate));
18923 +
18924 + goto yybackup;
18925 +
18926 +
18927 +/*-----------.
18928 +| yybackup. |
18929 +`-----------*/
18930 +yybackup:
18931 +
18932 +/* Do appropriate processing given the current state. */
18933 +/* Read a lookahead token if we need one and don't already have one. */
18934 +/* yyresume: */
18935 +
18936 + /* First try to decide what to do without reference to lookahead token. */
18937 +
18938 + yyn = yypact[yystate];
18939 + if (yyn == YYFLAG)
18940 + goto yydefault;
18941 +
18942 + /* Not known => get a lookahead token if don't already have one. */
18943 +
18944 + /* yychar is either YYEMPTY or YYEOF
18945 + or a valid token in external form. */
18946 +
18947 + if (yychar == YYEMPTY)
18948 + {
18949 + YYDPRINTF ((stderr, "Reading a token: "));
18950 + yychar = YYLEX;
18951 + }
18952 +
18953 + /* Convert token to internal form (in yychar1) for indexing tables with */
18954 +
18955 + if (yychar <= 0) /* This means end of input. */
18956 + {
18957 + yychar1 = 0;
18958 + yychar = YYEOF; /* Don't call YYLEX any more */
18959 +
18960 + YYDPRINTF ((stderr, "Now at end of input.\n"));
18961 + }
18962 + else
18963 + {
18964 + yychar1 = YYTRANSLATE (yychar);
18965 +
18966 +#if YYDEBUG
18967 + /* We have to keep this `#if YYDEBUG', since we use variables
18968 + which are defined only if `YYDEBUG' is set. */
18969 + if (yydebug)
18970 + {
18971 + YYFPRINTF (stderr, "Next token is %d (%s",
18972 + yychar, yytname[yychar1]);
18973 + /* Give the individual parser a way to print the precise
18974 + meaning of a token, for further debugging info. */
18975 +# ifdef YYPRINT
18976 + YYPRINT (stderr, yychar, yylval);
18977 +# endif
18978 + YYFPRINTF (stderr, ")\n");
18979 + }
18980 +#endif
18981 + }
18982 +
18983 + yyn += yychar1;
18984 + if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
18985 + goto yydefault;
18986 +
18987 + yyn = yytable[yyn];
18988 +
18989 + /* yyn is what to do for this token type in this state.
18990 + Negative => reduce, -yyn is rule number.
18991 + Positive => shift, yyn is new state.
18992 + New state is final state => don't bother to shift,
18993 + just return success.
18994 + 0, or most negative number => error. */
18995 +
18996 + if (yyn < 0)
18997 + {
18998 + if (yyn == YYFLAG)
18999 + goto yyerrlab;
19000 + yyn = -yyn;
19001 + goto yyreduce;
19002 + }
19003 + else if (yyn == 0)
19004 + goto yyerrlab;
19005 +
19006 + if (yyn == YYFINAL)
19007 + YYACCEPT;
19008 +
19009 + /* Shift the lookahead token. */
19010 + YYDPRINTF ((stderr, "Shifting token %d (%s), ",
19011 + yychar, yytname[yychar1]));
19012 +
19013 + /* Discard the token being shifted unless it is eof. */
19014 + if (yychar != YYEOF)
19015 + yychar = YYEMPTY;
19016 +
19017 + *++yyvsp = yylval;
19018 +#if YYLSP_NEEDED
19019 + *++yylsp = yylloc;
19020 +#endif
19021 +
19022 + /* Count tokens shifted since error; after three, turn off error
19023 + status. */
19024 + if (yyerrstatus)
19025 + yyerrstatus--;
19026 +
19027 + yystate = yyn;
19028 + goto yynewstate;
19029 +
19030 +
19031 +/*-----------------------------------------------------------.
19032 +| yydefault -- do the default action for the current state. |
19033 +`-----------------------------------------------------------*/
19034 +yydefault:
19035 + yyn = yydefact[yystate];
19036 + if (yyn == 0)
19037 + goto yyerrlab;
19038 + goto yyreduce;
19039 +
19040 +
19041 +/*-----------------------------.
19042 +| yyreduce -- Do a reduction. |
19043 +`-----------------------------*/
19044 +yyreduce:
19045 + /* yyn is the number of a rule to reduce with. */
19046 + yylen = yyr2[yyn];
19047 +
19048 + /* If YYLEN is nonzero, implement the default value of the action:
19049 + `$$ = $1'.
19050 +
19051 + Otherwise, the following line sets YYVAL to the semantic value of
19052 + the lookahead token. This behavior is undocumented and Bison
19053 + users should not rely upon it. Assigning to YYVAL
19054 + unconditionally makes the parser a bit smaller, and it avoids a
19055 + GCC warning that YYVAL may be used uninitialized. */
19056 + yyval = yyvsp[1-yylen];
19057 +
19058 +#if YYLSP_NEEDED
19059 + /* Similarly for the default location. Let the user run additional
19060 + commands if for instance locations are ranges. */
19061 + yyloc = yylsp[1-yylen];
19062 + YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
19063 +#endif
19064 +
19065 +#if YYDEBUG
19066 + /* We have to keep this `#if YYDEBUG', since we use variables which
19067 + are defined only if `YYDEBUG' is set. */
19068 + if (yydebug)
19069 + {
19070 + int yyi;
19071 +
19072 + YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
19073 + yyn, yyrline[yyn]);
19074 +
19075 + /* Print the symbols being reduced, and their result. */
19076 + for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
19077 + YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
19078 + YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
19079 + }
19080 +#endif
19081 +
19082 + switch (yyn) {
19083 +
19084 +case 1:
19085 +#line 151 "plural.y"
19086 +{
19087 + if (yyvsp[0].exp == NULL)
19088 + YYABORT;
19089 + ((struct parse_args *) arg)->res = yyvsp[0].exp;
19090 + }
19091 + break;
19092 +case 2:
19093 +#line 159 "plural.y"
19094 +{
19095 + yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
19096 + }
19097 + break;
19098 +case 3:
19099 +#line 163 "plural.y"
19100 +{
19101 + yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
19102 + }
19103 + break;
19104 +case 4:
19105 +#line 167 "plural.y"
19106 +{
19107 + yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
19108 + }
19109 + break;
19110 +case 5:
19111 +#line 171 "plural.y"
19112 +{
19113 + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
19114 + }
19115 + break;
19116 +case 6:
19117 +#line 175 "plural.y"
19118 +{
19119 + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
19120 + }
19121 + break;
19122 +case 7:
19123 +#line 179 "plural.y"
19124 +{
19125 + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
19126 + }
19127 + break;
19128 +case 8:
19129 +#line 183 "plural.y"
19130 +{
19131 + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
19132 + }
19133 + break;
19134 +case 9:
19135 +#line 187 "plural.y"
19136 +{
19137 + yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
19138 + }
19139 + break;
19140 +case 10:
19141 +#line 191 "plural.y"
19142 +{
19143 + yyval.exp = new_exp_0 (var);
19144 + }
19145 + break;
19146 +case 11:
19147 +#line 195 "plural.y"
19148 +{
19149 + if ((yyval.exp = new_exp_0 (num)) != NULL)
19150 + yyval.exp->val.num = yyvsp[0].num;
19151 + }
19152 + break;
19153 +case 12:
19154 +#line 200 "plural.y"
19155 +{
19156 + yyval.exp = yyvsp[-1].exp;
19157 + }
19158 + break;
19159 +}
19160 +
19161 +#line 705 "/usr/local/share/bison/bison.simple"
19162 +
19163 +\f
19164 + yyvsp -= yylen;
19165 + yyssp -= yylen;
19166 +#if YYLSP_NEEDED
19167 + yylsp -= yylen;
19168 +#endif
19169 +
19170 +#if YYDEBUG
19171 + if (yydebug)
19172 + {
19173 + short *yyssp1 = yyss - 1;
19174 + YYFPRINTF (stderr, "state stack now");
19175 + while (yyssp1 != yyssp)
19176 + YYFPRINTF (stderr, " %d", *++yyssp1);
19177 + YYFPRINTF (stderr, "\n");
19178 + }
19179 +#endif
19180 +
19181 + *++yyvsp = yyval;
19182 +#if YYLSP_NEEDED
19183 + *++yylsp = yyloc;
19184 +#endif
19185 +
19186 + /* Now `shift' the result of the reduction. Determine what state
19187 + that goes to, based on the state we popped back to and the rule
19188 + number reduced by. */
19189 +
19190 + yyn = yyr1[yyn];
19191 +
19192 + yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
19193 + if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
19194 + yystate = yytable[yystate];
19195 + else
19196 + yystate = yydefgoto[yyn - YYNTBASE];
19197 +
19198 + goto yynewstate;
19199 +
19200 +
19201 +/*------------------------------------.
19202 +| yyerrlab -- here on detecting error |
19203 +`------------------------------------*/
19204 +yyerrlab:
19205 + /* If not already recovering from an error, report this error. */
19206 + if (!yyerrstatus)
19207 + {
19208 + ++yynerrs;
19209 +
19210 +#ifdef YYERROR_VERBOSE
19211 + yyn = yypact[yystate];
19212 +
19213 + if (yyn > YYFLAG && yyn < YYLAST)
19214 + {
19215 + YYSIZE_T yysize = 0;
19216 + char *yymsg;
19217 + int yyx, yycount;
19218 +
19219 + yycount = 0;
19220 + /* Start YYX at -YYN if negative to avoid negative indexes in
19221 + YYCHECK. */
19222 + for (yyx = yyn < 0 ? -yyn : 0;
19223 + yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
19224 + if (yycheck[yyx + yyn] == yyx)
19225 + yysize += yystrlen (yytname[yyx]) + 15, yycount++;
19226 + yysize += yystrlen ("parse error, unexpected ") + 1;
19227 + yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
19228 + yymsg = (char *) YYSTACK_ALLOC (yysize);
19229 + if (yymsg != 0)
19230 + {
19231 + char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
19232 + yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
19233 +
19234 + if (yycount < 5)
19235 + {
19236 + yycount = 0;
19237 + for (yyx = yyn < 0 ? -yyn : 0;
19238 + yyx < (int) (sizeof (yytname) / sizeof (char *));
19239 + yyx++)
19240 + if (yycheck[yyx + yyn] == yyx)
19241 + {
19242 + const char *yyq = ! yycount ? ", expecting " : " or ";
19243 + yyp = yystpcpy (yyp, yyq);
19244 + yyp = yystpcpy (yyp, yytname[yyx]);
19245 + yycount++;
19246 + }
19247 + }
19248 + yyerror (yymsg);
19249 + YYSTACK_FREE (yymsg);
19250 + }
19251 + else
19252 + yyerror ("parse error; also virtual memory exhausted");
19253 + }
19254 + else
19255 +#endif /* defined (YYERROR_VERBOSE) */
19256 + yyerror ("parse error");
19257 + }
19258 + goto yyerrlab1;
19259 +
19260 +
19261 +/*--------------------------------------------------.
19262 +| yyerrlab1 -- error raised explicitly by an action |
19263 +`--------------------------------------------------*/
19264 +yyerrlab1:
19265 + if (yyerrstatus == 3)
19266 + {
19267 + /* If just tried and failed to reuse lookahead token after an
19268 + error, discard it. */
19269 +
19270 + /* return failure if at end of input */
19271 + if (yychar == YYEOF)
19272 + YYABORT;
19273 + YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
19274 + yychar, yytname[yychar1]));
19275 + yychar = YYEMPTY;
19276 + }
19277 +
19278 + /* Else will try to reuse lookahead token after shifting the error
19279 + token. */
19280 +
19281 + yyerrstatus = 3; /* Each real token shifted decrements this */
19282 +
19283 + goto yyerrhandle;
19284 +
19285 +
19286 +/*-------------------------------------------------------------------.
19287 +| yyerrdefault -- current state does not do anything special for the |
19288 +| error token. |
19289 +`-------------------------------------------------------------------*/
19290 +yyerrdefault:
19291 +#if 0
19292 + /* This is wrong; only states that explicitly want error tokens
19293 + should shift them. */
19294 +
19295 + /* If its default is to accept any token, ok. Otherwise pop it. */
19296 + yyn = yydefact[yystate];
19297 + if (yyn)
19298 + goto yydefault;
19299 +#endif
19300 +
19301 +
19302 +/*---------------------------------------------------------------.
19303 +| yyerrpop -- pop the current state because it cannot handle the |
19304 +| error token |
19305 +`---------------------------------------------------------------*/
19306 +yyerrpop:
19307 + if (yyssp == yyss)
19308 + YYABORT;
19309 + yyvsp--;
19310 + yystate = *--yyssp;
19311 +#if YYLSP_NEEDED
19312 + yylsp--;
19313 +#endif
19314 +
19315 +#if YYDEBUG
19316 + if (yydebug)
19317 + {
19318 + short *yyssp1 = yyss - 1;
19319 + YYFPRINTF (stderr, "Error: state stack now");
19320 + while (yyssp1 != yyssp)
19321 + YYFPRINTF (stderr, " %d", *++yyssp1);
19322 + YYFPRINTF (stderr, "\n");
19323 + }
19324 +#endif
19325 +
19326 +/*--------------.
19327 +| yyerrhandle. |
19328 +`--------------*/
19329 +yyerrhandle:
19330 + yyn = yypact[yystate];
19331 + if (yyn == YYFLAG)
19332 + goto yyerrdefault;
19333 +
19334 + yyn += YYTERROR;
19335 + if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
19336 + goto yyerrdefault;
19337 +
19338 + yyn = yytable[yyn];
19339 + if (yyn < 0)
19340 + {
19341 + if (yyn == YYFLAG)
19342 + goto yyerrpop;
19343 + yyn = -yyn;
19344 + goto yyreduce;
19345 + }
19346 + else if (yyn == 0)
19347 + goto yyerrpop;
19348 +
19349 + if (yyn == YYFINAL)
19350 + YYACCEPT;
19351 +
19352 + YYDPRINTF ((stderr, "Shifting error token, "));
19353 +
19354 + *++yyvsp = yylval;
19355 +#if YYLSP_NEEDED
19356 + *++yylsp = yylloc;
19357 +#endif
19358 +
19359 + yystate = yyn;
19360 + goto yynewstate;
19361 +
19362 +
19363 +/*-------------------------------------.
19364 +| yyacceptlab -- YYACCEPT comes here. |
19365 +`-------------------------------------*/
19366 +yyacceptlab:
19367 + yyresult = 0;
19368 + goto yyreturn;
19369 +
19370 +/*-----------------------------------.
19371 +| yyabortlab -- YYABORT comes here. |
19372 +`-----------------------------------*/
19373 +yyabortlab:
19374 + yyresult = 1;
19375 + goto yyreturn;
19376 +
19377 +/*---------------------------------------------.
19378 +| yyoverflowab -- parser overflow comes here. |
19379 +`---------------------------------------------*/
19380 +yyoverflowlab:
19381 + yyerror ("parser stack overflow");
19382 + yyresult = 2;
19383 + /* Fall through. */
19384 +
19385 +yyreturn:
19386 +#ifndef yyoverflow
19387 + if (yyss != yyssa)
19388 + YYSTACK_FREE (yyss);
19389 +#endif
19390 + return yyresult;
19391 +}
19392 +#line 205 "plural.y"
19393 +
19394 +
19395 +void
19396 +internal_function
19397 +FREE_EXPRESSION (struct expression *exp)
19398 +{
19399 + if (exp == NULL)
19400 + return;
19401 +
19402 + /* Handle the recursive case. */
19403 + switch (exp->nargs)
19404 + {
19405 + case 3:
19406 + FREE_EXPRESSION (exp->val.args[2]);
19407 + /* FALLTHROUGH */
19408 + case 2:
19409 + FREE_EXPRESSION (exp->val.args[1]);
19410 + /* FALLTHROUGH */
19411 + case 1:
19412 + FREE_EXPRESSION (exp->val.args[0]);
19413 + /* FALLTHROUGH */
19414 + default:
19415 + break;
19416 + }
19417 +
19418 + free (exp);
19419 +}
19420 +
19421 +
19422 +static int
19423 +yylex (YYSTYPE *lval, const char **pexp)
19424 +{
19425 + const char *exp = *pexp;
19426 + int result;
19427 +
19428 + while (1)
19429 + {
19430 + if (exp[0] == '\0')
19431 + {
19432 + *pexp = exp;
19433 + return YYEOF;
19434 + }
19435 +
19436 + if (exp[0] != ' ' && exp[0] != '\t')
19437 + break;
19438 +
19439 + ++exp;
19440 + }
19441 +
19442 + result = *exp++;
19443 + switch (result)
19444 + {
19445 + case '0': case '1': case '2': case '3': case '4':
19446 + case '5': case '6': case '7': case '8': case '9':
19447 + {
19448 + unsigned long int n = result - '0';
19449 + while (exp[0] >= '0' && exp[0] <= '9')
19450 + {
19451 + n *= 10;
19452 + n += exp[0] - '0';
19453 + ++exp;
19454 + }
19455 + lval->num = n;
19456 + result = NUMBER;
19457 + }
19458 + break;
19459 +
19460 + case '=':
19461 + if (exp[0] == '=')
19462 + {
19463 + ++exp;
19464 + lval->op = equal;
19465 + result = EQUOP2;
19466 + }
19467 + else
19468 + result = YYERRCODE;
19469 + break;
19470 +
19471 + case '!':
19472 + if (exp[0] == '=')
19473 + {
19474 + ++exp;
19475 + lval->op = not_equal;
19476 + result = EQUOP2;
19477 + }
19478 + break;
19479 +
19480 + case '&':
19481 + case '|':
19482 + if (exp[0] == result)
19483 + ++exp;
19484 + else
19485 + result = YYERRCODE;
19486 + break;
19487 +
19488 + case '<':
19489 + if (exp[0] == '=')
19490 + {
19491 + ++exp;
19492 + lval->op = less_or_equal;
19493 + }
19494 + else
19495 + lval->op = less_than;
19496 + result = CMPOP2;
19497 + break;
19498 +
19499 + case '>':
19500 + if (exp[0] == '=')
19501 + {
19502 + ++exp;
19503 + lval->op = greater_or_equal;
19504 + }
19505 + else
19506 + lval->op = greater_than;
19507 + result = CMPOP2;
19508 + break;
19509 +
19510 + case '*':
19511 + lval->op = mult;
19512 + result = MULOP2;
19513 + break;
19514 +
19515 + case '/':
19516 + lval->op = divide;
19517 + result = MULOP2;
19518 + break;
19519 +
19520 + case '%':
19521 + lval->op = module;
19522 + result = MULOP2;
19523 + break;
19524 +
19525 + case '+':
19526 + lval->op = plus;
19527 + result = ADDOP2;
19528 + break;
19529 +
19530 + case '-':
19531 + lval->op = minus;
19532 + result = ADDOP2;
19533 + break;
19534 +
19535 + case 'n':
19536 + case '?':
19537 + case ':':
19538 + case '(':
19539 + case ')':
19540 + /* Nothing, just return the character. */
19541 + break;
19542 +
19543 + case ';':
19544 + case '\n':
19545 + case '\0':
19546 + /* Be safe and let the user call this function again. */
19547 + --exp;
19548 + result = YYEOF;
19549 + break;
19550 +
19551 + default:
19552 + result = YYERRCODE;
19553 +#if YYDEBUG != 0
19554 + --exp;
19555 +#endif
19556 + break;
19557 + }
19558 +
19559 + *pexp = exp;
19560 +
19561 + return result;
19562 +}
19563 +
19564 +
19565 +static void
19566 +yyerror (const char *str)
19567 +{
19568 + /* Do nothing. We don't print error messages here. */
19569 +}
19570 --- /dev/null
19571 +++ lxpanel-0.5.6/intl/loadmsgcat.c
19572 @@ -0,0 +1,1420 @@
19573 +/* Load needed message catalogs.
19574 + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
19575 +
19576 + This program is free software; you can redistribute it and/or modify it
19577 + under the terms of the GNU Library General Public License as published
19578 + by the Free Software Foundation; either version 2, or (at your option)
19579 + any later version.
19580 +
19581 + This program is distributed in the hope that it will be useful,
19582 + but WITHOUT ANY WARRANTY; without even the implied warranty of
19583 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19584 + Library General Public License for more details.
19585 +
19586 + You should have received a copy of the GNU Library General Public
19587 + License along with this program; if not, write to the Free Software
19588 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
19589 + USA. */
19590 +
19591 +/* Tell glibc's <string.h> to provide a prototype for mempcpy().
19592 + This must come before <config.h> because <config.h> may include
19593 + <features.h>, and once <features.h> has been included, it's too late. */
19594 +#ifndef _GNU_SOURCE
19595 +# define _GNU_SOURCE 1
19596 +#endif
19597 +
19598 +#ifdef HAVE_CONFIG_H
19599 +# include <config.h>
19600 +#endif
19601 +
19602 +#include <ctype.h>
19603 +#include <errno.h>
19604 +#include <fcntl.h>
19605 +#include <sys/types.h>
19606 +#include <sys/stat.h>
19607 +
19608 +#ifdef __GNUC__
19609 +# undef alloca
19610 +# define alloca __builtin_alloca
19611 +# define HAVE_ALLOCA 1
19612 +#else
19613 +# ifdef _MSC_VER
19614 +# include <malloc.h>
19615 +# define alloca _alloca
19616 +# else
19617 +# if defined HAVE_ALLOCA_H || defined _LIBC
19618 +# include <alloca.h>
19619 +# else
19620 +# ifdef _AIX
19621 + #pragma alloca
19622 +# else
19623 +# ifndef alloca
19624 +char *alloca ();
19625 +# endif
19626 +# endif
19627 +# endif
19628 +# endif
19629 +#endif
19630 +
19631 +#include <stdlib.h>
19632 +#include <string.h>
19633 +
19634 +#if defined HAVE_UNISTD_H || defined _LIBC
19635 +# include <unistd.h>
19636 +#endif
19637 +
19638 +#ifdef _LIBC
19639 +# include <langinfo.h>
19640 +# include <locale.h>
19641 +#endif
19642 +
19643 +#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
19644 + || (defined _LIBC && defined _POSIX_MAPPED_FILES)
19645 +# include <sys/mman.h>
19646 +# undef HAVE_MMAP
19647 +# define HAVE_MMAP 1
19648 +#else
19649 +# undef HAVE_MMAP
19650 +#endif
19651 +
19652 +#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
19653 +# include <stdint.h>
19654 +#endif
19655 +#if defined HAVE_INTTYPES_H || defined _LIBC
19656 +# include <inttypes.h>
19657 +#endif
19658 +
19659 +#include "gmo.h"
19660 +#include "gettextP.h"
19661 +#include "hash-string.h"
19662 +#include "plural-exp.h"
19663 +
19664 +#ifdef _LIBC
19665 +# include "../locale/localeinfo.h"
19666 +#endif
19667 +
19668 +/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
19669 + Note that our fallback values need not be literal strings, because we don't
19670 + use them with preprocessor string concatenation. */
19671 +#if !defined PRId8 || PRI_MACROS_BROKEN
19672 +# undef PRId8
19673 +# define PRId8 "d"
19674 +#endif
19675 +#if !defined PRIi8 || PRI_MACROS_BROKEN
19676 +# undef PRIi8
19677 +# define PRIi8 "i"
19678 +#endif
19679 +#if !defined PRIo8 || PRI_MACROS_BROKEN
19680 +# undef PRIo8
19681 +# define PRIo8 "o"
19682 +#endif
19683 +#if !defined PRIu8 || PRI_MACROS_BROKEN
19684 +# undef PRIu8
19685 +# define PRIu8 "u"
19686 +#endif
19687 +#if !defined PRIx8 || PRI_MACROS_BROKEN
19688 +# undef PRIx8
19689 +# define PRIx8 "x"
19690 +#endif
19691 +#if !defined PRIX8 || PRI_MACROS_BROKEN
19692 +# undef PRIX8
19693 +# define PRIX8 "X"
19694 +#endif
19695 +#if !defined PRId16 || PRI_MACROS_BROKEN
19696 +# undef PRId16
19697 +# define PRId16 "d"
19698 +#endif
19699 +#if !defined PRIi16 || PRI_MACROS_BROKEN
19700 +# undef PRIi16
19701 +# define PRIi16 "i"
19702 +#endif
19703 +#if !defined PRIo16 || PRI_MACROS_BROKEN
19704 +# undef PRIo16
19705 +# define PRIo16 "o"
19706 +#endif
19707 +#if !defined PRIu16 || PRI_MACROS_BROKEN
19708 +# undef PRIu16
19709 +# define PRIu16 "u"
19710 +#endif
19711 +#if !defined PRIx16 || PRI_MACROS_BROKEN
19712 +# undef PRIx16
19713 +# define PRIx16 "x"
19714 +#endif
19715 +#if !defined PRIX16 || PRI_MACROS_BROKEN
19716 +# undef PRIX16
19717 +# define PRIX16 "X"
19718 +#endif
19719 +#if !defined PRId32 || PRI_MACROS_BROKEN
19720 +# undef PRId32
19721 +# define PRId32 "d"
19722 +#endif
19723 +#if !defined PRIi32 || PRI_MACROS_BROKEN
19724 +# undef PRIi32
19725 +# define PRIi32 "i"
19726 +#endif
19727 +#if !defined PRIo32 || PRI_MACROS_BROKEN
19728 +# undef PRIo32
19729 +# define PRIo32 "o"
19730 +#endif
19731 +#if !defined PRIu32 || PRI_MACROS_BROKEN
19732 +# undef PRIu32
19733 +# define PRIu32 "u"
19734 +#endif
19735 +#if !defined PRIx32 || PRI_MACROS_BROKEN
19736 +# undef PRIx32
19737 +# define PRIx32 "x"
19738 +#endif
19739 +#if !defined PRIX32 || PRI_MACROS_BROKEN
19740 +# undef PRIX32
19741 +# define PRIX32 "X"
19742 +#endif
19743 +#if !defined PRId64 || PRI_MACROS_BROKEN
19744 +# undef PRId64
19745 +# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
19746 +#endif
19747 +#if !defined PRIi64 || PRI_MACROS_BROKEN
19748 +# undef PRIi64
19749 +# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
19750 +#endif
19751 +#if !defined PRIo64 || PRI_MACROS_BROKEN
19752 +# undef PRIo64
19753 +# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
19754 +#endif
19755 +#if !defined PRIu64 || PRI_MACROS_BROKEN
19756 +# undef PRIu64
19757 +# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
19758 +#endif
19759 +#if !defined PRIx64 || PRI_MACROS_BROKEN
19760 +# undef PRIx64
19761 +# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
19762 +#endif
19763 +#if !defined PRIX64 || PRI_MACROS_BROKEN
19764 +# undef PRIX64
19765 +# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
19766 +#endif
19767 +#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
19768 +# undef PRIdLEAST8
19769 +# define PRIdLEAST8 "d"
19770 +#endif
19771 +#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
19772 +# undef PRIiLEAST8
19773 +# define PRIiLEAST8 "i"
19774 +#endif
19775 +#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
19776 +# undef PRIoLEAST8
19777 +# define PRIoLEAST8 "o"
19778 +#endif
19779 +#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
19780 +# undef PRIuLEAST8
19781 +# define PRIuLEAST8 "u"
19782 +#endif
19783 +#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
19784 +# undef PRIxLEAST8
19785 +# define PRIxLEAST8 "x"
19786 +#endif
19787 +#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
19788 +# undef PRIXLEAST8
19789 +# define PRIXLEAST8 "X"
19790 +#endif
19791 +#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
19792 +# undef PRIdLEAST16
19793 +# define PRIdLEAST16 "d"
19794 +#endif
19795 +#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
19796 +# undef PRIiLEAST16
19797 +# define PRIiLEAST16 "i"
19798 +#endif
19799 +#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
19800 +# undef PRIoLEAST16
19801 +# define PRIoLEAST16 "o"
19802 +#endif
19803 +#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
19804 +# undef PRIuLEAST16
19805 +# define PRIuLEAST16 "u"
19806 +#endif
19807 +#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
19808 +# undef PRIxLEAST16
19809 +# define PRIxLEAST16 "x"
19810 +#endif
19811 +#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
19812 +# undef PRIXLEAST16
19813 +# define PRIXLEAST16 "X"
19814 +#endif
19815 +#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
19816 +# undef PRIdLEAST32
19817 +# define PRIdLEAST32 "d"
19818 +#endif
19819 +#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
19820 +# undef PRIiLEAST32
19821 +# define PRIiLEAST32 "i"
19822 +#endif
19823 +#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
19824 +# undef PRIoLEAST32
19825 +# define PRIoLEAST32 "o"
19826 +#endif
19827 +#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
19828 +# undef PRIuLEAST32
19829 +# define PRIuLEAST32 "u"
19830 +#endif
19831 +#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
19832 +# undef PRIxLEAST32
19833 +# define PRIxLEAST32 "x"
19834 +#endif
19835 +#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
19836 +# undef PRIXLEAST32
19837 +# define PRIXLEAST32 "X"
19838 +#endif
19839 +#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
19840 +# undef PRIdLEAST64
19841 +# define PRIdLEAST64 PRId64
19842 +#endif
19843 +#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
19844 +# undef PRIiLEAST64
19845 +# define PRIiLEAST64 PRIi64
19846 +#endif
19847 +#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
19848 +# undef PRIoLEAST64
19849 +# define PRIoLEAST64 PRIo64
19850 +#endif
19851 +#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
19852 +# undef PRIuLEAST64
19853 +# define PRIuLEAST64 PRIu64
19854 +#endif
19855 +#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
19856 +# undef PRIxLEAST64
19857 +# define PRIxLEAST64 PRIx64
19858 +#endif
19859 +#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
19860 +# undef PRIXLEAST64
19861 +# define PRIXLEAST64 PRIX64
19862 +#endif
19863 +#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
19864 +# undef PRIdFAST8
19865 +# define PRIdFAST8 "d"
19866 +#endif
19867 +#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
19868 +# undef PRIiFAST8
19869 +# define PRIiFAST8 "i"
19870 +#endif
19871 +#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
19872 +# undef PRIoFAST8
19873 +# define PRIoFAST8 "o"
19874 +#endif
19875 +#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
19876 +# undef PRIuFAST8
19877 +# define PRIuFAST8 "u"
19878 +#endif
19879 +#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
19880 +# undef PRIxFAST8
19881 +# define PRIxFAST8 "x"
19882 +#endif
19883 +#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
19884 +# undef PRIXFAST8
19885 +# define PRIXFAST8 "X"
19886 +#endif
19887 +#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
19888 +# undef PRIdFAST16
19889 +# define PRIdFAST16 "d"
19890 +#endif
19891 +#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
19892 +# undef PRIiFAST16
19893 +# define PRIiFAST16 "i"
19894 +#endif
19895 +#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
19896 +# undef PRIoFAST16
19897 +# define PRIoFAST16 "o"
19898 +#endif
19899 +#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
19900 +# undef PRIuFAST16
19901 +# define PRIuFAST16 "u"
19902 +#endif
19903 +#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
19904 +# undef PRIxFAST16
19905 +# define PRIxFAST16 "x"
19906 +#endif
19907 +#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
19908 +# undef PRIXFAST16
19909 +# define PRIXFAST16 "X"
19910 +#endif
19911 +#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
19912 +# undef PRIdFAST32
19913 +# define PRIdFAST32 "d"
19914 +#endif
19915 +#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
19916 +# undef PRIiFAST32
19917 +# define PRIiFAST32 "i"
19918 +#endif
19919 +#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
19920 +# undef PRIoFAST32
19921 +# define PRIoFAST32 "o"
19922 +#endif
19923 +#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
19924 +# undef PRIuFAST32
19925 +# define PRIuFAST32 "u"
19926 +#endif
19927 +#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
19928 +# undef PRIxFAST32
19929 +# define PRIxFAST32 "x"
19930 +#endif
19931 +#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
19932 +# undef PRIXFAST32
19933 +# define PRIXFAST32 "X"
19934 +#endif
19935 +#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
19936 +# undef PRIdFAST64
19937 +# define PRIdFAST64 PRId64
19938 +#endif
19939 +#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
19940 +# undef PRIiFAST64
19941 +# define PRIiFAST64 PRIi64
19942 +#endif
19943 +#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
19944 +# undef PRIoFAST64
19945 +# define PRIoFAST64 PRIo64
19946 +#endif
19947 +#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
19948 +# undef PRIuFAST64
19949 +# define PRIuFAST64 PRIu64
19950 +#endif
19951 +#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
19952 +# undef PRIxFAST64
19953 +# define PRIxFAST64 PRIx64
19954 +#endif
19955 +#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
19956 +# undef PRIXFAST64
19957 +# define PRIXFAST64 PRIX64
19958 +#endif
19959 +#if !defined PRIdMAX || PRI_MACROS_BROKEN
19960 +# undef PRIdMAX
19961 +# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
19962 +#endif
19963 +#if !defined PRIiMAX || PRI_MACROS_BROKEN
19964 +# undef PRIiMAX
19965 +# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
19966 +#endif
19967 +#if !defined PRIoMAX || PRI_MACROS_BROKEN
19968 +# undef PRIoMAX
19969 +# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
19970 +#endif
19971 +#if !defined PRIuMAX || PRI_MACROS_BROKEN
19972 +# undef PRIuMAX
19973 +# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
19974 +#endif
19975 +#if !defined PRIxMAX || PRI_MACROS_BROKEN
19976 +# undef PRIxMAX
19977 +# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
19978 +#endif
19979 +#if !defined PRIXMAX || PRI_MACROS_BROKEN
19980 +# undef PRIXMAX
19981 +# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
19982 +#endif
19983 +#if !defined PRIdPTR || PRI_MACROS_BROKEN
19984 +# undef PRIdPTR
19985 +# define PRIdPTR \
19986 + (sizeof (void *) == sizeof (long) ? "ld" : \
19987 + sizeof (void *) == sizeof (int) ? "d" : \
19988 + "lld")
19989 +#endif
19990 +#if !defined PRIiPTR || PRI_MACROS_BROKEN
19991 +# undef PRIiPTR
19992 +# define PRIiPTR \
19993 + (sizeof (void *) == sizeof (long) ? "li" : \
19994 + sizeof (void *) == sizeof (int) ? "i" : \
19995 + "lli")
19996 +#endif
19997 +#if !defined PRIoPTR || PRI_MACROS_BROKEN
19998 +# undef PRIoPTR
19999 +# define PRIoPTR \
20000 + (sizeof (void *) == sizeof (long) ? "lo" : \
20001 + sizeof (void *) == sizeof (int) ? "o" : \
20002 + "llo")
20003 +#endif
20004 +#if !defined PRIuPTR || PRI_MACROS_BROKEN
20005 +# undef PRIuPTR
20006 +# define PRIuPTR \
20007 + (sizeof (void *) == sizeof (long) ? "lu" : \
20008 + sizeof (void *) == sizeof (int) ? "u" : \
20009 + "llu")
20010 +#endif
20011 +#if !defined PRIxPTR || PRI_MACROS_BROKEN
20012 +# undef PRIxPTR
20013 +# define PRIxPTR \
20014 + (sizeof (void *) == sizeof (long) ? "lx" : \
20015 + sizeof (void *) == sizeof (int) ? "x" : \
20016 + "llx")
20017 +#endif
20018 +#if !defined PRIXPTR || PRI_MACROS_BROKEN
20019 +# undef PRIXPTR
20020 +# define PRIXPTR \
20021 + (sizeof (void *) == sizeof (long) ? "lX" : \
20022 + sizeof (void *) == sizeof (int) ? "X" : \
20023 + "llX")
20024 +#endif
20025 +
20026 +/* @@ end of prolog @@ */
20027 +
20028 +#ifdef _LIBC
20029 +/* Rename the non ISO C functions. This is required by the standard
20030 + because some ISO C functions will require linking with this object
20031 + file and the name space must not be polluted. */
20032 +# define open __open
20033 +# define close __close
20034 +# define read __read
20035 +# define mmap __mmap
20036 +# define munmap __munmap
20037 +#endif
20038 +
20039 +/* For those losing systems which don't have `alloca' we have to add
20040 + some additional code emulating it. */
20041 +#ifdef HAVE_ALLOCA
20042 +# define freea(p) /* nothing */
20043 +#else
20044 +# define alloca(n) malloc (n)
20045 +# define freea(p) free (p)
20046 +#endif
20047 +
20048 +/* For systems that distinguish between text and binary I/O.
20049 + O_BINARY is usually declared in <fcntl.h>. */
20050 +#if !defined O_BINARY && defined _O_BINARY
20051 + /* For MSC-compatible compilers. */
20052 +# define O_BINARY _O_BINARY
20053 +# define O_TEXT _O_TEXT
20054 +#endif
20055 +#ifdef __BEOS__
20056 + /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
20057 +# undef O_BINARY
20058 +# undef O_TEXT
20059 +#endif
20060 +/* On reasonable systems, binary I/O is the default. */
20061 +#ifndef O_BINARY
20062 +# define O_BINARY 0
20063 +#endif
20064 +
20065 +
20066 +/* We need a sign, whether a new catalog was loaded, which can be associated
20067 + with all translations. This is important if the translations are
20068 + cached by one of GCC's features. */
20069 +int _nl_msg_cat_cntr;
20070 +
20071 +
20072 +/* Expand a system dependent string segment. Return NULL if unsupported. */
20073 +static const char *
20074 +get_sysdep_segment_value (const char *name)
20075 +{
20076 + /* Test for an ISO C 99 section 7.8.1 format string directive.
20077 + Syntax:
20078 + P R I { d | i | o | u | x | X }
20079 + { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
20080 + /* We don't use a table of 14 times 6 'const char *' strings here, because
20081 + data relocations cost startup time. */
20082 + if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
20083 + {
20084 + if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
20085 + || name[3] == 'x' || name[3] == 'X')
20086 + {
20087 + if (name[4] == '8' && name[5] == '\0')
20088 + {
20089 + if (name[3] == 'd')
20090 + return PRId8;
20091 + if (name[3] == 'i')
20092 + return PRIi8;
20093 + if (name[3] == 'o')
20094 + return PRIo8;
20095 + if (name[3] == 'u')
20096 + return PRIu8;
20097 + if (name[3] == 'x')
20098 + return PRIx8;
20099 + if (name[3] == 'X')
20100 + return PRIX8;
20101 + abort ();
20102 + }
20103 + if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
20104 + {
20105 + if (name[3] == 'd')
20106 + return PRId16;
20107 + if (name[3] == 'i')
20108 + return PRIi16;
20109 + if (name[3] == 'o')
20110 + return PRIo16;
20111 + if (name[3] == 'u')
20112 + return PRIu16;
20113 + if (name[3] == 'x')
20114 + return PRIx16;
20115 + if (name[3] == 'X')
20116 + return PRIX16;
20117 + abort ();
20118 + }
20119 + if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
20120 + {
20121 + if (name[3] == 'd')
20122 + return PRId32;
20123 + if (name[3] == 'i')
20124 + return PRIi32;
20125 + if (name[3] == 'o')
20126 + return PRIo32;
20127 + if (name[3] == 'u')
20128 + return PRIu32;
20129 + if (name[3] == 'x')
20130 + return PRIx32;
20131 + if (name[3] == 'X')
20132 + return PRIX32;
20133 + abort ();
20134 + }
20135 + if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
20136 + {
20137 + if (name[3] == 'd')
20138 + return PRId64;
20139 + if (name[3] == 'i')
20140 + return PRIi64;
20141 + if (name[3] == 'o')
20142 + return PRIo64;
20143 + if (name[3] == 'u')
20144 + return PRIu64;
20145 + if (name[3] == 'x')
20146 + return PRIx64;
20147 + if (name[3] == 'X')
20148 + return PRIX64;
20149 + abort ();
20150 + }
20151 + if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
20152 + && name[7] == 'S' && name[8] == 'T')
20153 + {
20154 + if (name[9] == '8' && name[10] == '\0')
20155 + {
20156 + if (name[3] == 'd')
20157 + return PRIdLEAST8;
20158 + if (name[3] == 'i')
20159 + return PRIiLEAST8;
20160 + if (name[3] == 'o')
20161 + return PRIoLEAST8;
20162 + if (name[3] == 'u')
20163 + return PRIuLEAST8;
20164 + if (name[3] == 'x')
20165 + return PRIxLEAST8;
20166 + if (name[3] == 'X')
20167 + return PRIXLEAST8;
20168 + abort ();
20169 + }
20170 + if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
20171 + {
20172 + if (name[3] == 'd')
20173 + return PRIdLEAST16;
20174 + if (name[3] == 'i')
20175 + return PRIiLEAST16;
20176 + if (name[3] == 'o')
20177 + return PRIoLEAST16;
20178 + if (name[3] == 'u')
20179 + return PRIuLEAST16;
20180 + if (name[3] == 'x')
20181 + return PRIxLEAST16;
20182 + if (name[3] == 'X')
20183 + return PRIXLEAST16;
20184 + abort ();
20185 + }
20186 + if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
20187 + {
20188 + if (name[3] == 'd')
20189 + return PRIdLEAST32;
20190 + if (name[3] == 'i')
20191 + return PRIiLEAST32;
20192 + if (name[3] == 'o')
20193 + return PRIoLEAST32;
20194 + if (name[3] == 'u')
20195 + return PRIuLEAST32;
20196 + if (name[3] == 'x')
20197 + return PRIxLEAST32;
20198 + if (name[3] == 'X')
20199 + return PRIXLEAST32;
20200 + abort ();
20201 + }
20202 + if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
20203 + {
20204 + if (name[3] == 'd')
20205 + return PRIdLEAST64;
20206 + if (name[3] == 'i')
20207 + return PRIiLEAST64;
20208 + if (name[3] == 'o')
20209 + return PRIoLEAST64;
20210 + if (name[3] == 'u')
20211 + return PRIuLEAST64;
20212 + if (name[3] == 'x')
20213 + return PRIxLEAST64;
20214 + if (name[3] == 'X')
20215 + return PRIXLEAST64;
20216 + abort ();
20217 + }
20218 + }
20219 + if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
20220 + && name[7] == 'T')
20221 + {
20222 + if (name[8] == '8' && name[9] == '\0')
20223 + {
20224 + if (name[3] == 'd')
20225 + return PRIdFAST8;
20226 + if (name[3] == 'i')
20227 + return PRIiFAST8;
20228 + if (name[3] == 'o')
20229 + return PRIoFAST8;
20230 + if (name[3] == 'u')
20231 + return PRIuFAST8;
20232 + if (name[3] == 'x')
20233 + return PRIxFAST8;
20234 + if (name[3] == 'X')
20235 + return PRIXFAST8;
20236 + abort ();
20237 + }
20238 + if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
20239 + {
20240 + if (name[3] == 'd')
20241 + return PRIdFAST16;
20242 + if (name[3] == 'i')
20243 + return PRIiFAST16;
20244 + if (name[3] == 'o')
20245 + return PRIoFAST16;
20246 + if (name[3] == 'u')
20247 + return PRIuFAST16;
20248 + if (name[3] == 'x')
20249 + return PRIxFAST16;
20250 + if (name[3] == 'X')
20251 + return PRIXFAST16;
20252 + abort ();
20253 + }
20254 + if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
20255 + {
20256 + if (name[3] == 'd')
20257 + return PRIdFAST32;
20258 + if (name[3] == 'i')
20259 + return PRIiFAST32;
20260 + if (name[3] == 'o')
20261 + return PRIoFAST32;
20262 + if (name[3] == 'u')
20263 + return PRIuFAST32;
20264 + if (name[3] == 'x')
20265 + return PRIxFAST32;
20266 + if (name[3] == 'X')
20267 + return PRIXFAST32;
20268 + abort ();
20269 + }
20270 + if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
20271 + {
20272 + if (name[3] == 'd')
20273 + return PRIdFAST64;
20274 + if (name[3] == 'i')
20275 + return PRIiFAST64;
20276 + if (name[3] == 'o')
20277 + return PRIoFAST64;
20278 + if (name[3] == 'u')
20279 + return PRIuFAST64;
20280 + if (name[3] == 'x')
20281 + return PRIxFAST64;
20282 + if (name[3] == 'X')
20283 + return PRIXFAST64;
20284 + abort ();
20285 + }
20286 + }
20287 + if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
20288 + && name[7] == '\0')
20289 + {
20290 + if (name[3] == 'd')
20291 + return PRIdMAX;
20292 + if (name[3] == 'i')
20293 + return PRIiMAX;
20294 + if (name[3] == 'o')
20295 + return PRIoMAX;
20296 + if (name[3] == 'u')
20297 + return PRIuMAX;
20298 + if (name[3] == 'x')
20299 + return PRIxMAX;
20300 + if (name[3] == 'X')
20301 + return PRIXMAX;
20302 + abort ();
20303 + }
20304 + if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
20305 + && name[7] == '\0')
20306 + {
20307 + if (name[3] == 'd')
20308 + return PRIdPTR;
20309 + if (name[3] == 'i')
20310 + return PRIiPTR;
20311 + if (name[3] == 'o')
20312 + return PRIoPTR;
20313 + if (name[3] == 'u')
20314 + return PRIuPTR;
20315 + if (name[3] == 'x')
20316 + return PRIxPTR;
20317 + if (name[3] == 'X')
20318 + return PRIXPTR;
20319 + abort ();
20320 + }
20321 + }
20322 + }
20323 + /* Test for a glibc specific printf() format directive flag. */
20324 + if (name[0] == 'I' && name[1] == '\0')
20325 + {
20326 +#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
20327 + /* The 'I' flag, in numeric format directives, replaces ASCII digits
20328 + with the 'outdigits' defined in the LC_CTYPE locale facet. This is
20329 + used for Farsi (Persian) and maybe Arabic. */
20330 + return "I";
20331 +#else
20332 + return "";
20333 +#endif
20334 + }
20335 + /* Other system dependent strings are not valid. */
20336 + return NULL;
20337 +}
20338 +
20339 +/* Initialize the codeset dependent parts of an opened message catalog.
20340 + Return the header entry. */
20341 +const char *
20342 +internal_function
20343 +_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
20344 + struct loaded_domain *domain,
20345 + struct binding *domainbinding)
20346 +{
20347 + /* Find out about the character set the file is encoded with.
20348 + This can be found (in textual form) in the entry "". If this
20349 + entry does not exist or if this does not contain the `charset='
20350 + information, we will assume the charset matches the one the
20351 + current locale and we don't have to perform any conversion. */
20352 + char *nullentry;
20353 + size_t nullentrylen;
20354 +
20355 + /* Preinitialize fields, to avoid recursion during _nl_find_msg. */
20356 + domain->codeset_cntr =
20357 + (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
20358 +#ifdef _LIBC
20359 + domain->conv = (__gconv_t) -1;
20360 +#else
20361 +# if HAVE_ICONV
20362 + domain->conv = (iconv_t) -1;
20363 +# endif
20364 +#endif
20365 + domain->conv_tab = NULL;
20366 +
20367 + /* Get the header entry. */
20368 + nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
20369 +
20370 + if (nullentry != NULL)
20371 + {
20372 +#if defined _LIBC || HAVE_ICONV
20373 + const char *charsetstr;
20374 +
20375 + charsetstr = strstr (nullentry, "charset=");
20376 + if (charsetstr != NULL)
20377 + {
20378 + size_t len;
20379 + char *charset;
20380 + const char *outcharset;
20381 +
20382 + charsetstr += strlen ("charset=");
20383 + len = strcspn (charsetstr, " \t\n");
20384 +
20385 + charset = (char *) alloca (len + 1);
20386 +# if defined _LIBC || HAVE_MEMPCPY
20387 + *((char *) mempcpy (charset, charsetstr, len)) = '\0';
20388 +# else
20389 + memcpy (charset, charsetstr, len);
20390 + charset[len] = '\0';
20391 +# endif
20392 +
20393 + /* The output charset should normally be determined by the
20394 + locale. But sometimes the locale is not used or not correctly
20395 + set up, so we provide a possibility for the user to override
20396 + this. Moreover, the value specified through
20397 + bind_textdomain_codeset overrides both. */
20398 + if (domainbinding != NULL && domainbinding->codeset != NULL)
20399 + outcharset = domainbinding->codeset;
20400 + else
20401 + {
20402 + outcharset = getenv ("OUTPUT_CHARSET");
20403 + if (outcharset == NULL || outcharset[0] == '\0')
20404 + {
20405 +# ifdef _LIBC
20406 + outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
20407 +# else
20408 +# if HAVE_ICONV
20409 + extern const char *locale_charset (void);
20410 + outcharset = locale_charset ();
20411 +# endif
20412 +# endif
20413 + }
20414 + }
20415 +
20416 +# ifdef _LIBC
20417 + /* We always want to use transliteration. */
20418 + outcharset = norm_add_slashes (outcharset, "TRANSLIT");
20419 + charset = norm_add_slashes (charset, NULL);
20420 + if (__gconv_open (outcharset, charset, &domain->conv,
20421 + GCONV_AVOID_NOCONV)
20422 + != __GCONV_OK)
20423 + domain->conv = (__gconv_t) -1;
20424 +# else
20425 +# if HAVE_ICONV
20426 + /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
20427 + we want to use transliteration. */
20428 +# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
20429 + || _LIBICONV_VERSION >= 0x0105
20430 + if (strchr (outcharset, '/') == NULL)
20431 + {
20432 + char *tmp;
20433 +
20434 + len = strlen (outcharset);
20435 + tmp = (char *) alloca (len + 10 + 1);
20436 + memcpy (tmp, outcharset, len);
20437 + memcpy (tmp + len, "//TRANSLIT", 10 + 1);
20438 + outcharset = tmp;
20439 +
20440 + domain->conv = iconv_open (outcharset, charset);
20441 +
20442 + freea (outcharset);
20443 + }
20444 + else
20445 +# endif
20446 + domain->conv = iconv_open (outcharset, charset);
20447 +# endif
20448 +# endif
20449 +
20450 + freea (charset);
20451 + }
20452 +#endif /* _LIBC || HAVE_ICONV */
20453 + }
20454 +
20455 + return nullentry;
20456 +}
20457 +
20458 +/* Frees the codeset dependent parts of an opened message catalog. */
20459 +void
20460 +internal_function
20461 +_nl_free_domain_conv (struct loaded_domain *domain)
20462 +{
20463 + if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
20464 + free (domain->conv_tab);
20465 +
20466 +#ifdef _LIBC
20467 + if (domain->conv != (__gconv_t) -1)
20468 + __gconv_close (domain->conv);
20469 +#else
20470 +# if HAVE_ICONV
20471 + if (domain->conv != (iconv_t) -1)
20472 + iconv_close (domain->conv);
20473 +# endif
20474 +#endif
20475 +}
20476 +
20477 +/* Load the message catalogs specified by FILENAME. If it is no valid
20478 + message catalog do nothing. */
20479 +void
20480 +internal_function
20481 +_nl_load_domain (struct loaded_l10nfile *domain_file,
20482 + struct binding *domainbinding)
20483 +{
20484 + int fd;
20485 + size_t size;
20486 +#ifdef _LIBC
20487 + struct stat64 st;
20488 +#else
20489 + struct stat st;
20490 +#endif
20491 + struct mo_file_header *data = (struct mo_file_header *) -1;
20492 + int use_mmap = 0;
20493 + struct loaded_domain *domain;
20494 + int revision;
20495 + const char *nullentry;
20496 +
20497 + domain_file->decided = 1;
20498 + domain_file->data = NULL;
20499 +
20500 + /* Note that it would be useless to store domainbinding in domain_file
20501 + because domainbinding might be == NULL now but != NULL later (after
20502 + a call to bind_textdomain_codeset). */
20503 +
20504 + /* If the record does not represent a valid locale the FILENAME
20505 + might be NULL. This can happen when according to the given
20506 + specification the locale file name is different for XPG and CEN
20507 + syntax. */
20508 + if (domain_file->filename == NULL)
20509 + return;
20510 +
20511 + /* Try to open the addressed file. */
20512 + fd = open (domain_file->filename, O_RDONLY | O_BINARY);
20513 + if (fd == -1)
20514 + return;
20515 +
20516 + /* We must know about the size of the file. */
20517 + if (
20518 +#ifdef _LIBC
20519 + __builtin_expect (fstat64 (fd, &st) != 0, 0)
20520 +#else
20521 + __builtin_expect (fstat (fd, &st) != 0, 0)
20522 +#endif
20523 + || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
20524 + || __builtin_expect (size < sizeof (struct mo_file_header), 0))
20525 + {
20526 + /* Something went wrong. */
20527 + close (fd);
20528 + return;
20529 + }
20530 +
20531 +#ifdef HAVE_MMAP
20532 + /* Now we are ready to load the file. If mmap() is available we try
20533 + this first. If not available or it failed we try to load it. */
20534 + data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
20535 + MAP_PRIVATE, fd, 0);
20536 +
20537 + if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
20538 + {
20539 + /* mmap() call was successful. */
20540 + close (fd);
20541 + use_mmap = 1;
20542 + }
20543 +#endif
20544 +
20545 + /* If the data is not yet available (i.e. mmap'ed) we try to load
20546 + it manually. */
20547 + if (data == (struct mo_file_header *) -1)
20548 + {
20549 + size_t to_read;
20550 + char *read_ptr;
20551 +
20552 + data = (struct mo_file_header *) malloc (size);
20553 + if (data == NULL)
20554 + return;
20555 +
20556 + to_read = size;
20557 + read_ptr = (char *) data;
20558 + do
20559 + {
20560 + long int nb = (long int) read (fd, read_ptr, to_read);
20561 + if (nb <= 0)
20562 + {
20563 +#ifdef EINTR
20564 + if (nb == -1 && errno == EINTR)
20565 + continue;
20566 +#endif
20567 + close (fd);
20568 + return;
20569 + }
20570 + read_ptr += nb;
20571 + to_read -= nb;
20572 + }
20573 + while (to_read > 0);
20574 +
20575 + close (fd);
20576 + }
20577 +
20578 + /* Using the magic number we can test whether it really is a message
20579 + catalog file. */
20580 + if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
20581 + 0))
20582 + {
20583 + /* The magic number is wrong: not a message catalog file. */
20584 +#ifdef HAVE_MMAP
20585 + if (use_mmap)
20586 + munmap ((caddr_t) data, size);
20587 + else
20588 +#endif
20589 + free (data);
20590 + return;
20591 + }
20592 +
20593 + domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
20594 + if (domain == NULL)
20595 + return;
20596 + domain_file->data = domain;
20597 +
20598 + domain->data = (char *) data;
20599 + domain->use_mmap = use_mmap;
20600 + domain->mmap_size = size;
20601 + domain->must_swap = data->magic != _MAGIC;
20602 + domain->malloced = NULL;
20603 +
20604 + /* Fill in the information about the available tables. */
20605 + revision = W (domain->must_swap, data->revision);
20606 + /* We support only the major revisions 0 and 1. */
20607 + switch (revision >> 16)
20608 + {
20609 + case 0:
20610 + case 1:
20611 + domain->nstrings = W (domain->must_swap, data->nstrings);
20612 + domain->orig_tab = (const struct string_desc *)
20613 + ((char *) data + W (domain->must_swap, data->orig_tab_offset));
20614 + domain->trans_tab = (const struct string_desc *)
20615 + ((char *) data + W (domain->must_swap, data->trans_tab_offset));
20616 + domain->hash_size = W (domain->must_swap, data->hash_tab_size);
20617 + domain->hash_tab =
20618 + (domain->hash_size > 2
20619 + ? (const nls_uint32 *)
20620 + ((char *) data + W (domain->must_swap, data->hash_tab_offset))
20621 + : NULL);
20622 + domain->must_swap_hash_tab = domain->must_swap;
20623 +
20624 + /* Now dispatch on the minor revision. */
20625 + switch (revision & 0xffff)
20626 + {
20627 + case 0:
20628 + domain->n_sysdep_strings = 0;
20629 + domain->orig_sysdep_tab = NULL;
20630 + domain->trans_sysdep_tab = NULL;
20631 + break;
20632 + case 1:
20633 + default:
20634 + {
20635 + nls_uint32 n_sysdep_strings;
20636 +
20637 + if (domain->hash_tab == NULL)
20638 + /* This is invalid. These minor revisions need a hash table. */
20639 + goto invalid;
20640 +
20641 + n_sysdep_strings =
20642 + W (domain->must_swap, data->n_sysdep_strings);
20643 + if (n_sysdep_strings > 0)
20644 + {
20645 + nls_uint32 n_sysdep_segments;
20646 + const struct sysdep_segment *sysdep_segments;
20647 + const char **sysdep_segment_values;
20648 + const nls_uint32 *orig_sysdep_tab;
20649 + const nls_uint32 *trans_sysdep_tab;
20650 + nls_uint32 n_inmem_sysdep_strings;
20651 + size_t memneed;
20652 + char *mem;
20653 + struct sysdep_string_desc *inmem_orig_sysdep_tab;
20654 + struct sysdep_string_desc *inmem_trans_sysdep_tab;
20655 + nls_uint32 *inmem_hash_tab;
20656 + unsigned int i, j;
20657 +
20658 + /* Get the values of the system dependent segments. */
20659 + n_sysdep_segments =
20660 + W (domain->must_swap, data->n_sysdep_segments);
20661 + sysdep_segments = (const struct sysdep_segment *)
20662 + ((char *) data
20663 + + W (domain->must_swap, data->sysdep_segments_offset));
20664 + sysdep_segment_values =
20665 + alloca (n_sysdep_segments * sizeof (const char *));
20666 + for (i = 0; i < n_sysdep_segments; i++)
20667 + {
20668 + const char *name =
20669 + (char *) data
20670 + + W (domain->must_swap, sysdep_segments[i].offset);
20671 + nls_uint32 namelen =
20672 + W (domain->must_swap, sysdep_segments[i].length);
20673 +
20674 + if (!(namelen > 0 && name[namelen - 1] == '\0'))
20675 + {
20676 + freea (sysdep_segment_values);
20677 + goto invalid;
20678 + }
20679 +
20680 + sysdep_segment_values[i] = get_sysdep_segment_value (name);
20681 + }
20682 +
20683 + orig_sysdep_tab = (const nls_uint32 *)
20684 + ((char *) data
20685 + + W (domain->must_swap, data->orig_sysdep_tab_offset));
20686 + trans_sysdep_tab = (const nls_uint32 *)
20687 + ((char *) data
20688 + + W (domain->must_swap, data->trans_sysdep_tab_offset));
20689 +
20690 + /* Compute the amount of additional memory needed for the
20691 + system dependent strings and the augmented hash table.
20692 + At the same time, also drop string pairs which refer to
20693 + an undefined system dependent segment. */
20694 + n_inmem_sysdep_strings = 0;
20695 + memneed = domain->hash_size * sizeof (nls_uint32);
20696 + for (i = 0; i < n_sysdep_strings; i++)
20697 + {
20698 + int valid = 1;
20699 + size_t needs[2];
20700 +
20701 + for (j = 0; j < 2; j++)
20702 + {
20703 + const struct sysdep_string *sysdep_string =
20704 + (const struct sysdep_string *)
20705 + ((char *) data
20706 + + W (domain->must_swap,
20707 + j == 0
20708 + ? orig_sysdep_tab[i]
20709 + : trans_sysdep_tab[i]));
20710 + size_t need = 0;
20711 + const struct segment_pair *p = sysdep_string->segments;
20712 +
20713 + if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
20714 + for (p = sysdep_string->segments;; p++)
20715 + {
20716 + nls_uint32 sysdepref;
20717 +
20718 + need += W (domain->must_swap, p->segsize);
20719 +
20720 + sysdepref = W (domain->must_swap, p->sysdepref);
20721 + if (sysdepref == SEGMENTS_END)
20722 + break;
20723 +
20724 + if (sysdepref >= n_sysdep_segments)
20725 + {
20726 + /* Invalid. */
20727 + freea (sysdep_segment_values);
20728 + goto invalid;
20729 + }
20730 +
20731 + if (sysdep_segment_values[sysdepref] == NULL)
20732 + {
20733 + /* This particular string pair is invalid. */
20734 + valid = 0;
20735 + break;
20736 + }
20737 +
20738 + need += strlen (sysdep_segment_values[sysdepref]);
20739 + }
20740 +
20741 + needs[j] = need;
20742 + if (!valid)
20743 + break;
20744 + }
20745 +
20746 + if (valid)
20747 + {
20748 + n_inmem_sysdep_strings++;
20749 + memneed += needs[0] + needs[1];
20750 + }
20751 + }
20752 + memneed += 2 * n_inmem_sysdep_strings
20753 + * sizeof (struct sysdep_string_desc);
20754 +
20755 + if (n_inmem_sysdep_strings > 0)
20756 + {
20757 + unsigned int k;
20758 +
20759 + /* Allocate additional memory. */
20760 + mem = (char *) malloc (memneed);
20761 + if (mem == NULL)
20762 + goto invalid;
20763 +
20764 + domain->malloced = mem;
20765 + inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
20766 + mem += n_inmem_sysdep_strings
20767 + * sizeof (struct sysdep_string_desc);
20768 + inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
20769 + mem += n_inmem_sysdep_strings
20770 + * sizeof (struct sysdep_string_desc);
20771 + inmem_hash_tab = (nls_uint32 *) mem;
20772 + mem += domain->hash_size * sizeof (nls_uint32);
20773 +
20774 + /* Compute the system dependent strings. */
20775 + k = 0;
20776 + for (i = 0; i < n_sysdep_strings; i++)
20777 + {
20778 + int valid = 1;
20779 +
20780 + for (j = 0; j < 2; j++)
20781 + {
20782 + const struct sysdep_string *sysdep_string =
20783 + (const struct sysdep_string *)
20784 + ((char *) data
20785 + + W (domain->must_swap,
20786 + j == 0
20787 + ? orig_sysdep_tab[i]
20788 + : trans_sysdep_tab[i]));
20789 + const struct segment_pair *p =
20790 + sysdep_string->segments;
20791 +
20792 + if (W (domain->must_swap, p->sysdepref)
20793 + != SEGMENTS_END)
20794 + for (p = sysdep_string->segments;; p++)
20795 + {
20796 + nls_uint32 sysdepref;
20797 +
20798 + sysdepref =
20799 + W (domain->must_swap, p->sysdepref);
20800 + if (sysdepref == SEGMENTS_END)
20801 + break;
20802 +
20803 + if (sysdep_segment_values[sysdepref] == NULL)
20804 + {
20805 + /* This particular string pair is
20806 + invalid. */
20807 + valid = 0;
20808 + break;
20809 + }
20810 + }
20811 +
20812 + if (!valid)
20813 + break;
20814 + }
20815 +
20816 + if (valid)
20817 + {
20818 + for (j = 0; j < 2; j++)
20819 + {
20820 + const struct sysdep_string *sysdep_string =
20821 + (const struct sysdep_string *)
20822 + ((char *) data
20823 + + W (domain->must_swap,
20824 + j == 0
20825 + ? orig_sysdep_tab[i]
20826 + : trans_sysdep_tab[i]));
20827 + const char *static_segments =
20828 + (char *) data
20829 + + W (domain->must_swap, sysdep_string->offset);
20830 + const struct segment_pair *p =
20831 + sysdep_string->segments;
20832 +
20833 + /* Concatenate the segments, and fill
20834 + inmem_orig_sysdep_tab[k] (for j == 0) and
20835 + inmem_trans_sysdep_tab[k] (for j == 1). */
20836 +
20837 + struct sysdep_string_desc *inmem_tab_entry =
20838 + (j == 0
20839 + ? inmem_orig_sysdep_tab
20840 + : inmem_trans_sysdep_tab)
20841 + + k;
20842 +
20843 + if (W (domain->must_swap, p->sysdepref)
20844 + == SEGMENTS_END)
20845 + {
20846 + /* Only one static segment. */
20847 + inmem_tab_entry->length =
20848 + W (domain->must_swap, p->segsize);
20849 + inmem_tab_entry->pointer = static_segments;
20850 + }
20851 + else
20852 + {
20853 + inmem_tab_entry->pointer = mem;
20854 +
20855 + for (p = sysdep_string->segments;; p++)
20856 + {
20857 + nls_uint32 segsize =
20858 + W (domain->must_swap, p->segsize);
20859 + nls_uint32 sysdepref =
20860 + W (domain->must_swap, p->sysdepref);
20861 + size_t n;
20862 +
20863 + if (segsize > 0)
20864 + {
20865 + memcpy (mem, static_segments, segsize);
20866 + mem += segsize;
20867 + static_segments += segsize;
20868 + }
20869 +
20870 + if (sysdepref == SEGMENTS_END)
20871 + break;
20872 +
20873 + n = strlen (sysdep_segment_values[sysdepref]);
20874 + memcpy (mem, sysdep_segment_values[sysdepref], n);
20875 + mem += n;
20876 + }
20877 +
20878 + inmem_tab_entry->length =
20879 + mem - inmem_tab_entry->pointer;
20880 + }
20881 + }
20882 +
20883 + k++;
20884 + }
20885 + }
20886 + if (k != n_inmem_sysdep_strings)
20887 + abort ();
20888 +
20889 + /* Compute the augmented hash table. */
20890 + for (i = 0; i < domain->hash_size; i++)
20891 + inmem_hash_tab[i] =
20892 + W (domain->must_swap_hash_tab, domain->hash_tab[i]);
20893 + for (i = 0; i < n_inmem_sysdep_strings; i++)
20894 + {
20895 + const char *msgid = inmem_orig_sysdep_tab[i].pointer;
20896 + nls_uint32 hash_val = hash_string (msgid);
20897 + nls_uint32 idx = hash_val % domain->hash_size;
20898 + nls_uint32 incr =
20899 + 1 + (hash_val % (domain->hash_size - 2));
20900 +
20901 + for (;;)
20902 + {
20903 + if (inmem_hash_tab[idx] == 0)
20904 + {
20905 + /* Hash table entry is empty. Use it. */
20906 + inmem_hash_tab[idx] = 1 + domain->nstrings + i;
20907 + break;
20908 + }
20909 +
20910 + if (idx >= domain->hash_size - incr)
20911 + idx -= domain->hash_size - incr;
20912 + else
20913 + idx += incr;
20914 + }
20915 + }
20916 +
20917 + domain->n_sysdep_strings = n_inmem_sysdep_strings;
20918 + domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
20919 + domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
20920 +
20921 + domain->hash_tab = inmem_hash_tab;
20922 + domain->must_swap_hash_tab = 0;
20923 + }
20924 + else
20925 + {
20926 + domain->n_sysdep_strings = 0;
20927 + domain->orig_sysdep_tab = NULL;
20928 + domain->trans_sysdep_tab = NULL;
20929 + }
20930 +
20931 + freea (sysdep_segment_values);
20932 + }
20933 + else
20934 + {
20935 + domain->n_sysdep_strings = 0;
20936 + domain->orig_sysdep_tab = NULL;
20937 + domain->trans_sysdep_tab = NULL;
20938 + }
20939 + }
20940 + break;
20941 + }
20942 + break;
20943 + default:
20944 + /* This is an invalid revision. */
20945 + invalid:
20946 + /* This is an invalid .mo file. */
20947 + if (domain->malloced)
20948 + free (domain->malloced);
20949 +#ifdef HAVE_MMAP
20950 + if (use_mmap)
20951 + munmap ((caddr_t) data, size);
20952 + else
20953 +#endif
20954 + free (data);
20955 + free (domain);
20956 + domain_file->data = NULL;
20957 + return;
20958 + }
20959 +
20960 + /* Now initialize the character set converter from the character set
20961 + the file is encoded with (found in the header entry) to the domain's
20962 + specified character set or the locale's character set. */
20963 + nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
20964 +
20965 + /* Also look for a plural specification. */
20966 + EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
20967 +}
20968 +
20969 +
20970 +#ifdef _LIBC
20971 +void
20972 +internal_function
20973 +_nl_unload_domain (struct loaded_domain *domain)
20974 +{
20975 + if (domain->plural != &__gettext_germanic_plural)
20976 + __gettext_free_exp (domain->plural);
20977 +
20978 + _nl_free_domain_conv (domain);
20979 +
20980 + if (domain->malloced)
20981 + free (domain->malloced);
20982 +
20983 +# ifdef _POSIX_MAPPED_FILES
20984 + if (domain->use_mmap)
20985 + munmap ((caddr_t) domain->data, domain->mmap_size);
20986 + else
20987 +# endif /* _POSIX_MAPPED_FILES */
20988 + free ((void *) domain->data);
20989 +
20990 + free (domain);
20991 +}
20992 +#endif
20993 --- /dev/null
20994 +++ lxpanel-0.5.6/intl/printf-parse.c
20995 @@ -0,0 +1,537 @@
20996 +/* Formatted output to strings.
20997 + Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
20998 +
20999 + This program is free software; you can redistribute it and/or modify it
21000 + under the terms of the GNU Library General Public License as published
21001 + by the Free Software Foundation; either version 2, or (at your option)
21002 + any later version.
21003 +
21004 + This program is distributed in the hope that it will be useful,
21005 + but WITHOUT ANY WARRANTY; without even the implied warranty of
21006 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
21007 + Library General Public License for more details.
21008 +
21009 + You should have received a copy of the GNU Library General Public
21010 + License along with this program; if not, write to the Free Software
21011 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
21012 + USA. */
21013 +
21014 +#ifdef HAVE_CONFIG_H
21015 +# include <config.h>
21016 +#endif
21017 +
21018 +/* Specification. */
21019 +#if WIDE_CHAR_VERSION
21020 +# include "wprintf-parse.h"
21021 +#else
21022 +# include "printf-parse.h"
21023 +#endif
21024 +
21025 +/* Get size_t, NULL. */
21026 +#include <stddef.h>
21027 +
21028 +/* Get intmax_t. */
21029 +#if HAVE_STDINT_H_WITH_UINTMAX
21030 +# include <stdint.h>
21031 +#endif
21032 +#if HAVE_INTTYPES_H_WITH_UINTMAX
21033 +# include <inttypes.h>
21034 +#endif
21035 +
21036 +/* malloc(), realloc(), free(). */
21037 +#include <stdlib.h>
21038 +
21039 +/* Checked size_t computations. */
21040 +#include "xsize.h"
21041 +
21042 +#if WIDE_CHAR_VERSION
21043 +# define PRINTF_PARSE wprintf_parse
21044 +# define CHAR_T wchar_t
21045 +# define DIRECTIVE wchar_t_directive
21046 +# define DIRECTIVES wchar_t_directives
21047 +#else
21048 +# define PRINTF_PARSE printf_parse
21049 +# define CHAR_T char
21050 +# define DIRECTIVE char_directive
21051 +# define DIRECTIVES char_directives
21052 +#endif
21053 +
21054 +#ifdef STATIC
21055 +STATIC
21056 +#endif
21057 +int
21058 +PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
21059 +{
21060 + const CHAR_T *cp = format; /* pointer into format */
21061 + size_t arg_posn = 0; /* number of regular arguments consumed */
21062 + size_t d_allocated; /* allocated elements of d->dir */
21063 + size_t a_allocated; /* allocated elements of a->arg */
21064 + size_t max_width_length = 0;
21065 + size_t max_precision_length = 0;
21066 +
21067 + d->count = 0;
21068 + d_allocated = 1;
21069 + d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
21070 + if (d->dir == NULL)
21071 + /* Out of memory. */
21072 + return -1;
21073 +
21074 + a->count = 0;
21075 + a_allocated = 0;
21076 + a->arg = NULL;
21077 +
21078 +#define REGISTER_ARG(_index_,_type_) \
21079 + { \
21080 + size_t n = (_index_); \
21081 + if (n >= a_allocated) \
21082 + { \
21083 + size_t memory_size; \
21084 + argument *memory; \
21085 + \
21086 + a_allocated = xtimes (a_allocated, 2); \
21087 + if (a_allocated <= n) \
21088 + a_allocated = xsum (n, 1); \
21089 + memory_size = xtimes (a_allocated, sizeof (argument)); \
21090 + if (size_overflow_p (memory_size)) \
21091 + /* Overflow, would lead to out of memory. */ \
21092 + goto error; \
21093 + memory = (a->arg \
21094 + ? realloc (a->arg, memory_size) \
21095 + : malloc (memory_size)); \
21096 + if (memory == NULL) \
21097 + /* Out of memory. */ \
21098 + goto error; \
21099 + a->arg = memory; \
21100 + } \
21101 + while (a->count <= n) \
21102 + a->arg[a->count++].type = TYPE_NONE; \
21103 + if (a->arg[n].type == TYPE_NONE) \
21104 + a->arg[n].type = (_type_); \
21105 + else if (a->arg[n].type != (_type_)) \
21106 + /* Ambiguous type for positional argument. */ \
21107 + goto error; \
21108 + }
21109 +
21110 + while (*cp != '\0')
21111 + {
21112 + CHAR_T c = *cp++;
21113 + if (c == '%')
21114 + {
21115 + size_t arg_index = ARG_NONE;
21116 + DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
21117 +
21118 + /* Initialize the next directive. */
21119 + dp->dir_start = cp - 1;
21120 + dp->flags = 0;
21121 + dp->width_start = NULL;
21122 + dp->width_end = NULL;
21123 + dp->width_arg_index = ARG_NONE;
21124 + dp->precision_start = NULL;
21125 + dp->precision_end = NULL;
21126 + dp->precision_arg_index = ARG_NONE;
21127 + dp->arg_index = ARG_NONE;
21128 +
21129 + /* Test for positional argument. */
21130 + if (*cp >= '0' && *cp <= '9')
21131 + {
21132 + const CHAR_T *np;
21133 +
21134 + for (np = cp; *np >= '0' && *np <= '9'; np++)
21135 + ;
21136 + if (*np == '$')
21137 + {
21138 + size_t n = 0;
21139 +
21140 + for (np = cp; *np >= '0' && *np <= '9'; np++)
21141 + n = xsum (xtimes (n, 10), *np - '0');
21142 + if (n == 0)
21143 + /* Positional argument 0. */
21144 + goto error;
21145 + if (size_overflow_p (n))
21146 + /* n too large, would lead to out of memory later. */
21147 + goto error;
21148 + arg_index = n - 1;
21149 + cp = np + 1;
21150 + }
21151 + }
21152 +
21153 + /* Read the flags. */
21154 + for (;;)
21155 + {
21156 + if (*cp == '\'')
21157 + {
21158 + dp->flags |= FLAG_GROUP;
21159 + cp++;
21160 + }
21161 + else if (*cp == '-')
21162 + {
21163 + dp->flags |= FLAG_LEFT;
21164 + cp++;
21165 + }
21166 + else if (*cp == '+')
21167 + {
21168 + dp->flags |= FLAG_SHOWSIGN;
21169 + cp++;
21170 + }
21171 + else if (*cp == ' ')
21172 + {
21173 + dp->flags |= FLAG_SPACE;
21174 + cp++;
21175 + }
21176 + else if (*cp == '#')
21177 + {
21178 + dp->flags |= FLAG_ALT;
21179 + cp++;
21180 + }
21181 + else if (*cp == '0')
21182 + {
21183 + dp->flags |= FLAG_ZERO;
21184 + cp++;
21185 + }
21186 + else
21187 + break;
21188 + }
21189 +
21190 + /* Parse the field width. */
21191 + if (*cp == '*')
21192 + {
21193 + dp->width_start = cp;
21194 + cp++;
21195 + dp->width_end = cp;
21196 + if (max_width_length < 1)
21197 + max_width_length = 1;
21198 +
21199 + /* Test for positional argument. */
21200 + if (*cp >= '0' && *cp <= '9')
21201 + {
21202 + const CHAR_T *np;
21203 +
21204 + for (np = cp; *np >= '0' && *np <= '9'; np++)
21205 + ;
21206 + if (*np == '$')
21207 + {
21208 + size_t n = 0;
21209 +
21210 + for (np = cp; *np >= '0' && *np <= '9'; np++)
21211 + n = xsum (xtimes (n, 10), *np - '0');
21212 + if (n == 0)
21213 + /* Positional argument 0. */
21214 + goto error;
21215 + if (size_overflow_p (n))
21216 + /* n too large, would lead to out of memory later. */
21217 + goto error;
21218 + dp->width_arg_index = n - 1;
21219 + cp = np + 1;
21220 + }
21221 + }
21222 + if (dp->width_arg_index == ARG_NONE)
21223 + {
21224 + dp->width_arg_index = arg_posn++;
21225 + if (dp->width_arg_index == ARG_NONE)
21226 + /* arg_posn wrapped around. */
21227 + goto error;
21228 + }
21229 + REGISTER_ARG (dp->width_arg_index, TYPE_INT);
21230 + }
21231 + else if (*cp >= '0' && *cp <= '9')
21232 + {
21233 + size_t width_length;
21234 +
21235 + dp->width_start = cp;
21236 + for (; *cp >= '0' && *cp <= '9'; cp++)
21237 + ;
21238 + dp->width_end = cp;
21239 + width_length = dp->width_end - dp->width_start;
21240 + if (max_width_length < width_length)
21241 + max_width_length = width_length;
21242 + }
21243 +
21244 + /* Parse the precision. */
21245 + if (*cp == '.')
21246 + {
21247 + cp++;
21248 + if (*cp == '*')
21249 + {
21250 + dp->precision_start = cp - 1;
21251 + cp++;
21252 + dp->precision_end = cp;
21253 + if (max_precision_length < 2)
21254 + max_precision_length = 2;
21255 +
21256 + /* Test for positional argument. */
21257 + if (*cp >= '0' && *cp <= '9')
21258 + {
21259 + const CHAR_T *np;
21260 +
21261 + for (np = cp; *np >= '0' && *np <= '9'; np++)
21262 + ;
21263 + if (*np == '$')
21264 + {
21265 + size_t n = 0;
21266 +
21267 + for (np = cp; *np >= '0' && *np <= '9'; np++)
21268 + n = xsum (xtimes (n, 10), *np - '0');
21269 + if (n == 0)
21270 + /* Positional argument 0. */
21271 + goto error;
21272 + if (size_overflow_p (n))
21273 + /* n too large, would lead to out of memory
21274 + later. */
21275 + goto error;
21276 + dp->precision_arg_index = n - 1;
21277 + cp = np + 1;
21278 + }
21279 + }
21280 + if (dp->precision_arg_index == ARG_NONE)
21281 + {
21282 + dp->precision_arg_index = arg_posn++;
21283 + if (dp->precision_arg_index == ARG_NONE)
21284 + /* arg_posn wrapped around. */
21285 + goto error;
21286 + }
21287 + REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
21288 + }
21289 + else
21290 + {
21291 + size_t precision_length;
21292 +
21293 + dp->precision_start = cp - 1;
21294 + for (; *cp >= '0' && *cp <= '9'; cp++)
21295 + ;
21296 + dp->precision_end = cp;
21297 + precision_length = dp->precision_end - dp->precision_start;
21298 + if (max_precision_length < precision_length)
21299 + max_precision_length = precision_length;
21300 + }
21301 + }
21302 +
21303 + {
21304 + arg_type type;
21305 +
21306 + /* Parse argument type/size specifiers. */
21307 + {
21308 + int flags = 0;
21309 +
21310 + for (;;)
21311 + {
21312 + if (*cp == 'h')
21313 + {
21314 + flags |= (1 << (flags & 1));
21315 + cp++;
21316 + }
21317 + else if (*cp == 'L')
21318 + {
21319 + flags |= 4;
21320 + cp++;
21321 + }
21322 + else if (*cp == 'l')
21323 + {
21324 + flags += 8;
21325 + cp++;
21326 + }
21327 +#ifdef HAVE_INTMAX_T
21328 + else if (*cp == 'j')
21329 + {
21330 + if (sizeof (intmax_t) > sizeof (long))
21331 + {
21332 + /* intmax_t = long long */
21333 + flags += 16;
21334 + }
21335 + else if (sizeof (intmax_t) > sizeof (int))
21336 + {
21337 + /* intmax_t = long */
21338 + flags += 8;
21339 + }
21340 + cp++;
21341 + }
21342 +#endif
21343 + else if (*cp == 'z' || *cp == 'Z')
21344 + {
21345 + /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
21346 + because the warning facility in gcc-2.95.2 understands
21347 + only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */
21348 + if (sizeof (size_t) > sizeof (long))
21349 + {
21350 + /* size_t = long long */
21351 + flags += 16;
21352 + }
21353 + else if (sizeof (size_t) > sizeof (int))
21354 + {
21355 + /* size_t = long */
21356 + flags += 8;
21357 + }
21358 + cp++;
21359 + }
21360 + else if (*cp == 't')
21361 + {
21362 + if (sizeof (ptrdiff_t) > sizeof (long))
21363 + {
21364 + /* ptrdiff_t = long long */
21365 + flags += 16;
21366 + }
21367 + else if (sizeof (ptrdiff_t) > sizeof (int))
21368 + {
21369 + /* ptrdiff_t = long */
21370 + flags += 8;
21371 + }
21372 + cp++;
21373 + }
21374 + else
21375 + break;
21376 + }
21377 +
21378 + /* Read the conversion character. */
21379 + c = *cp++;
21380 + switch (c)
21381 + {
21382 + case 'd': case 'i':
21383 +#ifdef HAVE_LONG_LONG
21384 + if (flags >= 16 || (flags & 4))
21385 + type = TYPE_LONGLONGINT;
21386 + else
21387 +#endif
21388 + if (flags >= 8)
21389 + type = TYPE_LONGINT;
21390 + else if (flags & 2)
21391 + type = TYPE_SCHAR;
21392 + else if (flags & 1)
21393 + type = TYPE_SHORT;
21394 + else
21395 + type = TYPE_INT;
21396 + break;
21397 + case 'o': case 'u': case 'x': case 'X':
21398 +#ifdef HAVE_LONG_LONG
21399 + if (flags >= 16 || (flags & 4))
21400 + type = TYPE_ULONGLONGINT;
21401 + else
21402 +#endif
21403 + if (flags >= 8)
21404 + type = TYPE_ULONGINT;
21405 + else if (flags & 2)
21406 + type = TYPE_UCHAR;
21407 + else if (flags & 1)
21408 + type = TYPE_USHORT;
21409 + else
21410 + type = TYPE_UINT;
21411 + break;
21412 + case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
21413 + case 'a': case 'A':
21414 +#ifdef HAVE_LONG_DOUBLE
21415 + if (flags >= 16 || (flags & 4))
21416 + type = TYPE_LONGDOUBLE;
21417 + else
21418 +#endif
21419 + type = TYPE_DOUBLE;
21420 + break;
21421 + case 'c':
21422 + if (flags >= 8)
21423 +#ifdef HAVE_WINT_T
21424 + type = TYPE_WIDE_CHAR;
21425 +#else
21426 + goto error;
21427 +#endif
21428 + else
21429 + type = TYPE_CHAR;
21430 + break;
21431 +#ifdef HAVE_WINT_T
21432 + case 'C':
21433 + type = TYPE_WIDE_CHAR;
21434 + c = 'c';
21435 + break;
21436 +#endif
21437 + case 's':
21438 + if (flags >= 8)
21439 +#ifdef HAVE_WCHAR_T
21440 + type = TYPE_WIDE_STRING;
21441 +#else
21442 + goto error;
21443 +#endif
21444 + else
21445 + type = TYPE_STRING;
21446 + break;
21447 +#ifdef HAVE_WCHAR_T
21448 + case 'S':
21449 + type = TYPE_WIDE_STRING;
21450 + c = 's';
21451 + break;
21452 +#endif
21453 + case 'p':
21454 + type = TYPE_POINTER;
21455 + break;
21456 + case 'n':
21457 +#ifdef HAVE_LONG_LONG
21458 + if (flags >= 16 || (flags & 4))
21459 + type = TYPE_COUNT_LONGLONGINT_POINTER;
21460 + else
21461 +#endif
21462 + if (flags >= 8)
21463 + type = TYPE_COUNT_LONGINT_POINTER;
21464 + else if (flags & 2)
21465 + type = TYPE_COUNT_SCHAR_POINTER;
21466 + else if (flags & 1)
21467 + type = TYPE_COUNT_SHORT_POINTER;
21468 + else
21469 + type = TYPE_COUNT_INT_POINTER;
21470 + break;
21471 + case '%':
21472 + type = TYPE_NONE;
21473 + break;
21474 + default:
21475 + /* Unknown conversion character. */
21476 + goto error;
21477 + }
21478 + }
21479 +
21480 + if (type != TYPE_NONE)
21481 + {
21482 + dp->arg_index = arg_index;
21483 + if (dp->arg_index == ARG_NONE)
21484 + {
21485 + dp->arg_index = arg_posn++;
21486 + if (dp->arg_index == ARG_NONE)
21487 + /* arg_posn wrapped around. */
21488 + goto error;
21489 + }
21490 + REGISTER_ARG (dp->arg_index, type);
21491 + }
21492 + dp->conversion = c;
21493 + dp->dir_end = cp;
21494 + }
21495 +
21496 + d->count++;
21497 + if (d->count >= d_allocated)
21498 + {
21499 + size_t memory_size;
21500 + DIRECTIVE *memory;
21501 +
21502 + d_allocated = xtimes (d_allocated, 2);
21503 + memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
21504 + if (size_overflow_p (memory_size))
21505 + /* Overflow, would lead to out of memory. */
21506 + goto error;
21507 + memory = realloc (d->dir, memory_size);
21508 + if (memory == NULL)
21509 + /* Out of memory. */
21510 + goto error;
21511 + d->dir = memory;
21512 + }
21513 + }
21514 + }
21515 + d->dir[d->count].dir_start = cp;
21516 +
21517 + d->max_width_length = max_width_length;
21518 + d->max_precision_length = max_precision_length;
21519 + return 0;
21520 +
21521 +error:
21522 + if (a->arg)
21523 + free (a->arg);
21524 + if (d->dir)
21525 + free (d->dir);
21526 + return -1;
21527 +}
21528 +
21529 +#undef DIRECTIVES
21530 +#undef DIRECTIVE
21531 +#undef CHAR_T
21532 +#undef PRINTF_PARSE
21533 --- /dev/null
21534 +++ lxpanel-0.5.6/intl/libgnuintl.h.in
21535 @@ -0,0 +1,383 @@
21536 +/* Message catalogs for internationalization.
21537 + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
21538 +
21539 + This program is free software; you can redistribute it and/or modify it
21540 + under the terms of the GNU Library General Public License as published
21541 + by the Free Software Foundation; either version 2, or (at your option)
21542 + any later version.
21543 +
21544 + This program is distributed in the hope that it will be useful,
21545 + but WITHOUT ANY WARRANTY; without even the implied warranty of
21546 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
21547 + Library General Public License for more details.
21548 +
21549 + You should have received a copy of the GNU Library General Public
21550 + License along with this program; if not, write to the Free Software
21551 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
21552 + USA. */
21553 +
21554 +#ifndef _LIBINTL_H
21555 +#define _LIBINTL_H 1
21556 +
21557 +#include <locale.h>
21558 +
21559 +/* The LC_MESSAGES locale category is the category used by the functions
21560 + gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
21561 + On systems that don't define it, use an arbitrary value instead.
21562 + On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
21563 + then includes <libintl.h> (i.e. this file!) and then only defines
21564 + LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
21565 + in this case. */
21566 +#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
21567 +# define LC_MESSAGES 1729
21568 +#endif
21569 +
21570 +/* We define an additional symbol to signal that we use the GNU
21571 + implementation of gettext. */
21572 +#define __USE_GNU_GETTEXT 1
21573 +
21574 +/* Provide information about the supported file formats. Returns the
21575 + maximum minor revision number supported for a given major revision. */
21576 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
21577 + ((major) == 0 ? 1 : -1)
21578 +
21579 +/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
21580 + precedence over _conio_gettext. */
21581 +#ifdef __DJGPP__
21582 +# undef gettext
21583 +#endif
21584 +
21585 +#ifdef __cplusplus
21586 +extern "C" {
21587 +#endif
21588 +
21589 +
21590 +/* We redirect the functions to those prefixed with "libintl_". This is
21591 + necessary, because some systems define gettext/textdomain/... in the C
21592 + library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
21593 + If we used the unprefixed names, there would be cases where the
21594 + definition in the C library would override the one in the libintl.so
21595 + shared library. Recall that on ELF systems, the symbols are looked
21596 + up in the following order:
21597 + 1. in the executable,
21598 + 2. in the shared libraries specified on the link command line, in order,
21599 + 3. in the dependencies of the shared libraries specified on the link
21600 + command line,
21601 + 4. in the dlopen()ed shared libraries, in the order in which they were
21602 + dlopen()ed.
21603 + The definition in the C library would override the one in libintl.so if
21604 + either
21605 + * -lc is given on the link command line and -lintl isn't, or
21606 + * -lc is given on the link command line before -lintl, or
21607 + * libintl.so is a dependency of a dlopen()ed shared library but not
21608 + linked to the executable at link time.
21609 + Since Solaris gettext() behaves differently than GNU gettext(), this
21610 + would be unacceptable.
21611 +
21612 + The redirection happens by default through macros in C, so that &gettext
21613 + is independent of the compilation unit, but through inline functions in
21614 + C++, in order not to interfere with the name mangling of class fields or
21615 + class methods called 'gettext'. */
21616 +
21617 +/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
21618 + If he doesn't, we choose the method. A third possible method is
21619 + _INTL_REDIRECT_ASM, supported only by GCC. */
21620 +#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
21621 +# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
21622 +# define _INTL_REDIRECT_ASM
21623 +# else
21624 +# ifdef __cplusplus
21625 +# define _INTL_REDIRECT_INLINE
21626 +# else
21627 +# define _INTL_REDIRECT_MACROS
21628 +# endif
21629 +# endif
21630 +#endif
21631 +/* Auxiliary macros. */
21632 +#ifdef _INTL_REDIRECT_ASM
21633 +# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
21634 +# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
21635 +# define _INTL_STRINGIFY(prefix) #prefix
21636 +#else
21637 +# define _INTL_ASM(cname)
21638 +#endif
21639 +
21640 +/* Look up MSGID in the current default message catalog for the current
21641 + LC_MESSAGES locale. If not found, returns MSGID itself (the default
21642 + text). */
21643 +#ifdef _INTL_REDIRECT_INLINE
21644 +extern char *libintl_gettext (const char *__msgid);
21645 +static inline char *gettext (const char *__msgid)
21646 +{
21647 + return libintl_gettext (__msgid);
21648 +}
21649 +#else
21650 +#ifdef _INTL_REDIRECT_MACROS
21651 +# define gettext libintl_gettext
21652 +#endif
21653 +extern char *gettext (const char *__msgid)
21654 + _INTL_ASM (libintl_gettext);
21655 +#endif
21656 +
21657 +/* Look up MSGID in the DOMAINNAME message catalog for the current
21658 + LC_MESSAGES locale. */
21659 +#ifdef _INTL_REDIRECT_INLINE
21660 +extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
21661 +static inline char *dgettext (const char *__domainname, const char *__msgid)
21662 +{
21663 + return libintl_dgettext (__domainname, __msgid);
21664 +}
21665 +#else
21666 +#ifdef _INTL_REDIRECT_MACROS
21667 +# define dgettext libintl_dgettext
21668 +#endif
21669 +extern char *dgettext (const char *__domainname, const char *__msgid)
21670 + _INTL_ASM (libintl_dgettext);
21671 +#endif
21672 +
21673 +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
21674 + locale. */
21675 +#ifdef _INTL_REDIRECT_INLINE
21676 +extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
21677 + int __category);
21678 +static inline char *dcgettext (const char *__domainname, const char *__msgid,
21679 + int __category)
21680 +{
21681 + return libintl_dcgettext (__domainname, __msgid, __category);
21682 +}
21683 +#else
21684 +#ifdef _INTL_REDIRECT_MACROS
21685 +# define dcgettext libintl_dcgettext
21686 +#endif
21687 +extern char *dcgettext (const char *__domainname, const char *__msgid,
21688 + int __category)
21689 + _INTL_ASM (libintl_dcgettext);
21690 +#endif
21691 +
21692 +
21693 +/* Similar to `gettext' but select the plural form corresponding to the
21694 + number N. */
21695 +#ifdef _INTL_REDIRECT_INLINE
21696 +extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
21697 + unsigned long int __n);
21698 +static inline char *ngettext (const char *__msgid1, const char *__msgid2,
21699 + unsigned long int __n)
21700 +{
21701 + return libintl_ngettext (__msgid1, __msgid2, __n);
21702 +}
21703 +#else
21704 +#ifdef _INTL_REDIRECT_MACROS
21705 +# define ngettext libintl_ngettext
21706 +#endif
21707 +extern char *ngettext (const char *__msgid1, const char *__msgid2,
21708 + unsigned long int __n)
21709 + _INTL_ASM (libintl_ngettext);
21710 +#endif
21711 +
21712 +/* Similar to `dgettext' but select the plural form corresponding to the
21713 + number N. */
21714 +#ifdef _INTL_REDIRECT_INLINE
21715 +extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
21716 + const char *__msgid2, unsigned long int __n);
21717 +static inline char *dngettext (const char *__domainname, const char *__msgid1,
21718 + const char *__msgid2, unsigned long int __n)
21719 +{
21720 + return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
21721 +}
21722 +#else
21723 +#ifdef _INTL_REDIRECT_MACROS
21724 +# define dngettext libintl_dngettext
21725 +#endif
21726 +extern char *dngettext (const char *__domainname,
21727 + const char *__msgid1, const char *__msgid2,
21728 + unsigned long int __n)
21729 + _INTL_ASM (libintl_dngettext);
21730 +#endif
21731 +
21732 +/* Similar to `dcgettext' but select the plural form corresponding to the
21733 + number N. */
21734 +#ifdef _INTL_REDIRECT_INLINE
21735 +extern char *libintl_dcngettext (const char *__domainname,
21736 + const char *__msgid1, const char *__msgid2,
21737 + unsigned long int __n, int __category);
21738 +static inline char *dcngettext (const char *__domainname,
21739 + const char *__msgid1, const char *__msgid2,
21740 + unsigned long int __n, int __category)
21741 +{
21742 + return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
21743 +}
21744 +#else
21745 +#ifdef _INTL_REDIRECT_MACROS
21746 +# define dcngettext libintl_dcngettext
21747 +#endif
21748 +extern char *dcngettext (const char *__domainname,
21749 + const char *__msgid1, const char *__msgid2,
21750 + unsigned long int __n, int __category)
21751 + _INTL_ASM (libintl_dcngettext);
21752 +#endif
21753 +
21754 +
21755 +/* Set the current default message catalog to DOMAINNAME.
21756 + If DOMAINNAME is null, return the current default.
21757 + If DOMAINNAME is "", reset to the default of "messages". */
21758 +#ifdef _INTL_REDIRECT_INLINE
21759 +extern char *libintl_textdomain (const char *__domainname);
21760 +static inline char *textdomain (const char *__domainname)
21761 +{
21762 + return libintl_textdomain (__domainname);
21763 +}
21764 +#else
21765 +#ifdef _INTL_REDIRECT_MACROS
21766 +# define textdomain libintl_textdomain
21767 +#endif
21768 +extern char *textdomain (const char *__domainname)
21769 + _INTL_ASM (libintl_textdomain);
21770 +#endif
21771 +
21772 +/* Specify that the DOMAINNAME message catalog will be found
21773 + in DIRNAME rather than in the system locale data base. */
21774 +#ifdef _INTL_REDIRECT_INLINE
21775 +extern char *libintl_bindtextdomain (const char *__domainname,
21776 + const char *__dirname);
21777 +static inline char *bindtextdomain (const char *__domainname,
21778 + const char *__dirname)
21779 +{
21780 + return libintl_bindtextdomain (__domainname, __dirname);
21781 +}
21782 +#else
21783 +#ifdef _INTL_REDIRECT_MACROS
21784 +# define bindtextdomain libintl_bindtextdomain
21785 +#endif
21786 +extern char *bindtextdomain (const char *__domainname, const char *__dirname)
21787 + _INTL_ASM (libintl_bindtextdomain);
21788 +#endif
21789 +
21790 +/* Specify the character encoding in which the messages from the
21791 + DOMAINNAME message catalog will be returned. */
21792 +#ifdef _INTL_REDIRECT_INLINE
21793 +extern char *libintl_bind_textdomain_codeset (const char *__domainname,
21794 + const char *__codeset);
21795 +static inline char *bind_textdomain_codeset (const char *__domainname,
21796 + const char *__codeset)
21797 +{
21798 + return libintl_bind_textdomain_codeset (__domainname, __codeset);
21799 +}
21800 +#else
21801 +#ifdef _INTL_REDIRECT_MACROS
21802 +# define bind_textdomain_codeset libintl_bind_textdomain_codeset
21803 +#endif
21804 +extern char *bind_textdomain_codeset (const char *__domainname,
21805 + const char *__codeset)
21806 + _INTL_ASM (libintl_bind_textdomain_codeset);
21807 +#endif
21808 +
21809 +
21810 +/* Support for format strings with positions in *printf(), following the
21811 + POSIX/XSI specification.
21812 + Note: These replacements for the *printf() functions are visible only
21813 + in source files that #include <libintl.h> or #include "gettext.h".
21814 + Packages that use *printf() in source files that don't refer to _()
21815 + or gettext() but for which the format string could be the return value
21816 + of _() or gettext() need to add this #include. Oh well. */
21817 +
21818 +#if !@HAVE_POSIX_PRINTF@
21819 +
21820 +#include <stdio.h>
21821 +#include <stddef.h>
21822 +
21823 +/* Get va_list. */
21824 +#if __STDC__ || defined __cplusplus || defined _MSC_VER
21825 +# include <stdarg.h>
21826 +#else
21827 +# include <varargs.h>
21828 +#endif
21829 +
21830 +#undef fprintf
21831 +#define fprintf libintl_fprintf
21832 +extern int fprintf (FILE *, const char *, ...);
21833 +#undef vfprintf
21834 +#define vfprintf libintl_vfprintf
21835 +extern int vfprintf (FILE *, const char *, va_list);
21836 +
21837 +#undef printf
21838 +#define printf libintl_printf
21839 +extern int printf (const char *, ...);
21840 +#undef vprintf
21841 +#define vprintf libintl_vprintf
21842 +extern int vprintf (const char *, va_list);
21843 +
21844 +#undef sprintf
21845 +#define sprintf libintl_sprintf
21846 +extern int sprintf (char *, const char *, ...);
21847 +#undef vsprintf
21848 +#define vsprintf libintl_vsprintf
21849 +extern int vsprintf (char *, const char *, va_list);
21850 +
21851 +#if @HAVE_SNPRINTF@
21852 +
21853 +#undef snprintf
21854 +#define snprintf libintl_snprintf
21855 +extern int snprintf (char *, size_t, const char *, ...);
21856 +#undef vsnprintf
21857 +#define vsnprintf libintl_vsnprintf
21858 +extern int vsnprintf (char *, size_t, const char *, va_list);
21859 +
21860 +#endif
21861 +
21862 +#if @HAVE_ASPRINTF@
21863 +
21864 +#undef asprintf
21865 +#define asprintf libintl_asprintf
21866 +extern int asprintf (char **, const char *, ...);
21867 +#undef vasprintf
21868 +#define vasprintf libintl_vasprintf
21869 +extern int vasprintf (char **, const char *, va_list);
21870 +
21871 +#endif
21872 +
21873 +#if @HAVE_WPRINTF@
21874 +
21875 +#undef fwprintf
21876 +#define fwprintf libintl_fwprintf
21877 +extern int fwprintf (FILE *, const wchar_t *, ...);
21878 +#undef vfwprintf
21879 +#define vfwprintf libintl_vfwprintf
21880 +extern int vfwprintf (FILE *, const wchar_t *, va_list);
21881 +
21882 +#undef wprintf
21883 +#define wprintf libintl_wprintf
21884 +extern int wprintf (const wchar_t *, ...);
21885 +#undef vwprintf
21886 +#define vwprintf libintl_vwprintf
21887 +extern int vwprintf (const wchar_t *, va_list);
21888 +
21889 +#undef swprintf
21890 +#define swprintf libintl_swprintf
21891 +extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
21892 +#undef vswprintf
21893 +#define vswprintf libintl_vswprintf
21894 +extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
21895 +
21896 +#endif
21897 +
21898 +#endif
21899 +
21900 +
21901 +/* Support for relocatable packages. */
21902 +
21903 +/* Sets the original and the current installation prefix of the package.
21904 + Relocation simply replaces a pathname starting with the original prefix
21905 + by the corresponding pathname with the current prefix instead. Both
21906 + prefixes should be directory names without trailing slash (i.e. use ""
21907 + instead of "/"). */
21908 +#define libintl_set_relocation_prefix libintl_set_relocation_prefix
21909 +extern void
21910 + libintl_set_relocation_prefix (const char *orig_prefix,
21911 + const char *curr_prefix);
21912 +
21913 +
21914 +#ifdef __cplusplus
21915 +}
21916 +#endif
21917 +
21918 +#endif /* libintl.h */
21919 --- /dev/null
21920 +++ lxpanel-0.5.6/intl/vasnprintf.h
21921 @@ -0,0 +1,61 @@
21922 +/* vsprintf with automatic memory allocation.
21923 + Copyright (C) 2002-2003 Free Software Foundation, Inc.
21924 +
21925 + This program is free software; you can redistribute it and/or modify it
21926 + under the terms of the GNU Library General Public License as published
21927 + by the Free Software Foundation; either version 2, or (at your option)
21928 + any later version.
21929 +
21930 + This program is distributed in the hope that it will be useful,
21931 + but WITHOUT ANY WARRANTY; without even the implied warranty of
21932 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
21933 + Library General Public License for more details.
21934 +
21935 + You should have received a copy of the GNU Library General Public
21936 + License along with this program; if not, write to the Free Software
21937 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
21938 + USA. */
21939 +
21940 +#ifndef _VASNPRINTF_H
21941 +#define _VASNPRINTF_H
21942 +
21943 +/* Get va_list. */
21944 +#include <stdarg.h>
21945 +
21946 +/* Get size_t. */
21947 +#include <stddef.h>
21948 +
21949 +#ifndef __attribute__
21950 +/* This feature is available in gcc versions 2.5 and later. */
21951 +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
21952 +# define __attribute__(Spec) /* empty */
21953 +# endif
21954 +/* The __-protected variants of `format' and `printf' attributes
21955 + are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
21956 +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
21957 +# define __format__ format
21958 +# define __printf__ printf
21959 +# endif
21960 +#endif
21961 +
21962 +#ifdef __cplusplus
21963 +extern "C" {
21964 +#endif
21965 +
21966 +/* Write formatted output to a string dynamically allocated with malloc().
21967 + You can pass a preallocated buffer for the result in RESULTBUF and its
21968 + size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
21969 + If successful, return the address of the string (this may be = RESULTBUF
21970 + if no dynamic memory allocation was necessary) and set *LENGTHP to the
21971 + number of resulting bytes, excluding the trailing NUL. Upon error, set
21972 + errno and return NULL. */
21973 +extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
21974 + __attribute__ ((__format__ (__printf__, 3, 4)));
21975 +extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
21976 + __attribute__ ((__format__ (__printf__, 3, 0)));
21977 +
21978 +#ifdef __cplusplus
21979 +}
21980 +#endif
21981 +
21982 +#endif /* _VASNPRINTF_H */
21983 --- /dev/null
21984 +++ lxpanel-0.5.6/intl/hash-string.h
21985 @@ -0,0 +1,48 @@
21986 +/* Description of GNU message catalog format: string hashing function.
21987 + Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
21988 +
21989 + This program is free software; you can redistribute it and/or modify it
21990 + under the terms of the GNU Library General Public License as published
21991 + by the Free Software Foundation; either version 2, or (at your option)
21992 + any later version.
21993 +
21994 + This program is distributed in the hope that it will be useful,
21995 + but WITHOUT ANY WARRANTY; without even the implied warranty of
21996 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
21997 + Library General Public License for more details.
21998 +
21999 + You should have received a copy of the GNU Library General Public
22000 + License along with this program; if not, write to the Free Software
22001 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22002 + USA. */
22003 +
22004 +/* @@ end of prolog @@ */
22005 +
22006 +/* We assume to have `unsigned long int' value with at least 32 bits. */
22007 +#define HASHWORDBITS 32
22008 +
22009 +
22010 +/* Defines the so called `hashpjw' function by P.J. Weinberger
22011 + [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
22012 + 1986, 1987 Bell Telephone Laboratories, Inc.] */
22013 +static inline unsigned long int
22014 +hash_string (const char *str_param)
22015 +{
22016 + unsigned long int hval, g;
22017 + const char *str = str_param;
22018 +
22019 + /* Compute the hash value for the given string. */
22020 + hval = 0;
22021 + while (*str != '\0')
22022 + {
22023 + hval <<= 4;
22024 + hval += (unsigned char) *str++;
22025 + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
22026 + if (g != 0)
22027 + {
22028 + hval ^= g >> (HASHWORDBITS - 8);
22029 + hval ^= g;
22030 + }
22031 + }
22032 + return hval;
22033 +}
22034 --- /dev/null
22035 +++ lxpanel-0.5.6/intl/osdep.c
22036 @@ -0,0 +1,24 @@
22037 +/* OS dependent parts of libintl.
22038 + Copyright (C) 2001-2002 Free Software Foundation, Inc.
22039 +
22040 + This program is free software; you can redistribute it and/or modify it
22041 + under the terms of the GNU Library General Public License as published
22042 + by the Free Software Foundation; either version 2, or (at your option)
22043 + any later version.
22044 +
22045 + This program is distributed in the hope that it will be useful,
22046 + but WITHOUT ANY WARRANTY; without even the implied warranty of
22047 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22048 + Library General Public License for more details.
22049 +
22050 + You should have received a copy of the GNU Library General Public
22051 + License along with this program; if not, write to the Free Software
22052 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22053 + USA. */
22054 +
22055 +#if defined __EMX__
22056 +# include "os2compat.c"
22057 +#else
22058 +/* Avoid AIX compiler warning. */
22059 +typedef int dummy;
22060 +#endif
22061 --- /dev/null
22062 +++ lxpanel-0.5.6/intl/bindtextdom.c
22063 @@ -0,0 +1,363 @@
22064 +/* Implementation of the bindtextdomain(3) function
22065 + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
22066 +
22067 + This program is free software; you can redistribute it and/or modify it
22068 + under the terms of the GNU Library General Public License as published
22069 + by the Free Software Foundation; either version 2, or (at your option)
22070 + any later version.
22071 +
22072 + This program is distributed in the hope that it will be useful,
22073 + but WITHOUT ANY WARRANTY; without even the implied warranty of
22074 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22075 + Library General Public License for more details.
22076 +
22077 + You should have received a copy of the GNU Library General Public
22078 + License along with this program; if not, write to the Free Software
22079 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22080 + USA. */
22081 +
22082 +#ifdef HAVE_CONFIG_H
22083 +# include <config.h>
22084 +#endif
22085 +
22086 +#include <stddef.h>
22087 +#include <stdlib.h>
22088 +#include <string.h>
22089 +
22090 +#ifdef _LIBC
22091 +# include <libintl.h>
22092 +#else
22093 +# include "libgnuintl.h"
22094 +#endif
22095 +#include "gettextP.h"
22096 +
22097 +#ifdef _LIBC
22098 +/* We have to handle multi-threaded applications. */
22099 +# include <bits/libc-lock.h>
22100 +#else
22101 +/* Provide dummy implementation if this is outside glibc. */
22102 +# define __libc_rwlock_define(CLASS, NAME)
22103 +# define __libc_rwlock_wrlock(NAME)
22104 +# define __libc_rwlock_unlock(NAME)
22105 +#endif
22106 +
22107 +/* The internal variables in the standalone libintl.a must have different
22108 + names than the internal variables in GNU libc, otherwise programs
22109 + using libintl.a cannot be linked statically. */
22110 +#if !defined _LIBC
22111 +# define _nl_default_dirname libintl_nl_default_dirname
22112 +# define _nl_domain_bindings libintl_nl_domain_bindings
22113 +#endif
22114 +
22115 +/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
22116 +#ifndef offsetof
22117 +# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
22118 +#endif
22119 +
22120 +/* @@ end of prolog @@ */
22121 +
22122 +/* Contains the default location of the message catalogs. */
22123 +extern const char _nl_default_dirname[];
22124 +#ifdef _LIBC
22125 +extern const char _nl_default_dirname_internal[] attribute_hidden;
22126 +#else
22127 +# define INTUSE(name) name
22128 +#endif
22129 +
22130 +/* List with bindings of specific domains. */
22131 +extern struct binding *_nl_domain_bindings;
22132 +
22133 +/* Lock variable to protect the global data in the gettext implementation. */
22134 +__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
22135 +
22136 +
22137 +/* Names for the libintl functions are a problem. They must not clash
22138 + with existing names and they should follow ANSI C. But this source
22139 + code is also used in GNU C Library where the names have a __
22140 + prefix. So we have to make a difference here. */
22141 +#ifdef _LIBC
22142 +# define BINDTEXTDOMAIN __bindtextdomain
22143 +# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
22144 +# ifndef strdup
22145 +# define strdup(str) __strdup (str)
22146 +# endif
22147 +#else
22148 +# define BINDTEXTDOMAIN libintl_bindtextdomain
22149 +# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
22150 +#endif
22151 +
22152 +/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
22153 + to be used for the DOMAINNAME message catalog.
22154 + If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
22155 + modified, only the current value is returned.
22156 + If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
22157 + modified nor returned. */
22158 +static void
22159 +set_binding_values (const char *domainname,
22160 + const char **dirnamep, const char **codesetp)
22161 +{
22162 + struct binding *binding;
22163 + int modified;
22164 +
22165 + /* Some sanity checks. */
22166 + if (domainname == NULL || domainname[0] == '\0')
22167 + {
22168 + if (dirnamep)
22169 + *dirnamep = NULL;
22170 + if (codesetp)
22171 + *codesetp = NULL;
22172 + return;
22173 + }
22174 +
22175 + __libc_rwlock_wrlock (_nl_state_lock);
22176 +
22177 + modified = 0;
22178 +
22179 + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
22180 + {
22181 + int compare = strcmp (domainname, binding->domainname);
22182 + if (compare == 0)
22183 + /* We found it! */
22184 + break;
22185 + if (compare < 0)
22186 + {
22187 + /* It is not in the list. */
22188 + binding = NULL;
22189 + break;
22190 + }
22191 + }
22192 +
22193 + if (binding != NULL)
22194 + {
22195 + if (dirnamep)
22196 + {
22197 + const char *dirname = *dirnamep;
22198 +
22199 + if (dirname == NULL)
22200 + /* The current binding has be to returned. */
22201 + *dirnamep = binding->dirname;
22202 + else
22203 + {
22204 + /* The domain is already bound. If the new value and the old
22205 + one are equal we simply do nothing. Otherwise replace the
22206 + old binding. */
22207 + char *result = binding->dirname;
22208 + if (strcmp (dirname, result) != 0)
22209 + {
22210 + if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
22211 + result = (char *) INTUSE(_nl_default_dirname);
22212 + else
22213 + {
22214 +#if defined _LIBC || defined HAVE_STRDUP
22215 + result = strdup (dirname);
22216 +#else
22217 + size_t len = strlen (dirname) + 1;
22218 + result = (char *) malloc (len);
22219 + if (__builtin_expect (result != NULL, 1))
22220 + memcpy (result, dirname, len);
22221 +#endif
22222 + }
22223 +
22224 + if (__builtin_expect (result != NULL, 1))
22225 + {
22226 + if (binding->dirname != INTUSE(_nl_default_dirname))
22227 + free (binding->dirname);
22228 +
22229 + binding->dirname = result;
22230 + modified = 1;
22231 + }
22232 + }
22233 + *dirnamep = result;
22234 + }
22235 + }
22236 +
22237 + if (codesetp)
22238 + {
22239 + const char *codeset = *codesetp;
22240 +
22241 + if (codeset == NULL)
22242 + /* The current binding has be to returned. */
22243 + *codesetp = binding->codeset;
22244 + else
22245 + {
22246 + /* The domain is already bound. If the new value and the old
22247 + one are equal we simply do nothing. Otherwise replace the
22248 + old binding. */
22249 + char *result = binding->codeset;
22250 + if (result == NULL || strcmp (codeset, result) != 0)
22251 + {
22252 +#if defined _LIBC || defined HAVE_STRDUP
22253 + result = strdup (codeset);
22254 +#else
22255 + size_t len = strlen (codeset) + 1;
22256 + result = (char *) malloc (len);
22257 + if (__builtin_expect (result != NULL, 1))
22258 + memcpy (result, codeset, len);
22259 +#endif
22260 +
22261 + if (__builtin_expect (result != NULL, 1))
22262 + {
22263 + if (binding->codeset != NULL)
22264 + free (binding->codeset);
22265 +
22266 + binding->codeset = result;
22267 + binding->codeset_cntr++;
22268 + modified = 1;
22269 + }
22270 + }
22271 + *codesetp = result;
22272 + }
22273 + }
22274 + }
22275 + else if ((dirnamep == NULL || *dirnamep == NULL)
22276 + && (codesetp == NULL || *codesetp == NULL))
22277 + {
22278 + /* Simply return the default values. */
22279 + if (dirnamep)
22280 + *dirnamep = INTUSE(_nl_default_dirname);
22281 + if (codesetp)
22282 + *codesetp = NULL;
22283 + }
22284 + else
22285 + {
22286 + /* We have to create a new binding. */
22287 + size_t len = strlen (domainname) + 1;
22288 + struct binding *new_binding =
22289 + (struct binding *) malloc (offsetof (struct binding, domainname) + len);
22290 +
22291 + if (__builtin_expect (new_binding == NULL, 0))
22292 + goto failed;
22293 +
22294 + memcpy (new_binding->domainname, domainname, len);
22295 +
22296 + if (dirnamep)
22297 + {
22298 + const char *dirname = *dirnamep;
22299 +
22300 + if (dirname == NULL)
22301 + /* The default value. */
22302 + dirname = INTUSE(_nl_default_dirname);
22303 + else
22304 + {
22305 + if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
22306 + dirname = INTUSE(_nl_default_dirname);
22307 + else
22308 + {
22309 + char *result;
22310 +#if defined _LIBC || defined HAVE_STRDUP
22311 + result = strdup (dirname);
22312 + if (__builtin_expect (result == NULL, 0))
22313 + goto failed_dirname;
22314 +#else
22315 + size_t len = strlen (dirname) + 1;
22316 + result = (char *) malloc (len);
22317 + if (__builtin_expect (result == NULL, 0))
22318 + goto failed_dirname;
22319 + memcpy (result, dirname, len);
22320 +#endif
22321 + dirname = result;
22322 + }
22323 + }
22324 + *dirnamep = dirname;
22325 + new_binding->dirname = (char *) dirname;
22326 + }
22327 + else
22328 + /* The default value. */
22329 + new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
22330 +
22331 + new_binding->codeset_cntr = 0;
22332 +
22333 + if (codesetp)
22334 + {
22335 + const char *codeset = *codesetp;
22336 +
22337 + if (codeset != NULL)
22338 + {
22339 + char *result;
22340 +
22341 +#if defined _LIBC || defined HAVE_STRDUP
22342 + result = strdup (codeset);
22343 + if (__builtin_expect (result == NULL, 0))
22344 + goto failed_codeset;
22345 +#else
22346 + size_t len = strlen (codeset) + 1;
22347 + result = (char *) malloc (len);
22348 + if (__builtin_expect (result == NULL, 0))
22349 + goto failed_codeset;
22350 + memcpy (result, codeset, len);
22351 +#endif
22352 + codeset = result;
22353 + new_binding->codeset_cntr++;
22354 + }
22355 + *codesetp = codeset;
22356 + new_binding->codeset = (char *) codeset;
22357 + }
22358 + else
22359 + new_binding->codeset = NULL;
22360 +
22361 + /* Now enqueue it. */
22362 + if (_nl_domain_bindings == NULL
22363 + || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
22364 + {
22365 + new_binding->next = _nl_domain_bindings;
22366 + _nl_domain_bindings = new_binding;
22367 + }
22368 + else
22369 + {
22370 + binding = _nl_domain_bindings;
22371 + while (binding->next != NULL
22372 + && strcmp (domainname, binding->next->domainname) > 0)
22373 + binding = binding->next;
22374 +
22375 + new_binding->next = binding->next;
22376 + binding->next = new_binding;
22377 + }
22378 +
22379 + modified = 1;
22380 +
22381 + /* Here we deal with memory allocation failures. */
22382 + if (0)
22383 + {
22384 + failed_codeset:
22385 + if (new_binding->dirname != INTUSE(_nl_default_dirname))
22386 + free (new_binding->dirname);
22387 + failed_dirname:
22388 + free (new_binding);
22389 + failed:
22390 + if (dirnamep)
22391 + *dirnamep = NULL;
22392 + if (codesetp)
22393 + *codesetp = NULL;
22394 + }
22395 + }
22396 +
22397 + /* If we modified any binding, we flush the caches. */
22398 + if (modified)
22399 + ++_nl_msg_cat_cntr;
22400 +
22401 + __libc_rwlock_unlock (_nl_state_lock);
22402 +}
22403 +
22404 +/* Specify that the DOMAINNAME message catalog will be found
22405 + in DIRNAME rather than in the system locale data base. */
22406 +char *
22407 +BINDTEXTDOMAIN (const char *domainname, const char *dirname)
22408 +{
22409 + set_binding_values (domainname, &dirname, NULL);
22410 + return (char *) dirname;
22411 +}
22412 +
22413 +/* Specify the character encoding in which the messages from the
22414 + DOMAINNAME message catalog will be returned. */
22415 +char *
22416 +BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
22417 +{
22418 + set_binding_values (domainname, NULL, &codeset);
22419 + return (char *) codeset;
22420 +}
22421 +
22422 +#ifdef _LIBC
22423 +/* Aliases for function names in GNU C Library. */
22424 +weak_alias (__bindtextdomain, bindtextdomain);
22425 +weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
22426 +#endif
22427 --- /dev/null
22428 +++ lxpanel-0.5.6/intl/xsize.h
22429 @@ -0,0 +1,109 @@
22430 +/* xsize.h -- Checked size_t computations.
22431 +
22432 + Copyright (C) 2003 Free Software Foundation, Inc.
22433 +
22434 + This program is free software; you can redistribute it and/or modify it
22435 + under the terms of the GNU Library General Public License as published
22436 + by the Free Software Foundation; either version 2, or (at your option)
22437 + any later version.
22438 +
22439 + This program is distributed in the hope that it will be useful,
22440 + but WITHOUT ANY WARRANTY; without even the implied warranty of
22441 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22442 + Library General Public License for more details.
22443 +
22444 + You should have received a copy of the GNU Library General Public
22445 + License along with this program; if not, write to the Free Software
22446 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22447 + USA. */
22448 +
22449 +#ifndef _XSIZE_H
22450 +#define _XSIZE_H
22451 +
22452 +/* Get size_t. */
22453 +#include <stddef.h>
22454 +
22455 +/* Get SIZE_MAX. */
22456 +#include <limits.h>
22457 +#if HAVE_STDINT_H
22458 +# include <stdint.h>
22459 +#endif
22460 +
22461 +/* The size of memory objects is often computed through expressions of
22462 + type size_t. Example:
22463 + void* p = malloc (header_size + n * element_size).
22464 + These computations can lead to overflow. When this happens, malloc()
22465 + returns a piece of memory that is way too small, and the program then
22466 + crashes while attempting to fill the memory.
22467 + To avoid this, the functions and macros in this file check for overflow.
22468 + The convention is that SIZE_MAX represents overflow.
22469 + malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
22470 + implementation that uses mmap --, it's recommended to use size_overflow_p()
22471 + or size_in_bounds_p() before invoking malloc().
22472 + The example thus becomes:
22473 + size_t size = xsum (header_size, xtimes (n, element_size));
22474 + void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
22475 +*/
22476 +
22477 +/* Convert an arbitrary value >= 0 to type size_t. */
22478 +#define xcast_size_t(N) \
22479 + ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
22480 +
22481 +/* Sum of two sizes, with overflow check. */
22482 +static inline size_t
22483 +#if __GNUC__ >= 3
22484 +__attribute__ ((__pure__))
22485 +#endif
22486 +xsum (size_t size1, size_t size2)
22487 +{
22488 + size_t sum = size1 + size2;
22489 + return (sum >= size1 ? sum : SIZE_MAX);
22490 +}
22491 +
22492 +/* Sum of three sizes, with overflow check. */
22493 +static inline size_t
22494 +#if __GNUC__ >= 3
22495 +__attribute__ ((__pure__))
22496 +#endif
22497 +xsum3 (size_t size1, size_t size2, size_t size3)
22498 +{
22499 + return xsum (xsum (size1, size2), size3);
22500 +}
22501 +
22502 +/* Sum of four sizes, with overflow check. */
22503 +static inline size_t
22504 +#if __GNUC__ >= 3
22505 +__attribute__ ((__pure__))
22506 +#endif
22507 +xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
22508 +{
22509 + return xsum (xsum (xsum (size1, size2), size3), size4);
22510 +}
22511 +
22512 +/* Maximum of two sizes, with overflow check. */
22513 +static inline size_t
22514 +#if __GNUC__ >= 3
22515 +__attribute__ ((__pure__))
22516 +#endif
22517 +xmax (size_t size1, size_t size2)
22518 +{
22519 + /* No explicit check is needed here, because for any n:
22520 + max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */
22521 + return (size1 >= size2 ? size1 : size2);
22522 +}
22523 +
22524 +/* Multiplication of a count with an element size, with overflow check.
22525 + The count must be >= 0 and the element size must be > 0.
22526 + This is a macro, not an inline function, so that it works correctly even
22527 + when N is of a wider tupe and N > SIZE_MAX. */
22528 +#define xtimes(N, ELSIZE) \
22529 + ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
22530 +
22531 +/* Check for overflow. */
22532 +#define size_overflow_p(SIZE) \
22533 + ((SIZE) == SIZE_MAX)
22534 +/* Check against overflow. */
22535 +#define size_in_bounds_p(SIZE) \
22536 + ((SIZE) != SIZE_MAX)
22537 +
22538 +#endif /* _XSIZE_H */
22539 --- /dev/null
22540 +++ lxpanel-0.5.6/intl/textdomain.c
22541 @@ -0,0 +1,141 @@
22542 +/* Implementation of the textdomain(3) function.
22543 + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
22544 +
22545 + This program is free software; you can redistribute it and/or modify it
22546 + under the terms of the GNU Library General Public License as published
22547 + by the Free Software Foundation; either version 2, or (at your option)
22548 + any later version.
22549 +
22550 + This program is distributed in the hope that it will be useful,
22551 + but WITHOUT ANY WARRANTY; without even the implied warranty of
22552 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22553 + Library General Public License for more details.
22554 +
22555 + You should have received a copy of the GNU Library General Public
22556 + License along with this program; if not, write to the Free Software
22557 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22558 + USA. */
22559 +
22560 +#ifdef HAVE_CONFIG_H
22561 +# include <config.h>
22562 +#endif
22563 +
22564 +#include <stdlib.h>
22565 +#include <string.h>
22566 +
22567 +#ifdef _LIBC
22568 +# include <libintl.h>
22569 +#else
22570 +# include "libgnuintl.h"
22571 +#endif
22572 +#include "gettextP.h"
22573 +
22574 +#ifdef _LIBC
22575 +/* We have to handle multi-threaded applications. */
22576 +# include <bits/libc-lock.h>
22577 +#else
22578 +/* Provide dummy implementation if this is outside glibc. */
22579 +# define __libc_rwlock_define(CLASS, NAME)
22580 +# define __libc_rwlock_wrlock(NAME)
22581 +# define __libc_rwlock_unlock(NAME)
22582 +#endif
22583 +
22584 +/* The internal variables in the standalone libintl.a must have different
22585 + names than the internal variables in GNU libc, otherwise programs
22586 + using libintl.a cannot be linked statically. */
22587 +#if !defined _LIBC
22588 +# define _nl_default_default_domain libintl_nl_default_default_domain
22589 +# define _nl_current_default_domain libintl_nl_current_default_domain
22590 +#endif
22591 +
22592 +/* @@ end of prolog @@ */
22593 +
22594 +/* Name of the default text domain. */
22595 +extern const char _nl_default_default_domain[] attribute_hidden;
22596 +
22597 +/* Default text domain in which entries for gettext(3) are to be found. */
22598 +extern const char *_nl_current_default_domain attribute_hidden;
22599 +
22600 +
22601 +/* Names for the libintl functions are a problem. They must not clash
22602 + with existing names and they should follow ANSI C. But this source
22603 + code is also used in GNU C Library where the names have a __
22604 + prefix. So we have to make a difference here. */
22605 +#ifdef _LIBC
22606 +# define TEXTDOMAIN __textdomain
22607 +# ifndef strdup
22608 +# define strdup(str) __strdup (str)
22609 +# endif
22610 +#else
22611 +# define TEXTDOMAIN libintl_textdomain
22612 +#endif
22613 +
22614 +/* Lock variable to protect the global data in the gettext implementation. */
22615 +__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
22616 +
22617 +/* Set the current default message catalog to DOMAINNAME.
22618 + If DOMAINNAME is null, return the current default.
22619 + If DOMAINNAME is "", reset to the default of "messages". */
22620 +char *
22621 +TEXTDOMAIN (const char *domainname)
22622 +{
22623 + char *new_domain;
22624 + char *old_domain;
22625 +
22626 + /* A NULL pointer requests the current setting. */
22627 + if (domainname == NULL)
22628 + return (char *) _nl_current_default_domain;
22629 +
22630 + __libc_rwlock_wrlock (_nl_state_lock);
22631 +
22632 + old_domain = (char *) _nl_current_default_domain;
22633 +
22634 + /* If domain name is the null string set to default domain "messages". */
22635 + if (domainname[0] == '\0'
22636 + || strcmp (domainname, _nl_default_default_domain) == 0)
22637 + {
22638 + _nl_current_default_domain = _nl_default_default_domain;
22639 + new_domain = (char *) _nl_current_default_domain;
22640 + }
22641 + else if (strcmp (domainname, old_domain) == 0)
22642 + /* This can happen and people will use it to signal that some
22643 + environment variable changed. */
22644 + new_domain = old_domain;
22645 + else
22646 + {
22647 + /* If the following malloc fails `_nl_current_default_domain'
22648 + will be NULL. This value will be returned and so signals we
22649 + are out of core. */
22650 +#if defined _LIBC || defined HAVE_STRDUP
22651 + new_domain = strdup (domainname);
22652 +#else
22653 + size_t len = strlen (domainname) + 1;
22654 + new_domain = (char *) malloc (len);
22655 + if (new_domain != NULL)
22656 + memcpy (new_domain, domainname, len);
22657 +#endif
22658 +
22659 + if (new_domain != NULL)
22660 + _nl_current_default_domain = new_domain;
22661 + }
22662 +
22663 + /* We use this possibility to signal a change of the loaded catalogs
22664 + since this is most likely the case and there is no other easy we
22665 + to do it. Do it only when the call was successful. */
22666 + if (new_domain != NULL)
22667 + {
22668 + ++_nl_msg_cat_cntr;
22669 +
22670 + if (old_domain != new_domain && old_domain != _nl_default_default_domain)
22671 + free (old_domain);
22672 + }
22673 +
22674 + __libc_rwlock_unlock (_nl_state_lock);
22675 +
22676 + return new_domain;
22677 +}
22678 +
22679 +#ifdef _LIBC
22680 +/* Alias for function name in GNU C Library. */
22681 +weak_alias (__textdomain, textdomain);
22682 +#endif
22683 --- /dev/null
22684 +++ lxpanel-0.5.6/intl/explodename.c
22685 @@ -0,0 +1,185 @@
22686 +/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
22687 + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
22688 +
22689 + This program is free software; you can redistribute it and/or modify it
22690 + under the terms of the GNU Library General Public License as published
22691 + by the Free Software Foundation; either version 2, or (at your option)
22692 + any later version.
22693 +
22694 + This program is distributed in the hope that it will be useful,
22695 + but WITHOUT ANY WARRANTY; without even the implied warranty of
22696 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22697 + Library General Public License for more details.
22698 +
22699 + You should have received a copy of the GNU Library General Public
22700 + License along with this program; if not, write to the Free Software
22701 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22702 + USA. */
22703 +
22704 +#ifdef HAVE_CONFIG_H
22705 +# include <config.h>
22706 +#endif
22707 +
22708 +#include <stdlib.h>
22709 +#include <string.h>
22710 +#include <sys/types.h>
22711 +
22712 +#include "loadinfo.h"
22713 +
22714 +/* On some strange systems still no definition of NULL is found. Sigh! */
22715 +#ifndef NULL
22716 +# if defined __STDC__ && __STDC__
22717 +# define NULL ((void *) 0)
22718 +# else
22719 +# define NULL 0
22720 +# endif
22721 +#endif
22722 +
22723 +/* @@ end of prolog @@ */
22724 +
22725 +char *
22726 +_nl_find_language (const char *name)
22727 +{
22728 + while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
22729 + && name[0] != '+' && name[0] != ',')
22730 + ++name;
22731 +
22732 + return (char *) name;
22733 +}
22734 +
22735 +
22736 +int
22737 +_nl_explode_name (char *name,
22738 + const char **language, const char **modifier,
22739 + const char **territory, const char **codeset,
22740 + const char **normalized_codeset, const char **special,
22741 + const char **sponsor, const char **revision)
22742 +{
22743 + enum { undecided, xpg, cen } syntax;
22744 + char *cp;
22745 + int mask;
22746 +
22747 + *modifier = NULL;
22748 + *territory = NULL;
22749 + *codeset = NULL;
22750 + *normalized_codeset = NULL;
22751 + *special = NULL;
22752 + *sponsor = NULL;
22753 + *revision = NULL;
22754 +
22755 + /* Now we determine the single parts of the locale name. First
22756 + look for the language. Termination symbols are `_' and `@' if
22757 + we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
22758 + mask = 0;
22759 + syntax = undecided;
22760 + *language = cp = name;
22761 + cp = _nl_find_language (*language);
22762 +
22763 + if (*language == cp)
22764 + /* This does not make sense: language has to be specified. Use
22765 + this entry as it is without exploding. Perhaps it is an alias. */
22766 + cp = strchr (*language, '\0');
22767 + else if (cp[0] == '_')
22768 + {
22769 + /* Next is the territory. */
22770 + cp[0] = '\0';
22771 + *territory = ++cp;
22772 +
22773 + while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
22774 + && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
22775 + ++cp;
22776 +
22777 + mask |= TERRITORY;
22778 +
22779 + if (cp[0] == '.')
22780 + {
22781 + /* Next is the codeset. */
22782 + syntax = xpg;
22783 + cp[0] = '\0';
22784 + *codeset = ++cp;
22785 +
22786 + while (cp[0] != '\0' && cp[0] != '@')
22787 + ++cp;
22788 +
22789 + mask |= XPG_CODESET;
22790 +
22791 + if (*codeset != cp && (*codeset)[0] != '\0')
22792 + {
22793 + *normalized_codeset = _nl_normalize_codeset (*codeset,
22794 + cp - *codeset);
22795 + if (strcmp (*codeset, *normalized_codeset) == 0)
22796 + free ((char *) *normalized_codeset);
22797 + else
22798 + mask |= XPG_NORM_CODESET;
22799 + }
22800 + }
22801 + }
22802 +
22803 + if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
22804 + {
22805 + /* Next is the modifier. */
22806 + syntax = cp[0] == '@' ? xpg : cen;
22807 + cp[0] = '\0';
22808 + *modifier = ++cp;
22809 +
22810 + while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
22811 + && cp[0] != ',' && cp[0] != '_')
22812 + ++cp;
22813 +
22814 + mask |= XPG_MODIFIER | CEN_AUDIENCE;
22815 + }
22816 +
22817 + if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
22818 + {
22819 + syntax = cen;
22820 +
22821 + if (cp[0] == '+')
22822 + {
22823 + /* Next is special application (CEN syntax). */
22824 + cp[0] = '\0';
22825 + *special = ++cp;
22826 +
22827 + while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
22828 + ++cp;
22829 +
22830 + mask |= CEN_SPECIAL;
22831 + }
22832 +
22833 + if (cp[0] == ',')
22834 + {
22835 + /* Next is sponsor (CEN syntax). */
22836 + cp[0] = '\0';
22837 + *sponsor = ++cp;
22838 +
22839 + while (cp[0] != '\0' && cp[0] != '_')
22840 + ++cp;
22841 +
22842 + mask |= CEN_SPONSOR;
22843 + }
22844 +
22845 + if (cp[0] == '_')
22846 + {
22847 + /* Next is revision (CEN syntax). */
22848 + cp[0] = '\0';
22849 + *revision = ++cp;
22850 +
22851 + mask |= CEN_REVISION;
22852 + }
22853 + }
22854 +
22855 + /* For CEN syntax values it might be important to have the
22856 + separator character in the file name, not for XPG syntax. */
22857 + if (syntax == xpg)
22858 + {
22859 + if (*territory != NULL && (*territory)[0] == '\0')
22860 + mask &= ~TERRITORY;
22861 +
22862 + if (*codeset != NULL && (*codeset)[0] == '\0')
22863 + mask &= ~XPG_CODESET;
22864 +
22865 + if (*modifier != NULL && (*modifier)[0] == '\0')
22866 + mask &= ~XPG_MODIFIER;
22867 + }
22868 +
22869 + return mask;
22870 +}
22871 --- /dev/null
22872 +++ lxpanel-0.5.6/intl/gettext.c
22873 @@ -0,0 +1,63 @@
22874 +/* Implementation of gettext(3) function.
22875 + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
22876 +
22877 + This program is free software; you can redistribute it and/or modify it
22878 + under the terms of the GNU Library General Public License as published
22879 + by the Free Software Foundation; either version 2, or (at your option)
22880 + any later version.
22881 +
22882 + This program is distributed in the hope that it will be useful,
22883 + but WITHOUT ANY WARRANTY; without even the implied warranty of
22884 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22885 + Library General Public License for more details.
22886 +
22887 + You should have received a copy of the GNU Library General Public
22888 + License along with this program; if not, write to the Free Software
22889 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22890 + USA. */
22891 +
22892 +#ifdef HAVE_CONFIG_H
22893 +# include <config.h>
22894 +#endif
22895 +
22896 +#ifdef _LIBC
22897 +# define __need_NULL
22898 +# include <stddef.h>
22899 +#else
22900 +# include <stdlib.h> /* Just for NULL. */
22901 +#endif
22902 +
22903 +#include "gettextP.h"
22904 +#ifdef _LIBC
22905 +# include <libintl.h>
22906 +#else
22907 +# include "libgnuintl.h"
22908 +#endif
22909 +
22910 +/* @@ end of prolog @@ */
22911 +
22912 +/* Names for the libintl functions are a problem. They must not clash
22913 + with existing names and they should follow ANSI C. But this source
22914 + code is also used in GNU C Library where the names have a __
22915 + prefix. So we have to make a difference here. */
22916 +#ifdef _LIBC
22917 +# define GETTEXT __gettext
22918 +# define DCGETTEXT INTUSE(__dcgettext)
22919 +#else
22920 +# define GETTEXT libintl_gettext
22921 +# define DCGETTEXT libintl_dcgettext
22922 +#endif
22923 +
22924 +/* Look up MSGID in the current default message catalog for the current
22925 + LC_MESSAGES locale. If not found, returns MSGID itself (the default
22926 + text). */
22927 +char *
22928 +GETTEXT (const char *msgid)
22929 +{
22930 + return DCGETTEXT (NULL, msgid, LC_MESSAGES);
22931 +}
22932 +
22933 +#ifdef _LIBC
22934 +/* Alias for function name in GNU C Library. */
22935 +weak_alias (__gettext, gettext);
22936 +#endif
22937 --- /dev/null
22938 +++ lxpanel-0.5.6/intl/ref-add.sin
22939 @@ -0,0 +1,31 @@
22940 +# Add this package to a list of references stored in a text file.
22941 +#
22942 +# Copyright (C) 2000 Free Software Foundation, Inc.
22943 +#
22944 +# This program is free software; you can redistribute it and/or modify it
22945 +# under the terms of the GNU Library General Public License as published
22946 +# by the Free Software Foundation; either version 2, or (at your option)
22947 +# any later version.
22948 +#
22949 +# This program is distributed in the hope that it will be useful,
22950 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
22951 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22952 +# Library General Public License for more details.
22953 +#
22954 +# You should have received a copy of the GNU Library General Public
22955 +# License along with this program; if not, write to the Free Software
22956 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22957 +# USA.
22958 +#
22959 +# Written by Bruno Haible <haible@clisp.cons.org>.
22960 +#
22961 +/^# Packages using this file: / {
22962 + s/# Packages using this file://
22963 + ta
22964 + :a
22965 + s/ @PACKAGE@ / @PACKAGE@ /
22966 + tb
22967 + s/ $/ @PACKAGE@ /
22968 + :b
22969 + s/^/# Packages using this file:/
22970 +}
22971 --- /dev/null
22972 +++ lxpanel-0.5.6/intl/vasnwprintf.h
22973 @@ -0,0 +1,46 @@
22974 +/* vswprintf with automatic memory allocation.
22975 + Copyright (C) 2002-2003 Free Software Foundation, Inc.
22976 +
22977 + This program is free software; you can redistribute it and/or modify it
22978 + under the terms of the GNU Library General Public License as published
22979 + by the Free Software Foundation; either version 2, or (at your option)
22980 + any later version.
22981 +
22982 + This program is distributed in the hope that it will be useful,
22983 + but WITHOUT ANY WARRANTY; without even the implied warranty of
22984 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22985 + Library General Public License for more details.
22986 +
22987 + You should have received a copy of the GNU Library General Public
22988 + License along with this program; if not, write to the Free Software
22989 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
22990 + USA. */
22991 +
22992 +#ifndef _VASNWPRINTF_H
22993 +#define _VASNWPRINTF_H
22994 +
22995 +/* Get va_list. */
22996 +#include <stdarg.h>
22997 +
22998 +/* Get wchar_t, size_t. */
22999 +#include <stddef.h>
23000 +
23001 +#ifdef __cplusplus
23002 +extern "C" {
23003 +#endif
23004 +
23005 +/* Write formatted output to a string dynamically allocated with malloc().
23006 + You can pass a preallocated buffer for the result in RESULTBUF and its
23007 + size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
23008 + If successful, return the address of the string (this may be = RESULTBUF
23009 + if no dynamic memory allocation was necessary) and set *LENGTHP to the
23010 + number of resulting bytes, excluding the trailing NUL. Upon error, set
23011 + errno and return NULL. */
23012 +extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
23013 +extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
23014 +
23015 +#ifdef __cplusplus
23016 +}
23017 +#endif
23018 +
23019 +#endif /* _VASNWPRINTF_H */
23020 --- /dev/null
23021 +++ lxpanel-0.5.6/intl/gettextP.h
23022 @@ -0,0 +1,215 @@
23023 +/* Header describing internals of libintl library.
23024 + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
23025 + Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
23026 +
23027 + This program is free software; you can redistribute it and/or modify it
23028 + under the terms of the GNU Library General Public License as published
23029 + by the Free Software Foundation; either version 2, or (at your option)
23030 + any later version.
23031 +
23032 + This program is distributed in the hope that it will be useful,
23033 + but WITHOUT ANY WARRANTY; without even the implied warranty of
23034 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23035 + Library General Public License for more details.
23036 +
23037 + You should have received a copy of the GNU Library General Public
23038 + License along with this program; if not, write to the Free Software
23039 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
23040 + USA. */
23041 +
23042 +#ifndef _GETTEXTP_H
23043 +#define _GETTEXTP_H
23044 +
23045 +#include <stddef.h> /* Get size_t. */
23046 +
23047 +#ifdef _LIBC
23048 +# include "../iconv/gconv_int.h"
23049 +#else
23050 +# if HAVE_ICONV
23051 +# include <iconv.h>
23052 +# endif
23053 +#endif
23054 +
23055 +#include "loadinfo.h"
23056 +
23057 +#include "gmo.h" /* Get nls_uint32. */
23058 +
23059 +/* @@ end of prolog @@ */
23060 +
23061 +#ifndef internal_function
23062 +# define internal_function
23063 +#endif
23064 +
23065 +#ifndef attribute_hidden
23066 +# define attribute_hidden
23067 +#endif
23068 +
23069 +/* Tell the compiler when a conditional or integer expression is
23070 + almost always true or almost always false. */
23071 +#ifndef HAVE_BUILTIN_EXPECT
23072 +# define __builtin_expect(expr, val) (expr)
23073 +#endif
23074 +
23075 +#ifndef W
23076 +# define W(flag, data) ((flag) ? SWAP (data) : (data))
23077 +#endif
23078 +
23079 +
23080 +#ifdef _LIBC
23081 +# include <byteswap.h>
23082 +# define SWAP(i) bswap_32 (i)
23083 +#else
23084 +static inline nls_uint32
23085 +SWAP (i)
23086 + nls_uint32 i;
23087 +{
23088 + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
23089 +}
23090 +#endif
23091 +
23092 +
23093 +/* In-memory representation of system dependent string. */
23094 +struct sysdep_string_desc
23095 +{
23096 + /* Length of addressed string, including the trailing NUL. */
23097 + size_t length;
23098 + /* Pointer to addressed string. */
23099 + const char *pointer;
23100 +};
23101 +
23102 +/* The representation of an opened message catalog. */
23103 +struct loaded_domain
23104 +{
23105 + /* Pointer to memory containing the .mo file. */
23106 + const char *data;
23107 + /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
23108 + int use_mmap;
23109 + /* Size of mmap()ed memory. */
23110 + size_t mmap_size;
23111 + /* 1 if the .mo file uses a different endianness than this machine. */
23112 + int must_swap;
23113 + /* Pointer to additional malloc()ed memory. */
23114 + void *malloced;
23115 +
23116 + /* Number of static strings pairs. */
23117 + nls_uint32 nstrings;
23118 + /* Pointer to descriptors of original strings in the file. */
23119 + const struct string_desc *orig_tab;
23120 + /* Pointer to descriptors of translated strings in the file. */
23121 + const struct string_desc *trans_tab;
23122 +
23123 + /* Number of system dependent strings pairs. */
23124 + nls_uint32 n_sysdep_strings;
23125 + /* Pointer to descriptors of original sysdep strings. */
23126 + const struct sysdep_string_desc *orig_sysdep_tab;
23127 + /* Pointer to descriptors of translated sysdep strings. */
23128 + const struct sysdep_string_desc *trans_sysdep_tab;
23129 +
23130 + /* Size of hash table. */
23131 + nls_uint32 hash_size;
23132 + /* Pointer to hash table. */
23133 + const nls_uint32 *hash_tab;
23134 + /* 1 if the hash table uses a different endianness than this machine. */
23135 + int must_swap_hash_tab;
23136 +
23137 + int codeset_cntr;
23138 +#ifdef _LIBC
23139 + __gconv_t conv;
23140 +#else
23141 +# if HAVE_ICONV
23142 + iconv_t conv;
23143 +# endif
23144 +#endif
23145 + char **conv_tab;
23146 +
23147 + struct expression *plural;
23148 + unsigned long int nplurals;
23149 +};
23150 +
23151 +/* We want to allocate a string at the end of the struct. But ISO C
23152 + doesn't allow zero sized arrays. */
23153 +#ifdef __GNUC__
23154 +# define ZERO 0
23155 +#else
23156 +# define ZERO 1
23157 +#endif
23158 +
23159 +/* A set of settings bound to a message domain. Used to store settings
23160 + from bindtextdomain() and bind_textdomain_codeset(). */
23161 +struct binding
23162 +{
23163 + struct binding *next;
23164 + char *dirname;
23165 + int codeset_cntr; /* Incremented each time codeset changes. */
23166 + char *codeset;
23167 + char domainname[ZERO];
23168 +};
23169 +
23170 +/* A counter which is incremented each time some previous translations
23171 + become invalid.
23172 + This variable is part of the external ABI of the GNU libintl. */
23173 +extern int _nl_msg_cat_cntr;
23174 +
23175 +#ifndef _LIBC
23176 +const char *_nl_locale_name (int category, const char *categoryname);
23177 +#endif
23178 +
23179 +struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
23180 + const char *__domainname,
23181 + struct binding *__domainbinding)
23182 + internal_function;
23183 +void _nl_load_domain (struct loaded_l10nfile *__domain,
23184 + struct binding *__domainbinding)
23185 + internal_function;
23186 +void _nl_unload_domain (struct loaded_domain *__domain)
23187 + internal_function;
23188 +const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
23189 + struct loaded_domain *__domain,
23190 + struct binding *__domainbinding)
23191 + internal_function;
23192 +void _nl_free_domain_conv (struct loaded_domain *__domain)
23193 + internal_function;
23194 +
23195 +char *_nl_find_msg (struct loaded_l10nfile *domain_file,
23196 + struct binding *domainbinding, const char *msgid,
23197 + size_t *lengthp)
23198 + internal_function;
23199 +
23200 +#ifdef _LIBC
23201 +extern char *__gettext (const char *__msgid);
23202 +extern char *__dgettext (const char *__domainname, const char *__msgid);
23203 +extern char *__dcgettext (const char *__domainname, const char *__msgid,
23204 + int __category);
23205 +extern char *__ngettext (const char *__msgid1, const char *__msgid2,
23206 + unsigned long int __n);
23207 +extern char *__dngettext (const char *__domainname,
23208 + const char *__msgid1, const char *__msgid2,
23209 + unsigned long int n);
23210 +extern char *__dcngettext (const char *__domainname,
23211 + const char *__msgid1, const char *__msgid2,
23212 + unsigned long int __n, int __category);
23213 +extern char *__dcigettext (const char *__domainname,
23214 + const char *__msgid1, const char *__msgid2,
23215 + int __plural, unsigned long int __n,
23216 + int __category);
23217 +extern char *__textdomain (const char *__domainname);
23218 +extern char *__bindtextdomain (const char *__domainname,
23219 + const char *__dirname);
23220 +extern char *__bind_textdomain_codeset (const char *__domainname,
23221 + const char *__codeset);
23222 +#else
23223 +/* Declare the exported libintl_* functions, in a way that allows us to
23224 + call them under their real name. */
23225 +# undef _INTL_REDIRECT_INLINE
23226 +# undef _INTL_REDIRECT_MACROS
23227 +# define _INTL_REDIRECT_MACROS
23228 +# include "libgnuintl.h"
23229 +extern char *libintl_dcigettext (const char *__domainname,
23230 + const char *__msgid1, const char *__msgid2,
23231 + int __plural, unsigned long int __n,
23232 + int __category);
23233 +#endif
23234 +
23235 +/* @@ begin of epilog @@ */
23236 +
23237 +#endif /* gettextP.h */
23238 --- /dev/null
23239 +++ lxpanel-0.5.6/intl/ref-del.sin
23240 @@ -0,0 +1,26 @@
23241 +# Remove this package from a list of references stored in a text file.
23242 +#
23243 +# Copyright (C) 2000 Free Software Foundation, Inc.
23244 +#
23245 +# This program is free software; you can redistribute it and/or modify it
23246 +# under the terms of the GNU Library General Public License as published
23247 +# by the Free Software Foundation; either version 2, or (at your option)
23248 +# any later version.
23249 +#
23250 +# This program is distributed in the hope that it will be useful,
23251 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
23252 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23253 +# Library General Public License for more details.
23254 +#
23255 +# You should have received a copy of the GNU Library General Public
23256 +# License along with this program; if not, write to the Free Software
23257 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
23258 +# USA.
23259 +#
23260 +# Written by Bruno Haible <haible@clisp.cons.org>.
23261 +#
23262 +/^# Packages using this file: / {
23263 + s/# Packages using this file://
23264 + s/ @PACKAGE@ / /
23265 + s/^/# Packages using this file:/
23266 +}
23267 --- /dev/null
23268 +++ lxpanel-0.5.6/intl/localcharset.h
23269 @@ -0,0 +1,42 @@
23270 +/* Determine a canonical name for the current locale's character encoding.
23271 + Copyright (C) 2000-2003 Free Software Foundation, Inc.
23272 + This file is part of the GNU CHARSET Library.
23273 +
23274 + This program is free software; you can redistribute it and/or modify it
23275 + under the terms of the GNU Library General Public License as published
23276 + by the Free Software Foundation; either version 2, or (at your option)
23277 + any later version.
23278 +
23279 + This program is distributed in the hope that it will be useful,
23280 + but WITHOUT ANY WARRANTY; without even the implied warranty of
23281 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23282 + Library General Public License for more details.
23283 +
23284 + You should have received a copy of the GNU Library General Public
23285 + License along with this program; if not, write to the Free Software
23286 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
23287 + USA. */
23288 +
23289 +#ifndef _LOCALCHARSET_H
23290 +#define _LOCALCHARSET_H
23291 +
23292 +
23293 +#ifdef __cplusplus
23294 +extern "C" {
23295 +#endif
23296 +
23297 +
23298 +/* Determine the current locale's character encoding, and canonicalize it
23299 + into one of the canonical names listed in config.charset.
23300 + The result must not be freed; it is statically allocated.
23301 + If the canonical name cannot be determined, the result is a non-canonical
23302 + name. */
23303 +extern const char * locale_charset (void);
23304 +
23305 +
23306 +#ifdef __cplusplus
23307 +}
23308 +#endif
23309 +
23310 +
23311 +#endif /* _LOCALCHARSET_H */
23312 --- /dev/null
23313 +++ lxpanel-0.5.6/intl/printf-args.h
23314 @@ -0,0 +1,137 @@
23315 +/* Decomposed printf argument list.
23316 + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
23317 +
23318 + This program is free software; you can redistribute it and/or modify it
23319 + under the terms of the GNU Library General Public License as published
23320 + by the Free Software Foundation; either version 2, or (at your option)
23321 + any later version.
23322 +
23323 + This program is distributed in the hope that it will be useful,
23324 + but WITHOUT ANY WARRANTY; without even the implied warranty of
23325 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23326 + Library General Public License for more details.
23327 +
23328 + You should have received a copy of the GNU Library General Public
23329 + License along with this program; if not, write to the Free Software
23330 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
23331 + USA. */
23332 +
23333 +#ifndef _PRINTF_ARGS_H
23334 +#define _PRINTF_ARGS_H
23335 +
23336 +/* Get size_t. */
23337 +#include <stddef.h>
23338 +
23339 +/* Get wchar_t. */
23340 +#ifdef HAVE_WCHAR_T
23341 +# include <stddef.h>
23342 +#endif
23343 +
23344 +/* Get wint_t. */
23345 +#ifdef HAVE_WINT_T
23346 +# include <wchar.h>
23347 +#endif
23348 +
23349 +/* Get va_list. */
23350 +#include <stdarg.h>
23351 +
23352 +
23353 +/* Argument types */
23354 +typedef enum
23355 +{
23356 + TYPE_NONE,
23357 + TYPE_SCHAR,
23358 + TYPE_UCHAR,
23359 + TYPE_SHORT,
23360 + TYPE_USHORT,
23361 + TYPE_INT,
23362 + TYPE_UINT,
23363 + TYPE_LONGINT,
23364 + TYPE_ULONGINT,
23365 +#ifdef HAVE_LONG_LONG
23366 + TYPE_LONGLONGINT,
23367 + TYPE_ULONGLONGINT,
23368 +#endif
23369 + TYPE_DOUBLE,
23370 +#ifdef HAVE_LONG_DOUBLE
23371 + TYPE_LONGDOUBLE,
23372 +#endif
23373 + TYPE_CHAR,
23374 +#ifdef HAVE_WINT_T
23375 + TYPE_WIDE_CHAR,
23376 +#endif
23377 + TYPE_STRING,
23378 +#ifdef HAVE_WCHAR_T
23379 + TYPE_WIDE_STRING,
23380 +#endif
23381 + TYPE_POINTER,
23382 + TYPE_COUNT_SCHAR_POINTER,
23383 + TYPE_COUNT_SHORT_POINTER,
23384 + TYPE_COUNT_INT_POINTER,
23385 + TYPE_COUNT_LONGINT_POINTER
23386 +#ifdef HAVE_LONG_LONG
23387 +, TYPE_COUNT_LONGLONGINT_POINTER
23388 +#endif
23389 +} arg_type;
23390 +
23391 +/* Polymorphic argument */
23392 +typedef struct
23393 +{
23394 + arg_type type;
23395 + union
23396 + {
23397 + signed char a_schar;
23398 + unsigned char a_uchar;
23399 + short a_short;
23400 + unsigned short a_ushort;
23401 + int a_int;
23402 + unsigned int a_uint;
23403 + long int a_longint;
23404 + unsigned long int a_ulongint;
23405 +#ifdef HAVE_LONG_LONG
23406 + long long int a_longlongint;
23407 + unsigned long long int a_ulonglongint;
23408 +#endif
23409 + float a_float;
23410 + double a_double;
23411 +#ifdef HAVE_LONG_DOUBLE
23412 + long double a_longdouble;
23413 +#endif
23414 + int a_char;
23415 +#ifdef HAVE_WINT_T
23416 + wint_t a_wide_char;
23417 +#endif
23418 + const char* a_string;
23419 +#ifdef HAVE_WCHAR_T
23420 + const wchar_t* a_wide_string;
23421 +#endif
23422 + void* a_pointer;
23423 + signed char * a_count_schar_pointer;
23424 + short * a_count_short_pointer;
23425 + int * a_count_int_pointer;
23426 + long int * a_count_longint_pointer;
23427 +#ifdef HAVE_LONG_LONG
23428 + long long int * a_count_longlongint_pointer;
23429 +#endif
23430 + }
23431 + a;
23432 +}
23433 +argument;
23434 +
23435 +typedef struct
23436 +{
23437 + size_t count;
23438 + argument *arg;
23439 +}
23440 +arguments;
23441 +
23442 +
23443 +/* Fetch the arguments, putting them into a. */
23444 +#ifdef STATIC
23445 +STATIC
23446 +#else
23447 +extern
23448 +#endif
23449 +int printf_fetchargs (va_list args, arguments *a);
23450 +
23451 +#endif /* _PRINTF_ARGS_H */
23452 --- /dev/null
23453 +++ lxpanel-0.5.6/intl/plural-exp.h
23454 @@ -0,0 +1,118 @@
23455 +/* Expression parsing and evaluation for plural form selection.
23456 + Copyright (C) 2000-2003 Free Software Foundation, Inc.
23457 + Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
23458 +
23459 + This program is free software; you can redistribute it and/or modify it
23460 + under the terms of the GNU Library General Public License as published
23461 + by the Free Software Foundation; either version 2, or (at your option)
23462 + any later version.
23463 +
23464 + This program is distributed in the hope that it will be useful,
23465 + but WITHOUT ANY WARRANTY; without even the implied warranty of
23466 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23467 + Library General Public License for more details.
23468 +
23469 + You should have received a copy of the GNU Library General Public
23470 + License along with this program; if not, write to the Free Software
23471 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
23472 + USA. */
23473 +
23474 +#ifndef _PLURAL_EXP_H
23475 +#define _PLURAL_EXP_H
23476 +
23477 +#ifndef internal_function
23478 +# define internal_function
23479 +#endif
23480 +
23481 +#ifndef attribute_hidden
23482 +# define attribute_hidden
23483 +#endif
23484 +
23485 +
23486 +/* This is the representation of the expressions to determine the
23487 + plural form. */
23488 +struct expression
23489 +{
23490 + int nargs; /* Number of arguments. */
23491 + enum operator
23492 + {
23493 + /* Without arguments: */
23494 + var, /* The variable "n". */
23495 + num, /* Decimal number. */
23496 + /* Unary operators: */
23497 + lnot, /* Logical NOT. */
23498 + /* Binary operators: */
23499 + mult, /* Multiplication. */
23500 + divide, /* Division. */
23501 + module, /* Modulo operation. */
23502 + plus, /* Addition. */
23503 + minus, /* Subtraction. */
23504 + less_than, /* Comparison. */
23505 + greater_than, /* Comparison. */
23506 + less_or_equal, /* Comparison. */
23507 + greater_or_equal, /* Comparison. */
23508 + equal, /* Comparison for equality. */
23509 + not_equal, /* Comparison for inequality. */
23510 + land, /* Logical AND. */
23511 + lor, /* Logical OR. */
23512 + /* Ternary operators: */
23513 + qmop /* Question mark operator. */
23514 + } operation;
23515 + union
23516 + {
23517 + unsigned long int num; /* Number value for `num'. */
23518 + struct expression *args[3]; /* Up to three arguments. */
23519 + } val;
23520 +};
23521 +
23522 +/* This is the data structure to pass information to the parser and get
23523 + the result in a thread-safe way. */
23524 +struct parse_args
23525 +{
23526 + const char *cp;
23527 + struct expression *res;
23528 +};
23529 +
23530 +
23531 +/* Names for the libintl functions are a problem. This source code is used
23532 + 1. in the GNU C Library library,
23533 + 2. in the GNU libintl library,
23534 + 3. in the GNU gettext tools.
23535 + The function names in each situation must be different, to allow for
23536 + binary incompatible changes in 'struct expression'. Furthermore,
23537 + 1. in the GNU C Library library, the names have a __ prefix,
23538 + 2.+3. in the GNU libintl library and in the GNU gettext tools, the names
23539 + must follow ANSI C and not start with __.
23540 + So we have to distinguish the three cases. */
23541 +#ifdef _LIBC
23542 +# define FREE_EXPRESSION __gettext_free_exp
23543 +# define PLURAL_PARSE __gettextparse
23544 +# define GERMANIC_PLURAL __gettext_germanic_plural
23545 +# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
23546 +#elif defined (IN_LIBINTL)
23547 +# define FREE_EXPRESSION libintl_gettext_free_exp
23548 +# define PLURAL_PARSE libintl_gettextparse
23549 +# define GERMANIC_PLURAL libintl_gettext_germanic_plural
23550 +# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
23551 +#else
23552 +# define FREE_EXPRESSION free_plural_expression
23553 +# define PLURAL_PARSE parse_plural_expression
23554 +# define GERMANIC_PLURAL germanic_plural
23555 +# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
23556 +#endif
23557 +
23558 +extern void FREE_EXPRESSION (struct expression *exp)
23559 + internal_function;
23560 +extern int PLURAL_PARSE (void *arg);
23561 +extern struct expression GERMANIC_PLURAL attribute_hidden;
23562 +extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
23563 + struct expression **pluralp,
23564 + unsigned long int *npluralsp)
23565 + internal_function;
23566 +
23567 +#if !defined (_LIBC) && !defined (IN_LIBINTL)
23568 +extern unsigned long int plural_eval (struct expression *pexp,
23569 + unsigned long int n);
23570 +#endif
23571 +
23572 +#endif /* _PLURAL_EXP_H */
23573 --- /dev/null
23574 +++ lxpanel-0.5.6/intl/l10nflist.c
23575 @@ -0,0 +1,421 @@
23576 +/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
23577 + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
23578 +
23579 + This program is free software; you can redistribute it and/or modify it
23580 + under the terms of the GNU Library General Public License as published
23581 + by the Free Software Foundation; either version 2, or (at your option)
23582 + any later version.
23583 +
23584 + This program is distributed in the hope that it will be useful,
23585 + but WITHOUT ANY WARRANTY; without even the implied warranty of
23586 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23587 + Library General Public License for more details.
23588 +
23589 + You should have received a copy of the GNU Library General Public
23590 + License along with this program; if not, write to the Free Software
23591 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
23592 + USA. */
23593 +
23594 +/* Tell glibc's <string.h> to provide a prototype for stpcpy().
23595 + This must come before <config.h> because <config.h> may include
23596 + <features.h>, and once <features.h> has been included, it's too late. */
23597 +#ifndef _GNU_SOURCE
23598 +# define _GNU_SOURCE 1
23599 +#endif
23600 +
23601 +#ifdef HAVE_CONFIG_H
23602 +# include <config.h>
23603 +#endif
23604 +
23605 +#include <string.h>
23606 +
23607 +#if defined _LIBC || defined HAVE_ARGZ_H
23608 +# include <argz.h>
23609 +#endif
23610 +#include <ctype.h>
23611 +#include <sys/types.h>
23612 +#include <stdlib.h>
23613 +
23614 +#include "loadinfo.h"
23615 +
23616 +/* On some strange systems still no definition of NULL is found. Sigh! */
23617 +#ifndef NULL
23618 +# if defined __STDC__ && __STDC__
23619 +# define NULL ((void *) 0)
23620 +# else
23621 +# define NULL 0
23622 +# endif
23623 +#endif
23624 +
23625 +/* @@ end of prolog @@ */
23626 +
23627 +#ifdef _LIBC
23628 +/* Rename the non ANSI C functions. This is required by the standard
23629 + because some ANSI C functions will require linking with this object
23630 + file and the name space must not be polluted. */
23631 +# ifndef stpcpy
23632 +# define stpcpy(dest, src) __stpcpy(dest, src)
23633 +# endif
23634 +#else
23635 +# ifndef HAVE_STPCPY
23636 +static char *stpcpy (char *dest, const char *src);
23637 +# endif
23638 +#endif
23639 +
23640 +/* Pathname support.
23641 + ISSLASH(C) tests whether C is a directory separator character.
23642 + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
23643 + it may be concatenated to a directory pathname.
23644 + */
23645 +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
23646 + /* Win32, OS/2, DOS */
23647 +# define ISSLASH(C) ((C) == '/' || (C) == '\\')
23648 +# define HAS_DEVICE(P) \
23649 + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
23650 + && (P)[1] == ':')
23651 +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
23652 +#else
23653 + /* Unix */
23654 +# define ISSLASH(C) ((C) == '/')
23655 +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
23656 +#endif
23657 +
23658 +/* Define function which are usually not available. */
23659 +
23660 +#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
23661 +/* Returns the number of strings in ARGZ. */
23662 +static size_t
23663 +argz_count__ (const char *argz, size_t len)
23664 +{
23665 + size_t count = 0;
23666 + while (len > 0)
23667 + {
23668 + size_t part_len = strlen (argz);
23669 + argz += part_len + 1;
23670 + len -= part_len + 1;
23671 + count++;
23672 + }
23673 + return count;
23674 +}
23675 +# undef __argz_count
23676 +# define __argz_count(argz, len) argz_count__ (argz, len)
23677 +#else
23678 +# ifdef _LIBC
23679 +# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
23680 +# endif
23681 +#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
23682 +
23683 +#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
23684 +/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
23685 + except the last into the character SEP. */
23686 +static void
23687 +argz_stringify__ (char *argz, size_t len, int sep)
23688 +{
23689 + while (len > 0)
23690 + {
23691 + size_t part_len = strlen (argz);
23692 + argz += part_len;
23693 + len -= part_len + 1;
23694 + if (len > 0)
23695 + *argz++ = sep;
23696 + }
23697 +}
23698 +# undef __argz_stringify
23699 +# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
23700 +#else
23701 +# ifdef _LIBC
23702 +# define __argz_stringify(argz, len, sep) \
23703 + INTUSE(__argz_stringify) (argz, len, sep)
23704 +# endif
23705 +#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
23706 +
23707 +#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
23708 +static char *
23709 +argz_next__ (char *argz, size_t argz_len, const char *entry)
23710 +{
23711 + if (entry)
23712 + {
23713 + if (entry < argz + argz_len)
23714 + entry = strchr (entry, '\0') + 1;
23715 +
23716 + return entry >= argz + argz_len ? NULL : (char *) entry;
23717 + }
23718 + else
23719 + if (argz_len > 0)
23720 + return argz;
23721 + else
23722 + return 0;
23723 +}
23724 +# undef __argz_next
23725 +# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
23726 +#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
23727 +
23728 +
23729 +/* Return number of bits set in X. */
23730 +static inline int
23731 +pop (int x)
23732 +{
23733 + /* We assume that no more than 16 bits are used. */
23734 + x = ((x & ~0x5555) >> 1) + (x & 0x5555);
23735 + x = ((x & ~0x3333) >> 2) + (x & 0x3333);
23736 + x = ((x >> 4) + x) & 0x0f0f;
23737 + x = ((x >> 8) + x) & 0xff;
23738 +
23739 + return x;
23740 +}
23741 +
23742 +\f
23743 +struct loaded_l10nfile *
23744 +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
23745 + const char *dirlist, size_t dirlist_len,
23746 + int mask, const char *language, const char *territory,
23747 + const char *codeset, const char *normalized_codeset,
23748 + const char *modifier, const char *special,
23749 + const char *sponsor, const char *revision,
23750 + const char *filename, int do_allocate)
23751 +{
23752 + char *abs_filename;
23753 + struct loaded_l10nfile **lastp;
23754 + struct loaded_l10nfile *retval;
23755 + char *cp;
23756 + size_t dirlist_count;
23757 + size_t entries;
23758 + int cnt;
23759 +
23760 + /* If LANGUAGE contains an absolute directory specification, we ignore
23761 + DIRLIST. */
23762 + if (IS_ABSOLUTE_PATH (language))
23763 + dirlist_len = 0;
23764 +
23765 + /* Allocate room for the full file name. */
23766 + abs_filename = (char *) malloc (dirlist_len
23767 + + strlen (language)
23768 + + ((mask & TERRITORY) != 0
23769 + ? strlen (territory) + 1 : 0)
23770 + + ((mask & XPG_CODESET) != 0
23771 + ? strlen (codeset) + 1 : 0)
23772 + + ((mask & XPG_NORM_CODESET) != 0
23773 + ? strlen (normalized_codeset) + 1 : 0)
23774 + + (((mask & XPG_MODIFIER) != 0
23775 + || (mask & CEN_AUDIENCE) != 0)
23776 + ? strlen (modifier) + 1 : 0)
23777 + + ((mask & CEN_SPECIAL) != 0
23778 + ? strlen (special) + 1 : 0)
23779 + + (((mask & CEN_SPONSOR) != 0
23780 + || (mask & CEN_REVISION) != 0)
23781 + ? (1 + ((mask & CEN_SPONSOR) != 0
23782 + ? strlen (sponsor) : 0)
23783 + + ((mask & CEN_REVISION) != 0
23784 + ? strlen (revision) + 1 : 0)) : 0)
23785 + + 1 + strlen (filename) + 1);
23786 +
23787 + if (abs_filename == NULL)
23788 + return NULL;
23789 +
23790 + /* Construct file name. */
23791 + cp = abs_filename;
23792 + if (dirlist_len > 0)
23793 + {
23794 + memcpy (cp, dirlist, dirlist_len);
23795 + __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
23796 + cp += dirlist_len;
23797 + cp[-1] = '/';
23798 + }
23799 +
23800 + cp = stpcpy (cp, language);
23801 +
23802 + if ((mask & TERRITORY) != 0)
23803 + {
23804 + *cp++ = '_';
23805 + cp = stpcpy (cp, territory);
23806 + }
23807 + if ((mask & XPG_CODESET) != 0)
23808 + {
23809 + *cp++ = '.';
23810 + cp = stpcpy (cp, codeset);
23811 + }
23812 + if ((mask & XPG_NORM_CODESET) != 0)
23813 + {
23814 + *cp++ = '.';
23815 + cp = stpcpy (cp, normalized_codeset);
23816 + }
23817 + if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
23818 + {
23819 + /* This component can be part of both syntaces but has different
23820 + leading characters. For CEN we use `+', else `@'. */
23821 + *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
23822 + cp = stpcpy (cp, modifier);
23823 + }
23824 + if ((mask & CEN_SPECIAL) != 0)
23825 + {
23826 + *cp++ = '+';
23827 + cp = stpcpy (cp, special);
23828 + }
23829 + if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
23830 + {
23831 + *cp++ = ',';
23832 + if ((mask & CEN_SPONSOR) != 0)
23833 + cp = stpcpy (cp, sponsor);
23834 + if ((mask & CEN_REVISION) != 0)
23835 + {
23836 + *cp++ = '_';
23837 + cp = stpcpy (cp, revision);
23838 + }
23839 + }
23840 +
23841 + *cp++ = '/';
23842 + stpcpy (cp, filename);
23843 +
23844 + /* Look in list of already loaded domains whether it is already
23845 + available. */
23846 + lastp = l10nfile_list;
23847 + for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
23848 + if (retval->filename != NULL)
23849 + {
23850 + int compare = strcmp (retval->filename, abs_filename);
23851 + if (compare == 0)
23852 + /* We found it! */
23853 + break;
23854 + if (compare < 0)
23855 + {
23856 + /* It's not in the list. */
23857 + retval = NULL;
23858 + break;
23859 + }
23860 +
23861 + lastp = &retval->next;
23862 + }
23863 +
23864 + if (retval != NULL || do_allocate == 0)
23865 + {
23866 + free (abs_filename);
23867 + return retval;
23868 + }
23869 +
23870 + dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
23871 +
23872 + /* Allocate a new loaded_l10nfile. */
23873 + retval =
23874 + (struct loaded_l10nfile *)
23875 + malloc (sizeof (*retval)
23876 + + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
23877 + * sizeof (struct loaded_l10nfile *)));
23878 + if (retval == NULL)
23879 + return NULL;
23880 +
23881 + retval->filename = abs_filename;
23882 +
23883 + /* We set retval->data to NULL here; it is filled in later.
23884 + Setting retval->decided to 1 here means that retval does not
23885 + correspond to a real file (dirlist_count > 1) or is not worth
23886 + looking up (if an unnormalized codeset was specified). */
23887 + retval->decided = (dirlist_count > 1
23888 + || ((mask & XPG_CODESET) != 0
23889 + && (mask & XPG_NORM_CODESET) != 0));
23890 + retval->data = NULL;
23891 +
23892 + retval->next = *lastp;
23893 + *lastp = retval;
23894 +
23895 + entries = 0;
23896 + /* Recurse to fill the inheritance list of RETVAL.
23897 + If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
23898 + entry does not correspond to a real file; retval->filename contains
23899 + colons. In this case we loop across all elements of DIRLIST and
23900 + across all bit patterns dominated by MASK.
23901 + If the DIRLIST is a single directory or entirely redundant (i.e.
23902 + DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
23903 + MASK, excluding MASK itself.
23904 + In either case, we loop down from MASK to 0. This has the effect
23905 + that the extra bits in the locale name are dropped in this order:
23906 + first the modifier, then the territory, then the codeset, then the
23907 + normalized_codeset. */
23908 + for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
23909 + if ((cnt & ~mask) == 0
23910 + && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
23911 + && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
23912 + {
23913 + if (dirlist_count > 1)
23914 + {
23915 + /* Iterate over all elements of the DIRLIST. */
23916 + char *dir = NULL;
23917 +
23918 + while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
23919 + != NULL)
23920 + retval->successor[entries++]
23921 + = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
23922 + cnt, language, territory, codeset,
23923 + normalized_codeset, modifier, special,
23924 + sponsor, revision, filename, 1);
23925 + }
23926 + else
23927 + retval->successor[entries++]
23928 + = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
23929 + cnt, language, territory, codeset,
23930 + normalized_codeset, modifier, special,
23931 + sponsor, revision, filename, 1);
23932 + }
23933 + retval->successor[entries] = NULL;
23934 +
23935 + return retval;
23936 +}
23937 +\f
23938 +/* Normalize codeset name. There is no standard for the codeset
23939 + names. Normalization allows the user to use any of the common
23940 + names. The return value is dynamically allocated and has to be
23941 + freed by the caller. */
23942 +const char *
23943 +_nl_normalize_codeset (const char *codeset, size_t name_len)
23944 +{
23945 + int len = 0;
23946 + int only_digit = 1;
23947 + char *retval;
23948 + char *wp;
23949 + size_t cnt;
23950 +
23951 + for (cnt = 0; cnt < name_len; ++cnt)
23952 + if (isalnum ((unsigned char) codeset[cnt]))
23953 + {
23954 + ++len;
23955 +
23956 + if (isalpha ((unsigned char) codeset[cnt]))
23957 + only_digit = 0;
23958 + }
23959 +
23960 + retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
23961 +
23962 + if (retval != NULL)
23963 + {
23964 + if (only_digit)
23965 + wp = stpcpy (retval, "iso");
23966 + else
23967 + wp = retval;
23968 +
23969 + for (cnt = 0; cnt < name_len; ++cnt)
23970 + if (isalpha ((unsigned char) codeset[cnt]))
23971 + *wp++ = tolower ((unsigned char) codeset[cnt]);
23972 + else if (isdigit ((unsigned char) codeset[cnt]))
23973 + *wp++ = codeset[cnt];
23974 +
23975 + *wp = '\0';
23976 + }
23977 +
23978 + return (const char *) retval;
23979 +}
23980 +
23981 +
23982 +/* @@ begin of epilog @@ */
23983 +
23984 +/* We don't want libintl.a to depend on any other library. So we
23985 + avoid the non-standard function stpcpy. In GNU C Library this
23986 + function is available, though. Also allow the symbol HAVE_STPCPY
23987 + to be defined. */
23988 +#if !_LIBC && !HAVE_STPCPY
23989 +static char *
23990 +stpcpy (char *dest, const char *src)
23991 +{
23992 + while ((*dest++ = *src++) != '\0')
23993 + /* Do nothing. */ ;
23994 + return dest - 1;
23995 +}
23996 +#endif
23997 --- /dev/null
23998 +++ lxpanel-0.5.6/intl/relocatable.h
23999 @@ -0,0 +1,77 @@
24000 +/* Provide relocatable packages.
24001 + Copyright (C) 2003 Free Software Foundation, Inc.
24002 + Written by Bruno Haible <bruno@clisp.org>, 2003.
24003 +
24004 + This program is free software; you can redistribute it and/or modify it
24005 + under the terms of the GNU Library General Public License as published
24006 + by the Free Software Foundation; either version 2, or (at your option)
24007 + any later version.
24008 +
24009 + This program is distributed in the hope that it will be useful,
24010 + but WITHOUT ANY WARRANTY; without even the implied warranty of
24011 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24012 + Library General Public License for more details.
24013 +
24014 + You should have received a copy of the GNU Library General Public
24015 + License along with this program; if not, write to the Free Software
24016 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
24017 + USA. */
24018 +
24019 +#ifndef _RELOCATABLE_H
24020 +#define _RELOCATABLE_H
24021 +
24022 +#ifdef __cplusplus
24023 +extern "C" {
24024 +#endif
24025 +
24026 +
24027 +/* This can be enabled through the configure --enable-relocatable option. */
24028 +#if ENABLE_RELOCATABLE
24029 +
24030 +/* When building a DLL, we must export some functions. Note that because
24031 + this is a private .h file, we don't need to use __declspec(dllimport)
24032 + in any case. */
24033 +#if defined _MSC_VER && BUILDING_DLL
24034 +# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
24035 +#else
24036 +# define RELOCATABLE_DLL_EXPORTED
24037 +#endif
24038 +
24039 +/* Sets the original and the current installation prefix of the package.
24040 + Relocation simply replaces a pathname starting with the original prefix
24041 + by the corresponding pathname with the current prefix instead. Both
24042 + prefixes should be directory names without trailing slash (i.e. use ""
24043 + instead of "/"). */
24044 +extern RELOCATABLE_DLL_EXPORTED void
24045 + set_relocation_prefix (const char *orig_prefix,
24046 + const char *curr_prefix);
24047 +
24048 +/* Returns the pathname, relocated according to the current installation
24049 + directory. */
24050 +extern const char * relocate (const char *pathname);
24051 +
24052 +/* Memory management: relocate() leaks memory, because it has to construct
24053 + a fresh pathname. If this is a problem because your program calls
24054 + relocate() frequently, think about caching the result. */
24055 +
24056 +/* Convenience function:
24057 + Computes the current installation prefix, based on the original
24058 + installation prefix, the original installation directory of a particular
24059 + file, and the current pathname of this file. Returns NULL upon failure. */
24060 +extern const char * compute_curr_prefix (const char *orig_installprefix,
24061 + const char *orig_installdir,
24062 + const char *curr_pathname);
24063 +
24064 +#else
24065 +
24066 +/* By default, we use the hardwired pathnames. */
24067 +#define relocate(pathname) (pathname)
24068 +
24069 +#endif
24070 +
24071 +
24072 +#ifdef __cplusplus
24073 +}
24074 +#endif
24075 +
24076 +#endif /* _RELOCATABLE_H */
24077 --- /dev/null
24078 +++ lxpanel-0.5.6/intl/localcharset.c
24079 @@ -0,0 +1,398 @@
24080 +/* Determine a canonical name for the current locale's character encoding.
24081 +
24082 + Copyright (C) 2000-2003 Free Software Foundation, Inc.
24083 +
24084 + This program is free software; you can redistribute it and/or modify it
24085 + under the terms of the GNU Library General Public License as published
24086 + by the Free Software Foundation; either version 2, or (at your option)
24087 + any later version.
24088 +
24089 + This program is distributed in the hope that it will be useful,
24090 + but WITHOUT ANY WARRANTY; without even the implied warranty of
24091 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24092 + Library General Public License for more details.
24093 +
24094 + You should have received a copy of the GNU Library General Public
24095 + License along with this program; if not, write to the Free Software
24096 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
24097 + USA. */
24098 +
24099 +/* Written by Bruno Haible <bruno@clisp.org>. */
24100 +
24101 +#ifdef HAVE_CONFIG_H
24102 +# include <config.h>
24103 +#endif
24104 +
24105 +/* Specification. */
24106 +#include "localcharset.h"
24107 +
24108 +#if HAVE_STDDEF_H
24109 +# include <stddef.h>
24110 +#endif
24111 +
24112 +#include <stdio.h>
24113 +#if HAVE_STRING_H
24114 +# include <string.h>
24115 +#else
24116 +# include <strings.h>
24117 +#endif
24118 +#if HAVE_STDLIB_H
24119 +# include <stdlib.h>
24120 +#endif
24121 +
24122 +#if defined _WIN32 || defined __WIN32__
24123 +# undef WIN32 /* avoid warning on mingw32 */
24124 +# define WIN32
24125 +#endif
24126 +
24127 +#if defined __EMX__
24128 +/* Assume EMX program runs on OS/2, even if compiled under DOS. */
24129 +# define OS2
24130 +#endif
24131 +
24132 +#if !defined WIN32
24133 +# if HAVE_LANGINFO_CODESET
24134 +# include <langinfo.h>
24135 +# else
24136 +# if HAVE_SETLOCALE
24137 +# include <locale.h>
24138 +# endif
24139 +# endif
24140 +#elif defined WIN32
24141 +# define WIN32_LEAN_AND_MEAN
24142 +# include <windows.h>
24143 +#endif
24144 +#if defined OS2
24145 +# define INCL_DOS
24146 +# include <os2.h>
24147 +#endif
24148 +
24149 +#if ENABLE_RELOCATABLE
24150 +# include "relocatable.h"
24151 +#else
24152 +# define relocate(pathname) (pathname)
24153 +#endif
24154 +
24155 +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
24156 + /* Win32, OS/2, DOS */
24157 +# define ISSLASH(C) ((C) == '/' || (C) == '\\')
24158 +#endif
24159 +
24160 +#ifndef DIRECTORY_SEPARATOR
24161 +# define DIRECTORY_SEPARATOR '/'
24162 +#endif
24163 +
24164 +#ifndef ISSLASH
24165 +# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
24166 +#endif
24167 +
24168 +#if HAVE_DECL_GETC_UNLOCKED
24169 +# undef getc
24170 +# define getc getc_unlocked
24171 +#endif
24172 +
24173 +/* The following static variable is declared 'volatile' to avoid a
24174 + possible multithread problem in the function get_charset_aliases. If we
24175 + are running in a threaded environment, and if two threads initialize
24176 + 'charset_aliases' simultaneously, both will produce the same value,
24177 + and everything will be ok if the two assignments to 'charset_aliases'
24178 + are atomic. But I don't know what will happen if the two assignments mix. */
24179 +#if __STDC__ != 1
24180 +# define volatile /* empty */
24181 +#endif
24182 +/* Pointer to the contents of the charset.alias file, if it has already been
24183 + read, else NULL. Its format is:
24184 + ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
24185 +static const char * volatile charset_aliases;
24186 +
24187 +/* Return a pointer to the contents of the charset.alias file. */
24188 +static const char *
24189 +get_charset_aliases ()
24190 +{
24191 + const char *cp;
24192 +
24193 + cp = charset_aliases;
24194 + if (cp == NULL)
24195 + {
24196 +#if !(defined VMS || defined WIN32)
24197 + FILE *fp;
24198 + const char *dir = relocate (LIBDIR);
24199 + const char *base = "charset.alias";
24200 + char *file_name;
24201 +
24202 + /* Concatenate dir and base into freshly allocated file_name. */
24203 + {
24204 + size_t dir_len = strlen (dir);
24205 + size_t base_len = strlen (base);
24206 + int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
24207 + file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
24208 + if (file_name != NULL)
24209 + {
24210 + memcpy (file_name, dir, dir_len);
24211 + if (add_slash)
24212 + file_name[dir_len] = DIRECTORY_SEPARATOR;
24213 + memcpy (file_name + dir_len + add_slash, base, base_len + 1);
24214 + }
24215 + }
24216 +
24217 + if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
24218 + /* Out of memory or file not found, treat it as empty. */
24219 + cp = "";
24220 + else
24221 + {
24222 + /* Parse the file's contents. */
24223 + int c;
24224 + char buf1[50+1];
24225 + char buf2[50+1];
24226 + char *res_ptr = NULL;
24227 + size_t res_size = 0;
24228 + size_t l1, l2;
24229 +
24230 + for (;;)
24231 + {
24232 + c = getc (fp);
24233 + if (c == EOF)
24234 + break;
24235 + if (c == '\n' || c == ' ' || c == '\t')
24236 + continue;
24237 + if (c == '#')
24238 + {
24239 + /* Skip comment, to end of line. */
24240 + do
24241 + c = getc (fp);
24242 + while (!(c == EOF || c == '\n'));
24243 + if (c == EOF)
24244 + break;
24245 + continue;
24246 + }
24247 + ungetc (c, fp);
24248 + if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
24249 + break;
24250 + l1 = strlen (buf1);
24251 + l2 = strlen (buf2);
24252 + if (res_size == 0)
24253 + {
24254 + res_size = l1 + 1 + l2 + 1;
24255 + res_ptr = (char *) malloc (res_size + 1);
24256 + }
24257 + else
24258 + {
24259 + res_size += l1 + 1 + l2 + 1;
24260 + res_ptr = (char *) realloc (res_ptr, res_size + 1);
24261 + }
24262 + if (res_ptr == NULL)
24263 + {
24264 + /* Out of memory. */
24265 + res_size = 0;
24266 + break;
24267 + }
24268 + strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
24269 + strcpy (res_ptr + res_size - (l2 + 1), buf2);
24270 + }
24271 + fclose (fp);
24272 + if (res_size == 0)
24273 + cp = "";
24274 + else
24275 + {
24276 + *(res_ptr + res_size) = '\0';
24277 + cp = res_ptr;
24278 + }
24279 + }
24280 +
24281 + if (file_name != NULL)
24282 + free (file_name);
24283 +
24284 +#else
24285 +
24286 +# if defined VMS
24287 + /* To avoid the troubles of an extra file charset.alias_vms in the
24288 + sources of many GNU packages, simply inline the aliases here. */
24289 + /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
24290 + "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
24291 + section 10.7 "Handling Different Character Sets". */
24292 + cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
24293 + "ISO8859-2" "\0" "ISO-8859-2" "\0"
24294 + "ISO8859-5" "\0" "ISO-8859-5" "\0"
24295 + "ISO8859-7" "\0" "ISO-8859-7" "\0"
24296 + "ISO8859-8" "\0" "ISO-8859-8" "\0"
24297 + "ISO8859-9" "\0" "ISO-8859-9" "\0"
24298 + /* Japanese */
24299 + "eucJP" "\0" "EUC-JP" "\0"
24300 + "SJIS" "\0" "SHIFT_JIS" "\0"
24301 + "DECKANJI" "\0" "DEC-KANJI" "\0"
24302 + "SDECKANJI" "\0" "EUC-JP" "\0"
24303 + /* Chinese */
24304 + "eucTW" "\0" "EUC-TW" "\0"
24305 + "DECHANYU" "\0" "DEC-HANYU" "\0"
24306 + "DECHANZI" "\0" "GB2312" "\0"
24307 + /* Korean */
24308 + "DECKOREAN" "\0" "EUC-KR" "\0";
24309 +# endif
24310 +
24311 +# if defined WIN32
24312 + /* To avoid the troubles of installing a separate file in the same
24313 + directory as the DLL and of retrieving the DLL's directory at
24314 + runtime, simply inline the aliases here. */
24315 +
24316 + cp = "CP936" "\0" "GBK" "\0"
24317 + "CP1361" "\0" "JOHAB" "\0"
24318 + "CP20127" "\0" "ASCII" "\0"
24319 + "CP20866" "\0" "KOI8-R" "\0"
24320 + "CP21866" "\0" "KOI8-RU" "\0"
24321 + "CP28591" "\0" "ISO-8859-1" "\0"
24322 + "CP28592" "\0" "ISO-8859-2" "\0"
24323 + "CP28593" "\0" "ISO-8859-3" "\0"
24324 + "CP28594" "\0" "ISO-8859-4" "\0"
24325 + "CP28595" "\0" "ISO-8859-5" "\0"
24326 + "CP28596" "\0" "ISO-8859-6" "\0"
24327 + "CP28597" "\0" "ISO-8859-7" "\0"
24328 + "CP28598" "\0" "ISO-8859-8" "\0"
24329 + "CP28599" "\0" "ISO-8859-9" "\0"
24330 + "CP28605" "\0" "ISO-8859-15" "\0";
24331 +# endif
24332 +#endif
24333 +
24334 + charset_aliases = cp;
24335 + }
24336 +
24337 + return cp;
24338 +}
24339 +
24340 +/* Determine the current locale's character encoding, and canonicalize it
24341 + into one of the canonical names listed in config.charset.
24342 + The result must not be freed; it is statically allocated.
24343 + If the canonical name cannot be determined, the result is a non-canonical
24344 + name. */
24345 +
24346 +#ifdef STATIC
24347 +STATIC
24348 +#endif
24349 +const char *
24350 +locale_charset ()
24351 +{
24352 + const char *codeset;
24353 + const char *aliases;
24354 +
24355 +#if !(defined WIN32 || defined OS2)
24356 +
24357 +# if HAVE_LANGINFO_CODESET
24358 +
24359 + /* Most systems support nl_langinfo (CODESET) nowadays. */
24360 + codeset = nl_langinfo (CODESET);
24361 +
24362 +# else
24363 +
24364 + /* On old systems which lack it, use setlocale or getenv. */
24365 + const char *locale = NULL;
24366 +
24367 + /* But most old systems don't have a complete set of locales. Some
24368 + (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
24369 + use setlocale here; it would return "C" when it doesn't support the
24370 + locale name the user has set. */
24371 +# if HAVE_SETLOCALE && 0
24372 + locale = setlocale (LC_CTYPE, NULL);
24373 +# endif
24374 + if (locale == NULL || locale[0] == '\0')
24375 + {
24376 + locale = getenv ("LC_ALL");
24377 + if (locale == NULL || locale[0] == '\0')
24378 + {
24379 + locale = getenv ("LC_CTYPE");
24380 + if (locale == NULL || locale[0] == '\0')
24381 + locale = getenv ("LANG");
24382 + }
24383 + }
24384 +
24385 + /* On some old systems, one used to set locale = "iso8859_1". On others,
24386 + you set it to "language_COUNTRY.charset". In any case, we resolve it
24387 + through the charset.alias file. */
24388 + codeset = locale;
24389 +
24390 +# endif
24391 +
24392 +#elif defined WIN32
24393 +
24394 + static char buf[2 + 10 + 1];
24395 +
24396 + /* Woe32 has a function returning the locale's codepage as a number. */
24397 + sprintf (buf, "CP%u", GetACP ());
24398 + codeset = buf;
24399 +
24400 +#elif defined OS2
24401 +
24402 + const char *locale;
24403 + static char buf[2 + 10 + 1];
24404 + ULONG cp[3];
24405 + ULONG cplen;
24406 +
24407 + /* Allow user to override the codeset, as set in the operating system,
24408 + with standard language environment variables. */
24409 + locale = getenv ("LC_ALL");
24410 + if (locale == NULL || locale[0] == '\0')
24411 + {
24412 + locale = getenv ("LC_CTYPE");
24413 + if (locale == NULL || locale[0] == '\0')
24414 + locale = getenv ("LANG");
24415 + }
24416 + if (locale != NULL && locale[0] != '\0')
24417 + {
24418 + /* If the locale name contains an encoding after the dot, return it. */
24419 + const char *dot = strchr (locale, '.');
24420 +
24421 + if (dot != NULL)
24422 + {
24423 + const char *modifier;
24424 +
24425 + dot++;
24426 + /* Look for the possible @... trailer and remove it, if any. */
24427 + modifier = strchr (dot, '@');
24428 + if (modifier == NULL)
24429 + return dot;
24430 + if (modifier - dot < sizeof (buf))
24431 + {
24432 + memcpy (buf, dot, modifier - dot);
24433 + buf [modifier - dot] = '\0';
24434 + return buf;
24435 + }
24436 + }
24437 +
24438 + /* Resolve through the charset.alias file. */
24439 + codeset = locale;
24440 + }
24441 + else
24442 + {
24443 + /* OS/2 has a function returning the locale's codepage as a number. */
24444 + if (DosQueryCp (sizeof (cp), cp, &cplen))
24445 + codeset = "";
24446 + else
24447 + {
24448 + sprintf (buf, "CP%u", cp[0]);
24449 + codeset = buf;
24450 + }
24451 + }
24452 +
24453 +#endif
24454 +
24455 + if (codeset == NULL)
24456 + /* The canonical name cannot be determined. */
24457 + codeset = "";
24458 +
24459 + /* Resolve alias. */
24460 + for (aliases = get_charset_aliases ();
24461 + *aliases != '\0';
24462 + aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
24463 + if (strcmp (codeset, aliases) == 0
24464 + || (aliases[0] == '*' && aliases[1] == '\0'))
24465 + {
24466 + codeset = aliases + strlen (aliases) + 1;
24467 + break;
24468 + }
24469 +
24470 + /* Don't return an empty string. GNU libc and GNU libiconv interpret
24471 + the empty string as denoting "the locale's character encoding",
24472 + thus GNU libiconv would call this function a second time. */
24473 + if (codeset[0] == '\0')
24474 + codeset = "ASCII";
24475 +
24476 + return codeset;
24477 +}
24478 --- /dev/null
24479 +++ lxpanel-0.5.6/intl/printf.c
24480 @@ -0,0 +1,371 @@
24481 +/* Formatted output to strings, using POSIX/XSI format strings with positions.
24482 + Copyright (C) 2003 Free Software Foundation, Inc.
24483 + Written by Bruno Haible <bruno@clisp.org>, 2003.
24484 +
24485 + This program is free software; you can redistribute it and/or modify it
24486 + under the terms of the GNU Library General Public License as published
24487 + by the Free Software Foundation; either version 2, or (at your option)
24488 + any later version.
24489 +
24490 + This program is distributed in the hope that it will be useful,
24491 + but WITHOUT ANY WARRANTY; without even the implied warranty of
24492 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24493 + Library General Public License for more details.
24494 +
24495 + You should have received a copy of the GNU Library General Public
24496 + License along with this program; if not, write to the Free Software
24497 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
24498 + USA. */
24499 +
24500 +#ifdef HAVE_CONFIG_H
24501 +# include <config.h>
24502 +#endif
24503 +
24504 +#ifdef __GNUC__
24505 +# define alloca __builtin_alloca
24506 +# define HAVE_ALLOCA 1
24507 +#else
24508 +# ifdef _MSC_VER
24509 +# include <malloc.h>
24510 +# define alloca _alloca
24511 +# else
24512 +# if defined HAVE_ALLOCA_H || defined _LIBC
24513 +# include <alloca.h>
24514 +# else
24515 +# ifdef _AIX
24516 + #pragma alloca
24517 +# else
24518 +# ifndef alloca
24519 +char *alloca ();
24520 +# endif
24521 +# endif
24522 +# endif
24523 +# endif
24524 +#endif
24525 +
24526 +#include <stdio.h>
24527 +
24528 +#if !HAVE_POSIX_PRINTF
24529 +
24530 +#include <stdlib.h>
24531 +#include <string.h>
24532 +
24533 +/* When building a DLL, we must export some functions. Note that because
24534 + the functions are only defined for binary backward compatibility, we
24535 + don't need to use __declspec(dllimport) in any case. */
24536 +#if defined _MSC_VER && BUILDING_DLL
24537 +# define DLL_EXPORTED __declspec(dllexport)
24538 +#else
24539 +# define DLL_EXPORTED
24540 +#endif
24541 +
24542 +#define STATIC static
24543 +
24544 +/* Define auxiliary functions declared in "printf-args.h". */
24545 +#include "printf-args.c"
24546 +
24547 +/* Define auxiliary functions declared in "printf-parse.h". */
24548 +#include "printf-parse.c"
24549 +
24550 +/* Define functions declared in "vasnprintf.h". */
24551 +#define vasnprintf libintl_vasnprintf
24552 +#include "vasnprintf.c"
24553 +#if 0 /* not needed */
24554 +#define asnprintf libintl_asnprintf
24555 +#include "asnprintf.c"
24556 +#endif
24557 +
24558 +DLL_EXPORTED
24559 +int
24560 +libintl_vfprintf (FILE *stream, const char *format, va_list args)
24561 +{
24562 + if (strchr (format, '$') == NULL)
24563 + return vfprintf (stream, format, args);
24564 + else
24565 + {
24566 + size_t length;
24567 + char *result = libintl_vasnprintf (NULL, &length, format, args);
24568 + int retval = -1;
24569 + if (result != NULL)
24570 + {
24571 + if (fwrite (result, 1, length, stream) == length)
24572 + retval = length;
24573 + free (result);
24574 + }
24575 + return retval;
24576 + }
24577 +}
24578 +
24579 +DLL_EXPORTED
24580 +int
24581 +libintl_fprintf (FILE *stream, const char *format, ...)
24582 +{
24583 + va_list args;
24584 + int retval;
24585 +
24586 + va_start (args, format);
24587 + retval = libintl_vfprintf (stream, format, args);
24588 + va_end (args);
24589 + return retval;
24590 +}
24591 +
24592 +DLL_EXPORTED
24593 +int
24594 +libintl_vprintf (const char *format, va_list args)
24595 +{
24596 + return libintl_vfprintf (stdout, format, args);
24597 +}
24598 +
24599 +DLL_EXPORTED
24600 +int
24601 +libintl_printf (const char *format, ...)
24602 +{
24603 + va_list args;
24604 + int retval;
24605 +
24606 + va_start (args, format);
24607 + retval = libintl_vprintf (format, args);
24608 + va_end (args);
24609 + return retval;
24610 +}
24611 +
24612 +DLL_EXPORTED
24613 +int
24614 +libintl_vsprintf (char *resultbuf, const char *format, va_list args)
24615 +{
24616 + if (strchr (format, '$') == NULL)
24617 + return vsprintf (resultbuf, format, args);
24618 + else
24619 + {
24620 + size_t length = (size_t) ~0 / (4 * sizeof (char));
24621 + char *result = libintl_vasnprintf (resultbuf, &length, format, args);
24622 + if (result != resultbuf)
24623 + {
24624 + free (result);
24625 + return -1;
24626 + }
24627 + else
24628 + return length;
24629 + }
24630 +}
24631 +
24632 +DLL_EXPORTED
24633 +int
24634 +libintl_sprintf (char *resultbuf, const char *format, ...)
24635 +{
24636 + va_list args;
24637 + int retval;
24638 +
24639 + va_start (args, format);
24640 + retval = libintl_vsprintf (resultbuf, format, args);
24641 + va_end (args);
24642 + return retval;
24643 +}
24644 +
24645 +#if HAVE_SNPRINTF
24646 +
24647 +# if HAVE_DECL__SNPRINTF
24648 + /* Windows. */
24649 +# define system_vsnprintf _vsnprintf
24650 +# else
24651 + /* Unix. */
24652 +# define system_vsnprintf vsnprintf
24653 +# endif
24654 +
24655 +DLL_EXPORTED
24656 +int
24657 +libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
24658 +{
24659 + if (strchr (format, '$') == NULL)
24660 + return system_vsnprintf (resultbuf, length, format, args);
24661 + else
24662 + {
24663 + size_t maxlength = length;
24664 + char *result = libintl_vasnprintf (resultbuf, &length, format, args);
24665 + if (result != resultbuf)
24666 + {
24667 + if (maxlength > 0)
24668 + {
24669 + if (length < maxlength)
24670 + abort ();
24671 + memcpy (resultbuf, result, maxlength - 1);
24672 + resultbuf[maxlength - 1] = '\0';
24673 + }
24674 + free (result);
24675 + return -1;
24676 + }
24677 + else
24678 + return length;
24679 + }
24680 +}
24681 +
24682 +DLL_EXPORTED
24683 +int
24684 +libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
24685 +{
24686 + va_list args;
24687 + int retval;
24688 +
24689 + va_start (args, format);
24690 + retval = libintl_vsnprintf (resultbuf, length, format, args);
24691 + va_end (args);
24692 + return retval;
24693 +}
24694 +
24695 +#endif
24696 +
24697 +#if HAVE_ASPRINTF
24698 +
24699 +DLL_EXPORTED
24700 +int
24701 +libintl_vasprintf (char **resultp, const char *format, va_list args)
24702 +{
24703 + size_t length;
24704 + char *result = libintl_vasnprintf (NULL, &length, format, args);
24705 + if (result == NULL)
24706 + return -1;
24707 + *resultp = result;
24708 + return length;
24709 +}
24710 +
24711 +DLL_EXPORTED
24712 +int
24713 +libintl_asprintf (char **resultp, const char *format, ...)
24714 +{
24715 + va_list args;
24716 + int retval;
24717 +
24718 + va_start (args, format);
24719 + retval = libintl_vasprintf (resultp, format, args);
24720 + va_end (args);
24721 + return retval;
24722 +}
24723 +
24724 +#endif
24725 +
24726 +#if HAVE_FWPRINTF
24727 +
24728 +#include <wchar.h>
24729 +
24730 +#define WIDE_CHAR_VERSION 1
24731 +
24732 +/* Define auxiliary functions declared in "wprintf-parse.h". */
24733 +#include "printf-parse.c"
24734 +
24735 +/* Define functions declared in "vasnprintf.h". */
24736 +#define vasnwprintf libintl_vasnwprintf
24737 +#include "vasnprintf.c"
24738 +#if 0 /* not needed */
24739 +#define asnwprintf libintl_asnwprintf
24740 +#include "asnprintf.c"
24741 +#endif
24742 +
24743 +# if HAVE_DECL__SNWPRINTF
24744 + /* Windows. */
24745 +# define system_vswprintf _vsnwprintf
24746 +# else
24747 + /* Unix. */
24748 +# define system_vswprintf vswprintf
24749 +# endif
24750 +
24751 +DLL_EXPORTED
24752 +int
24753 +libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
24754 +{
24755 + if (wcschr (format, '$') == NULL)
24756 + return vfwprintf (stream, format, args);
24757 + else
24758 + {
24759 + size_t length;
24760 + wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
24761 + int retval = -1;
24762 + if (result != NULL)
24763 + {
24764 + size_t i;
24765 + for (i = 0; i < length; i++)
24766 + if (fputwc (result[i], stream) == WEOF)
24767 + break;
24768 + if (i == length)
24769 + retval = length;
24770 + free (result);
24771 + }
24772 + return retval;
24773 + }
24774 +}
24775 +
24776 +DLL_EXPORTED
24777 +int
24778 +libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
24779 +{
24780 + va_list args;
24781 + int retval;
24782 +
24783 + va_start (args, format);
24784 + retval = libintl_vfwprintf (stream, format, args);
24785 + va_end (args);
24786 + return retval;
24787 +}
24788 +
24789 +DLL_EXPORTED
24790 +int
24791 +libintl_vwprintf (const wchar_t *format, va_list args)
24792 +{
24793 + return libintl_vfwprintf (stdout, format, args);
24794 +}
24795 +
24796 +DLL_EXPORTED
24797 +int
24798 +libintl_wprintf (const wchar_t *format, ...)
24799 +{
24800 + va_list args;
24801 + int retval;
24802 +
24803 + va_start (args, format);
24804 + retval = libintl_vwprintf (format, args);
24805 + va_end (args);
24806 + return retval;
24807 +}
24808 +
24809 +DLL_EXPORTED
24810 +int
24811 +libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
24812 +{
24813 + if (wcschr (format, '$') == NULL)
24814 + return system_vswprintf (resultbuf, length, format, args);
24815 + else
24816 + {
24817 + size_t maxlength = length;
24818 + wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
24819 + if (result != resultbuf)
24820 + {
24821 + if (maxlength > 0)
24822 + {
24823 + if (length < maxlength)
24824 + abort ();
24825 + memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
24826 + resultbuf[maxlength - 1] = 0;
24827 + }
24828 + free (result);
24829 + return -1;
24830 + }
24831 + else
24832 + return length;
24833 + }
24834 +}
24835 +
24836 +DLL_EXPORTED
24837 +int
24838 +libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
24839 +{
24840 + va_list args;
24841 + int retval;
24842 +
24843 + va_start (args, format);
24844 + retval = libintl_vswprintf (resultbuf, length, format, args);
24845 + va_end (args);
24846 + return retval;
24847 +}
24848 +
24849 +#endif
24850 +
24851 +#endif
24852 --- /dev/null
24853 +++ lxpanel-0.5.6/intl/localename.c
24854 @@ -0,0 +1,1142 @@
24855 +/* Determine the current selected locale.
24856 + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
24857 +
24858 + This program is free software; you can redistribute it and/or modify it
24859 + under the terms of the GNU Library General Public License as published
24860 + by the Free Software Foundation; either version 2, or (at your option)
24861 + any later version.
24862 +
24863 + This program is distributed in the hope that it will be useful,
24864 + but WITHOUT ANY WARRANTY; without even the implied warranty of
24865 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24866 + Library General Public License for more details.
24867 +
24868 + You should have received a copy of the GNU Library General Public
24869 + License along with this program; if not, write to the Free Software
24870 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
24871 + USA. */
24872 +
24873 +/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
24874 +/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */
24875 +
24876 +#ifdef HAVE_CONFIG_H
24877 +# include <config.h>
24878 +#endif
24879 +
24880 +#include <stdlib.h>
24881 +#include <locale.h>
24882 +
24883 +#if defined _WIN32 || defined __WIN32__
24884 +# undef WIN32 /* avoid warning on mingw32 */
24885 +# define WIN32
24886 +#endif
24887 +
24888 +#ifdef WIN32
24889 +# define WIN32_LEAN_AND_MEAN
24890 +# include <windows.h>
24891 +/* List of language codes, sorted by value:
24892 + 0x01 LANG_ARABIC
24893 + 0x02 LANG_BULGARIAN
24894 + 0x03 LANG_CATALAN
24895 + 0x04 LANG_CHINESE
24896 + 0x05 LANG_CZECH
24897 + 0x06 LANG_DANISH
24898 + 0x07 LANG_GERMAN
24899 + 0x08 LANG_GREEK
24900 + 0x09 LANG_ENGLISH
24901 + 0x0a LANG_SPANISH
24902 + 0x0b LANG_FINNISH
24903 + 0x0c LANG_FRENCH
24904 + 0x0d LANG_HEBREW
24905 + 0x0e LANG_HUNGARIAN
24906 + 0x0f LANG_ICELANDIC
24907 + 0x10 LANG_ITALIAN
24908 + 0x11 LANG_JAPANESE
24909 + 0x12 LANG_KOREAN
24910 + 0x13 LANG_DUTCH
24911 + 0x14 LANG_NORWEGIAN
24912 + 0x15 LANG_POLISH
24913 + 0x16 LANG_PORTUGUESE
24914 + 0x17 LANG_RHAETO_ROMANCE
24915 + 0x18 LANG_ROMANIAN
24916 + 0x19 LANG_RUSSIAN
24917 + 0x1a LANG_CROATIAN == LANG_SERBIAN
24918 + 0x1b LANG_SLOVAK
24919 + 0x1c LANG_ALBANIAN
24920 + 0x1d LANG_SWEDISH
24921 + 0x1e LANG_THAI
24922 + 0x1f LANG_TURKISH
24923 + 0x20 LANG_URDU
24924 + 0x21 LANG_INDONESIAN
24925 + 0x22 LANG_UKRAINIAN
24926 + 0x23 LANG_BELARUSIAN
24927 + 0x24 LANG_SLOVENIAN
24928 + 0x25 LANG_ESTONIAN
24929 + 0x26 LANG_LATVIAN
24930 + 0x27 LANG_LITHUANIAN
24931 + 0x28 LANG_TAJIK
24932 + 0x29 LANG_FARSI
24933 + 0x2a LANG_VIETNAMESE
24934 + 0x2b LANG_ARMENIAN
24935 + 0x2c LANG_AZERI
24936 + 0x2d LANG_BASQUE
24937 + 0x2e LANG_SORBIAN
24938 + 0x2f LANG_MACEDONIAN
24939 + 0x30 LANG_SUTU
24940 + 0x31 LANG_TSONGA
24941 + 0x32 LANG_TSWANA
24942 + 0x33 LANG_VENDA
24943 + 0x34 LANG_XHOSA
24944 + 0x35 LANG_ZULU
24945 + 0x36 LANG_AFRIKAANS
24946 + 0x37 LANG_GEORGIAN
24947 + 0x38 LANG_FAEROESE
24948 + 0x39 LANG_HINDI
24949 + 0x3a LANG_MALTESE
24950 + 0x3b LANG_SAAMI
24951 + 0x3c LANG_GAELIC
24952 + 0x3d LANG_YIDDISH
24953 + 0x3e LANG_MALAY
24954 + 0x3f LANG_KAZAK
24955 + 0x40 LANG_KYRGYZ
24956 + 0x41 LANG_SWAHILI
24957 + 0x42 LANG_TURKMEN
24958 + 0x43 LANG_UZBEK
24959 + 0x44 LANG_TATAR
24960 + 0x45 LANG_BENGALI
24961 + 0x46 LANG_PUNJABI
24962 + 0x47 LANG_GUJARATI
24963 + 0x48 LANG_ORIYA
24964 + 0x49 LANG_TAMIL
24965 + 0x4a LANG_TELUGU
24966 + 0x4b LANG_KANNADA
24967 + 0x4c LANG_MALAYALAM
24968 + 0x4d LANG_ASSAMESE
24969 + 0x4e LANG_MARATHI
24970 + 0x4f LANG_SANSKRIT
24971 + 0x50 LANG_MONGOLIAN
24972 + 0x51 LANG_TIBETAN
24973 + 0x52 LANG_WELSH
24974 + 0x53 LANG_CAMBODIAN
24975 + 0x54 LANG_LAO
24976 + 0x55 LANG_BURMESE
24977 + 0x56 LANG_GALICIAN
24978 + 0x57 LANG_KONKANI
24979 + 0x58 LANG_MANIPURI
24980 + 0x59 LANG_SINDHI
24981 + 0x5a LANG_SYRIAC
24982 + 0x5b LANG_SINHALESE
24983 + 0x5c LANG_CHEROKEE
24984 + 0x5d LANG_INUKTITUT
24985 + 0x5e LANG_AMHARIC
24986 + 0x5f LANG_TAMAZIGHT
24987 + 0x60 LANG_KASHMIRI
24988 + 0x61 LANG_NEPALI
24989 + 0x62 LANG_FRISIAN
24990 + 0x63 LANG_PASHTO
24991 + 0x64 LANG_TAGALOG
24992 + 0x65 LANG_DIVEHI
24993 + 0x66 LANG_EDO
24994 + 0x67 LANG_FULFULDE
24995 + 0x68 LANG_HAUSA
24996 + 0x69 LANG_IBIBIO
24997 + 0x6a LANG_YORUBA
24998 + 0x70 LANG_IGBO
24999 + 0x71 LANG_KANURI
25000 + 0x72 LANG_OROMO
25001 + 0x73 LANG_TIGRINYA
25002 + 0x74 LANG_GUARANI
25003 + 0x75 LANG_HAWAIIAN
25004 + 0x76 LANG_LATIN
25005 + 0x77 LANG_SOMALI
25006 + 0x78 LANG_YI
25007 + 0x79 LANG_PAPIAMENTU
25008 +*/
25009 +/* Mingw headers don't have latest language and sublanguage codes. */
25010 +# ifndef LANG_AFRIKAANS
25011 +# define LANG_AFRIKAANS 0x36
25012 +# endif
25013 +# ifndef LANG_ALBANIAN
25014 +# define LANG_ALBANIAN 0x1c
25015 +# endif
25016 +# ifndef LANG_AMHARIC
25017 +# define LANG_AMHARIC 0x5e
25018 +# endif
25019 +# ifndef LANG_ARABIC
25020 +# define LANG_ARABIC 0x01
25021 +# endif
25022 +# ifndef LANG_ARMENIAN
25023 +# define LANG_ARMENIAN 0x2b
25024 +# endif
25025 +# ifndef LANG_ASSAMESE
25026 +# define LANG_ASSAMESE 0x4d
25027 +# endif
25028 +# ifndef LANG_AZERI
25029 +# define LANG_AZERI 0x2c
25030 +# endif
25031 +# ifndef LANG_BASQUE
25032 +# define LANG_BASQUE 0x2d
25033 +# endif
25034 +# ifndef LANG_BELARUSIAN
25035 +# define LANG_BELARUSIAN 0x23
25036 +# endif
25037 +# ifndef LANG_BENGALI
25038 +# define LANG_BENGALI 0x45
25039 +# endif
25040 +# ifndef LANG_BURMESE
25041 +# define LANG_BURMESE 0x55
25042 +# endif
25043 +# ifndef LANG_CAMBODIAN
25044 +# define LANG_CAMBODIAN 0x53
25045 +# endif
25046 +# ifndef LANG_CATALAN
25047 +# define LANG_CATALAN 0x03
25048 +# endif
25049 +# ifndef LANG_CHEROKEE
25050 +# define LANG_CHEROKEE 0x5c
25051 +# endif
25052 +# ifndef LANG_DIVEHI
25053 +# define LANG_DIVEHI 0x65
25054 +# endif
25055 +# ifndef LANG_EDO
25056 +# define LANG_EDO 0x66
25057 +# endif
25058 +# ifndef LANG_ESTONIAN
25059 +# define LANG_ESTONIAN 0x25
25060 +# endif
25061 +# ifndef LANG_FAEROESE
25062 +# define LANG_FAEROESE 0x38
25063 +# endif
25064 +# ifndef LANG_FARSI
25065 +# define LANG_FARSI 0x29
25066 +# endif
25067 +# ifndef LANG_FRISIAN
25068 +# define LANG_FRISIAN 0x62
25069 +# endif
25070 +# ifndef LANG_FULFULDE
25071 +# define LANG_FULFULDE 0x67
25072 +# endif
25073 +# ifndef LANG_GAELIC
25074 +# define LANG_GAELIC 0x3c
25075 +# endif
25076 +# ifndef LANG_GALICIAN
25077 +# define LANG_GALICIAN 0x56
25078 +# endif
25079 +# ifndef LANG_GEORGIAN
25080 +# define LANG_GEORGIAN 0x37
25081 +# endif
25082 +# ifndef LANG_GUARANI
25083 +# define LANG_GUARANI 0x74
25084 +# endif
25085 +# ifndef LANG_GUJARATI
25086 +# define LANG_GUJARATI 0x47
25087 +# endif
25088 +# ifndef LANG_HAUSA
25089 +# define LANG_HAUSA 0x68
25090 +# endif
25091 +# ifndef LANG_HAWAIIAN
25092 +# define LANG_HAWAIIAN 0x75
25093 +# endif
25094 +# ifndef LANG_HEBREW
25095 +# define LANG_HEBREW 0x0d
25096 +# endif
25097 +# ifndef LANG_HINDI
25098 +# define LANG_HINDI 0x39
25099 +# endif
25100 +# ifndef LANG_IBIBIO
25101 +# define LANG_IBIBIO 0x69
25102 +# endif
25103 +# ifndef LANG_IGBO
25104 +# define LANG_IGBO 0x70
25105 +# endif
25106 +# ifndef LANG_INDONESIAN
25107 +# define LANG_INDONESIAN 0x21
25108 +# endif
25109 +# ifndef LANG_INUKTITUT
25110 +# define LANG_INUKTITUT 0x5d
25111 +# endif
25112 +# ifndef LANG_KANNADA
25113 +# define LANG_KANNADA 0x4b
25114 +# endif
25115 +# ifndef LANG_KANURI
25116 +# define LANG_KANURI 0x71
25117 +# endif
25118 +# ifndef LANG_KASHMIRI
25119 +# define LANG_KASHMIRI 0x60
25120 +# endif
25121 +# ifndef LANG_KAZAK
25122 +# define LANG_KAZAK 0x3f
25123 +# endif
25124 +# ifndef LANG_KONKANI
25125 +# define LANG_KONKANI 0x57
25126 +# endif
25127 +# ifndef LANG_KYRGYZ
25128 +# define LANG_KYRGYZ 0x40
25129 +# endif
25130 +# ifndef LANG_LAO
25131 +# define LANG_LAO 0x54
25132 +# endif
25133 +# ifndef LANG_LATIN
25134 +# define LANG_LATIN 0x76
25135 +# endif
25136 +# ifndef LANG_LATVIAN
25137 +# define LANG_LATVIAN 0x26
25138 +# endif
25139 +# ifndef LANG_LITHUANIAN
25140 +# define LANG_LITHUANIAN 0x27
25141 +# endif
25142 +# ifndef LANG_MACEDONIAN
25143 +# define LANG_MACEDONIAN 0x2f
25144 +# endif
25145 +# ifndef LANG_MALAY
25146 +# define LANG_MALAY 0x3e
25147 +# endif
25148 +# ifndef LANG_MALAYALAM
25149 +# define LANG_MALAYALAM 0x4c
25150 +# endif
25151 +# ifndef LANG_MALTESE
25152 +# define LANG_MALTESE 0x3a
25153 +# endif
25154 +# ifndef LANG_MANIPURI
25155 +# define LANG_MANIPURI 0x58
25156 +# endif
25157 +# ifndef LANG_MARATHI
25158 +# define LANG_MARATHI 0x4e
25159 +# endif
25160 +# ifndef LANG_MONGOLIAN
25161 +# define LANG_MONGOLIAN 0x50
25162 +# endif
25163 +# ifndef LANG_NEPALI
25164 +# define LANG_NEPALI 0x61
25165 +# endif
25166 +# ifndef LANG_ORIYA
25167 +# define LANG_ORIYA 0x48
25168 +# endif
25169 +# ifndef LANG_OROMO
25170 +# define LANG_OROMO 0x72
25171 +# endif
25172 +# ifndef LANG_PAPIAMENTU
25173 +# define LANG_PAPIAMENTU 0x79
25174 +# endif
25175 +# ifndef LANG_PASHTO
25176 +# define LANG_PASHTO 0x63
25177 +# endif
25178 +# ifndef LANG_PUNJABI
25179 +# define LANG_PUNJABI 0x46
25180 +# endif
25181 +# ifndef LANG_RHAETO_ROMANCE
25182 +# define LANG_RHAETO_ROMANCE 0x17
25183 +# endif
25184 +# ifndef LANG_SAAMI
25185 +# define LANG_SAAMI 0x3b
25186 +# endif
25187 +# ifndef LANG_SANSKRIT
25188 +# define LANG_SANSKRIT 0x4f
25189 +# endif
25190 +# ifndef LANG_SERBIAN
25191 +# define LANG_SERBIAN 0x1a
25192 +# endif
25193 +# ifndef LANG_SINDHI
25194 +# define LANG_SINDHI 0x59
25195 +# endif
25196 +# ifndef LANG_SINHALESE
25197 +# define LANG_SINHALESE 0x5b
25198 +# endif
25199 +# ifndef LANG_SLOVAK
25200 +# define LANG_SLOVAK 0x1b
25201 +# endif
25202 +# ifndef LANG_SOMALI
25203 +# define LANG_SOMALI 0x77
25204 +# endif
25205 +# ifndef LANG_SORBIAN
25206 +# define LANG_SORBIAN 0x2e
25207 +# endif
25208 +# ifndef LANG_SUTU
25209 +# define LANG_SUTU 0x30
25210 +# endif
25211 +# ifndef LANG_SWAHILI
25212 +# define LANG_SWAHILI 0x41
25213 +# endif
25214 +# ifndef LANG_SYRIAC
25215 +# define LANG_SYRIAC 0x5a
25216 +# endif
25217 +# ifndef LANG_TAGALOG
25218 +# define LANG_TAGALOG 0x64
25219 +# endif
25220 +# ifndef LANG_TAJIK
25221 +# define LANG_TAJIK 0x28
25222 +# endif
25223 +# ifndef LANG_TAMAZIGHT
25224 +# define LANG_TAMAZIGHT 0x5f
25225 +# endif
25226 +# ifndef LANG_TAMIL
25227 +# define LANG_TAMIL 0x49
25228 +# endif
25229 +# ifndef LANG_TATAR
25230 +# define LANG_TATAR 0x44
25231 +# endif
25232 +# ifndef LANG_TELUGU
25233 +# define LANG_TELUGU 0x4a
25234 +# endif
25235 +# ifndef LANG_THAI
25236 +# define LANG_THAI 0x1e
25237 +# endif
25238 +# ifndef LANG_TIBETAN
25239 +# define LANG_TIBETAN 0x51
25240 +# endif
25241 +# ifndef LANG_TIGRINYA
25242 +# define LANG_TIGRINYA 0x73
25243 +# endif
25244 +# ifndef LANG_TSONGA
25245 +# define LANG_TSONGA 0x31
25246 +# endif
25247 +# ifndef LANG_TSWANA
25248 +# define LANG_TSWANA 0x32
25249 +# endif
25250 +# ifndef LANG_TURKMEN
25251 +# define LANG_TURKMEN 0x42
25252 +# endif
25253 +# ifndef LANG_UKRAINIAN
25254 +# define LANG_UKRAINIAN 0x22
25255 +# endif
25256 +# ifndef LANG_URDU
25257 +# define LANG_URDU 0x20
25258 +# endif
25259 +# ifndef LANG_UZBEK
25260 +# define LANG_UZBEK 0x43
25261 +# endif
25262 +# ifndef LANG_VENDA
25263 +# define LANG_VENDA 0x33
25264 +# endif
25265 +# ifndef LANG_VIETNAMESE
25266 +# define LANG_VIETNAMESE 0x2a
25267 +# endif
25268 +# ifndef LANG_WELSH
25269 +# define LANG_WELSH 0x52
25270 +# endif
25271 +# ifndef LANG_XHOSA
25272 +# define LANG_XHOSA 0x34
25273 +# endif
25274 +# ifndef LANG_YI
25275 +# define LANG_YI 0x78
25276 +# endif
25277 +# ifndef LANG_YIDDISH
25278 +# define LANG_YIDDISH 0x3d
25279 +# endif
25280 +# ifndef LANG_YORUBA
25281 +# define LANG_YORUBA 0x6a
25282 +# endif
25283 +# ifndef LANG_ZULU
25284 +# define LANG_ZULU 0x35
25285 +# endif
25286 +# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
25287 +# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
25288 +# endif
25289 +# ifndef SUBLANG_ARABIC_IRAQ
25290 +# define SUBLANG_ARABIC_IRAQ 0x02
25291 +# endif
25292 +# ifndef SUBLANG_ARABIC_EGYPT
25293 +# define SUBLANG_ARABIC_EGYPT 0x03
25294 +# endif
25295 +# ifndef SUBLANG_ARABIC_LIBYA
25296 +# define SUBLANG_ARABIC_LIBYA 0x04
25297 +# endif
25298 +# ifndef SUBLANG_ARABIC_ALGERIA
25299 +# define SUBLANG_ARABIC_ALGERIA 0x05
25300 +# endif
25301 +# ifndef SUBLANG_ARABIC_MOROCCO
25302 +# define SUBLANG_ARABIC_MOROCCO 0x06
25303 +# endif
25304 +# ifndef SUBLANG_ARABIC_TUNISIA
25305 +# define SUBLANG_ARABIC_TUNISIA 0x07
25306 +# endif
25307 +# ifndef SUBLANG_ARABIC_OMAN
25308 +# define SUBLANG_ARABIC_OMAN 0x08
25309 +# endif
25310 +# ifndef SUBLANG_ARABIC_YEMEN
25311 +# define SUBLANG_ARABIC_YEMEN 0x09
25312 +# endif
25313 +# ifndef SUBLANG_ARABIC_SYRIA
25314 +# define SUBLANG_ARABIC_SYRIA 0x0a
25315 +# endif
25316 +# ifndef SUBLANG_ARABIC_JORDAN
25317 +# define SUBLANG_ARABIC_JORDAN 0x0b
25318 +# endif
25319 +# ifndef SUBLANG_ARABIC_LEBANON
25320 +# define SUBLANG_ARABIC_LEBANON 0x0c
25321 +# endif
25322 +# ifndef SUBLANG_ARABIC_KUWAIT
25323 +# define SUBLANG_ARABIC_KUWAIT 0x0d
25324 +# endif
25325 +# ifndef SUBLANG_ARABIC_UAE
25326 +# define SUBLANG_ARABIC_UAE 0x0e
25327 +# endif
25328 +# ifndef SUBLANG_ARABIC_BAHRAIN
25329 +# define SUBLANG_ARABIC_BAHRAIN 0x0f
25330 +# endif
25331 +# ifndef SUBLANG_ARABIC_QATAR
25332 +# define SUBLANG_ARABIC_QATAR 0x10
25333 +# endif
25334 +# ifndef SUBLANG_AZERI_LATIN
25335 +# define SUBLANG_AZERI_LATIN 0x01
25336 +# endif
25337 +# ifndef SUBLANG_AZERI_CYRILLIC
25338 +# define SUBLANG_AZERI_CYRILLIC 0x02
25339 +# endif
25340 +# ifndef SUBLANG_BENGALI_INDIA
25341 +# define SUBLANG_BENGALI_INDIA 0x00
25342 +# endif
25343 +# ifndef SUBLANG_BENGALI_BANGLADESH
25344 +# define SUBLANG_BENGALI_BANGLADESH 0x01
25345 +# endif
25346 +# ifndef SUBLANG_CHINESE_MACAU
25347 +# define SUBLANG_CHINESE_MACAU 0x05
25348 +# endif
25349 +# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
25350 +# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
25351 +# endif
25352 +# ifndef SUBLANG_ENGLISH_JAMAICA
25353 +# define SUBLANG_ENGLISH_JAMAICA 0x08
25354 +# endif
25355 +# ifndef SUBLANG_ENGLISH_CARIBBEAN
25356 +# define SUBLANG_ENGLISH_CARIBBEAN 0x09
25357 +# endif
25358 +# ifndef SUBLANG_ENGLISH_BELIZE
25359 +# define SUBLANG_ENGLISH_BELIZE 0x0a
25360 +# endif
25361 +# ifndef SUBLANG_ENGLISH_TRINIDAD
25362 +# define SUBLANG_ENGLISH_TRINIDAD 0x0b
25363 +# endif
25364 +# ifndef SUBLANG_ENGLISH_ZIMBABWE
25365 +# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
25366 +# endif
25367 +# ifndef SUBLANG_ENGLISH_PHILIPPINES
25368 +# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
25369 +# endif
25370 +# ifndef SUBLANG_ENGLISH_INDONESIA
25371 +# define SUBLANG_ENGLISH_INDONESIA 0x0e
25372 +# endif
25373 +# ifndef SUBLANG_ENGLISH_HONGKONG
25374 +# define SUBLANG_ENGLISH_HONGKONG 0x0f
25375 +# endif
25376 +# ifndef SUBLANG_ENGLISH_INDIA
25377 +# define SUBLANG_ENGLISH_INDIA 0x10
25378 +# endif
25379 +# ifndef SUBLANG_ENGLISH_MALAYSIA
25380 +# define SUBLANG_ENGLISH_MALAYSIA 0x11
25381 +# endif
25382 +# ifndef SUBLANG_ENGLISH_SINGAPORE
25383 +# define SUBLANG_ENGLISH_SINGAPORE 0x12
25384 +# endif
25385 +# ifndef SUBLANG_FRENCH_LUXEMBOURG
25386 +# define SUBLANG_FRENCH_LUXEMBOURG 0x05
25387 +# endif
25388 +# ifndef SUBLANG_FRENCH_MONACO
25389 +# define SUBLANG_FRENCH_MONACO 0x06
25390 +# endif
25391 +# ifndef SUBLANG_FRENCH_WESTINDIES
25392 +# define SUBLANG_FRENCH_WESTINDIES 0x07
25393 +# endif
25394 +# ifndef SUBLANG_FRENCH_REUNION
25395 +# define SUBLANG_FRENCH_REUNION 0x08
25396 +# endif
25397 +# ifndef SUBLANG_FRENCH_CONGO
25398 +# define SUBLANG_FRENCH_CONGO 0x09
25399 +# endif
25400 +# ifndef SUBLANG_FRENCH_SENEGAL
25401 +# define SUBLANG_FRENCH_SENEGAL 0x0a
25402 +# endif
25403 +# ifndef SUBLANG_FRENCH_CAMEROON
25404 +# define SUBLANG_FRENCH_CAMEROON 0x0b
25405 +# endif
25406 +# ifndef SUBLANG_FRENCH_COTEDIVOIRE
25407 +# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
25408 +# endif
25409 +# ifndef SUBLANG_FRENCH_MALI
25410 +# define SUBLANG_FRENCH_MALI 0x0d
25411 +# endif
25412 +# ifndef SUBLANG_FRENCH_MOROCCO
25413 +# define SUBLANG_FRENCH_MOROCCO 0x0e
25414 +# endif
25415 +# ifndef SUBLANG_FRENCH_HAITI
25416 +# define SUBLANG_FRENCH_HAITI 0x0f
25417 +# endif
25418 +# ifndef SUBLANG_GERMAN_LUXEMBOURG
25419 +# define SUBLANG_GERMAN_LUXEMBOURG 0x04
25420 +# endif
25421 +# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
25422 +# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
25423 +# endif
25424 +# ifndef SUBLANG_KASHMIRI_INDIA
25425 +# define SUBLANG_KASHMIRI_INDIA 0x02
25426 +# endif
25427 +# ifndef SUBLANG_MALAY_MALAYSIA
25428 +# define SUBLANG_MALAY_MALAYSIA 0x01
25429 +# endif
25430 +# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
25431 +# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
25432 +# endif
25433 +# ifndef SUBLANG_NEPALI_INDIA
25434 +# define SUBLANG_NEPALI_INDIA 0x02
25435 +# endif
25436 +# ifndef SUBLANG_PUNJABI_INDIA
25437 +# define SUBLANG_PUNJABI_INDIA 0x00
25438 +# endif
25439 +# ifndef SUBLANG_PUNJABI_PAKISTAN
25440 +# define SUBLANG_PUNJABI_PAKISTAN 0x01
25441 +# endif
25442 +# ifndef SUBLANG_ROMANIAN_ROMANIA
25443 +# define SUBLANG_ROMANIAN_ROMANIA 0x00
25444 +# endif
25445 +# ifndef SUBLANG_ROMANIAN_MOLDOVA
25446 +# define SUBLANG_ROMANIAN_MOLDOVA 0x01
25447 +# endif
25448 +# ifndef SUBLANG_SERBIAN_LATIN
25449 +# define SUBLANG_SERBIAN_LATIN 0x02
25450 +# endif
25451 +# ifndef SUBLANG_SERBIAN_CYRILLIC
25452 +# define SUBLANG_SERBIAN_CYRILLIC 0x03
25453 +# endif
25454 +# ifndef SUBLANG_SINDHI_INDIA
25455 +# define SUBLANG_SINDHI_INDIA 0x00
25456 +# endif
25457 +# ifndef SUBLANG_SINDHI_PAKISTAN
25458 +# define SUBLANG_SINDHI_PAKISTAN 0x01
25459 +# endif
25460 +# ifndef SUBLANG_SPANISH_GUATEMALA
25461 +# define SUBLANG_SPANISH_GUATEMALA 0x04
25462 +# endif
25463 +# ifndef SUBLANG_SPANISH_COSTA_RICA
25464 +# define SUBLANG_SPANISH_COSTA_RICA 0x05
25465 +# endif
25466 +# ifndef SUBLANG_SPANISH_PANAMA
25467 +# define SUBLANG_SPANISH_PANAMA 0x06
25468 +# endif
25469 +# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
25470 +# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
25471 +# endif
25472 +# ifndef SUBLANG_SPANISH_VENEZUELA
25473 +# define SUBLANG_SPANISH_VENEZUELA 0x08
25474 +# endif
25475 +# ifndef SUBLANG_SPANISH_COLOMBIA
25476 +# define SUBLANG_SPANISH_COLOMBIA 0x09
25477 +# endif
25478 +# ifndef SUBLANG_SPANISH_PERU
25479 +# define SUBLANG_SPANISH_PERU 0x0a
25480 +# endif
25481 +# ifndef SUBLANG_SPANISH_ARGENTINA
25482 +# define SUBLANG_SPANISH_ARGENTINA 0x0b
25483 +# endif
25484 +# ifndef SUBLANG_SPANISH_ECUADOR
25485 +# define SUBLANG_SPANISH_ECUADOR 0x0c
25486 +# endif
25487 +# ifndef SUBLANG_SPANISH_CHILE
25488 +# define SUBLANG_SPANISH_CHILE 0x0d
25489 +# endif
25490 +# ifndef SUBLANG_SPANISH_URUGUAY
25491 +# define SUBLANG_SPANISH_URUGUAY 0x0e
25492 +# endif
25493 +# ifndef SUBLANG_SPANISH_PARAGUAY
25494 +# define SUBLANG_SPANISH_PARAGUAY 0x0f
25495 +# endif
25496 +# ifndef SUBLANG_SPANISH_BOLIVIA
25497 +# define SUBLANG_SPANISH_BOLIVIA 0x10
25498 +# endif
25499 +# ifndef SUBLANG_SPANISH_EL_SALVADOR
25500 +# define SUBLANG_SPANISH_EL_SALVADOR 0x11
25501 +# endif
25502 +# ifndef SUBLANG_SPANISH_HONDURAS
25503 +# define SUBLANG_SPANISH_HONDURAS 0x12
25504 +# endif
25505 +# ifndef SUBLANG_SPANISH_NICARAGUA
25506 +# define SUBLANG_SPANISH_NICARAGUA 0x13
25507 +# endif
25508 +# ifndef SUBLANG_SPANISH_PUERTO_RICO
25509 +# define SUBLANG_SPANISH_PUERTO_RICO 0x14
25510 +# endif
25511 +# ifndef SUBLANG_SWEDISH_FINLAND
25512 +# define SUBLANG_SWEDISH_FINLAND 0x02
25513 +# endif
25514 +# ifndef SUBLANG_TAMAZIGHT_ARABIC
25515 +# define SUBLANG_TAMAZIGHT_ARABIC 0x01
25516 +# endif
25517 +# ifndef SUBLANG_TAMAZIGHT_LATIN
25518 +# define SUBLANG_TAMAZIGHT_LATIN 0x02
25519 +# endif
25520 +# ifndef SUBLANG_TIGRINYA_ETHIOPIA
25521 +# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
25522 +# endif
25523 +# ifndef SUBLANG_TIGRINYA_ERITREA
25524 +# define SUBLANG_TIGRINYA_ERITREA 0x01
25525 +# endif
25526 +# ifndef SUBLANG_URDU_PAKISTAN
25527 +# define SUBLANG_URDU_PAKISTAN 0x01
25528 +# endif
25529 +# ifndef SUBLANG_URDU_INDIA
25530 +# define SUBLANG_URDU_INDIA 0x02
25531 +# endif
25532 +# ifndef SUBLANG_UZBEK_LATIN
25533 +# define SUBLANG_UZBEK_LATIN 0x01
25534 +# endif
25535 +# ifndef SUBLANG_UZBEK_CYRILLIC
25536 +# define SUBLANG_UZBEK_CYRILLIC 0x02
25537 +# endif
25538 +#endif
25539 +
25540 +/* XPG3 defines the result of 'setlocale (category, NULL)' as:
25541 + "Directs 'setlocale()' to query 'category' and return the current
25542 + setting of 'local'."
25543 + However it does not specify the exact format. Neither do SUSV2 and
25544 + ISO C 99. So we can use this feature only on selected systems (e.g.
25545 + those using GNU C Library). */
25546 +#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
25547 +# define HAVE_LOCALE_NULL
25548 +#endif
25549 +
25550 +/* Determine the current locale's name, and canonicalize it into XPG syntax
25551 + language[_territory[.codeset]][@modifier]
25552 + The codeset part in the result is not reliable; the locale_charset()
25553 + should be used for codeset information instead.
25554 + The result must not be freed; it is statically allocated. */
25555 +
25556 +const char *
25557 +_nl_locale_name (int category, const char *categoryname)
25558 +{
25559 + const char *retval;
25560 +
25561 +#ifndef WIN32
25562 +
25563 + /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
25564 + On some systems this can be done by the 'setlocale' function itself. */
25565 +# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
25566 + retval = setlocale (category, NULL);
25567 +# else
25568 + /* Setting of LC_ALL overwrites all other. */
25569 + retval = getenv ("LC_ALL");
25570 + if (retval == NULL || retval[0] == '\0')
25571 + {
25572 + /* Next comes the name of the desired category. */
25573 + retval = getenv (categoryname);
25574 + if (retval == NULL || retval[0] == '\0')
25575 + {
25576 + /* Last possibility is the LANG environment variable. */
25577 + retval = getenv ("LANG");
25578 + if (retval == NULL || retval[0] == '\0')
25579 + /* We use C as the default domain. POSIX says this is
25580 + implementation defined. */
25581 + retval = "C";
25582 + }
25583 + }
25584 +# endif
25585 +
25586 + return retval;
25587 +
25588 +#else /* WIN32 */
25589 +
25590 + /* Return an XPG style locale name language[_territory][@modifier].
25591 + Don't even bother determining the codeset; it's not useful in this
25592 + context, because message catalogs are not specific to a single
25593 + codeset. */
25594 +
25595 + LCID lcid;
25596 + LANGID langid;
25597 + int primary, sub;
25598 +
25599 + /* Let the user override the system settings through environment
25600 + variables, as on POSIX systems. */
25601 + retval = getenv ("LC_ALL");
25602 + if (retval != NULL && retval[0] != '\0')
25603 + return retval;
25604 + retval = getenv (categoryname);
25605 + if (retval != NULL && retval[0] != '\0')
25606 + return retval;
25607 + retval = getenv ("LANG");
25608 + if (retval != NULL && retval[0] != '\0')
25609 + return retval;
25610 +
25611 + /* Use native Win32 API locale ID. */
25612 + lcid = GetThreadLocale ();
25613 +
25614 + /* Strip off the sorting rules, keep only the language part. */
25615 + langid = LANGIDFROMLCID (lcid);
25616 +
25617 + /* Split into language and territory part. */
25618 + primary = PRIMARYLANGID (langid);
25619 + sub = SUBLANGID (langid);
25620 +
25621 + /* Dispatch on language.
25622 + See also http://www.unicode.org/unicode/onlinedat/languages.html .
25623 + For details about languages, see http://www.ethnologue.com/ . */
25624 + switch (primary)
25625 + {
25626 + case LANG_AFRIKAANS: return "af_ZA";
25627 + case LANG_ALBANIAN: return "sq_AL";
25628 + case LANG_AMHARIC: return "am_ET";
25629 + case LANG_ARABIC:
25630 + switch (sub)
25631 + {
25632 + case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
25633 + case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
25634 + case SUBLANG_ARABIC_EGYPT: return "ar_EG";
25635 + case SUBLANG_ARABIC_LIBYA: return "ar_LY";
25636 + case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
25637 + case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
25638 + case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
25639 + case SUBLANG_ARABIC_OMAN: return "ar_OM";
25640 + case SUBLANG_ARABIC_YEMEN: return "ar_YE";
25641 + case SUBLANG_ARABIC_SYRIA: return "ar_SY";
25642 + case SUBLANG_ARABIC_JORDAN: return "ar_JO";
25643 + case SUBLANG_ARABIC_LEBANON: return "ar_LB";
25644 + case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
25645 + case SUBLANG_ARABIC_UAE: return "ar_AE";
25646 + case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
25647 + case SUBLANG_ARABIC_QATAR: return "ar_QA";
25648 + }
25649 + return "ar";
25650 + case LANG_ARMENIAN: return "hy_AM";
25651 + case LANG_ASSAMESE: return "as_IN";
25652 + case LANG_AZERI:
25653 + switch (sub)
25654 + {
25655 + /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
25656 + case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
25657 + case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
25658 + }
25659 + return "az";
25660 + case LANG_BASQUE:
25661 + return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
25662 + case LANG_BELARUSIAN: return "be_BY";
25663 + case LANG_BENGALI:
25664 + switch (sub)
25665 + {
25666 + case SUBLANG_BENGALI_INDIA: return "bn_IN";
25667 + case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
25668 + }
25669 + return "bn";
25670 + case LANG_BULGARIAN: return "bg_BG";
25671 + case LANG_BURMESE: return "my_MM";
25672 + case LANG_CAMBODIAN: return "km_KH";
25673 + case LANG_CATALAN: return "ca_ES";
25674 + case LANG_CHEROKEE: return "chr_US";
25675 + case LANG_CHINESE:
25676 + switch (sub)
25677 + {
25678 + case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
25679 + case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
25680 + case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
25681 + case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
25682 + case SUBLANG_CHINESE_MACAU: return "zh_MO";
25683 + }
25684 + return "zh";
25685 + case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
25686 + * What used to be called Serbo-Croatian
25687 + * should really now be two separate
25688 + * languages because of political reasons.
25689 + * (Says tml, who knows nothing about Serbian
25690 + * or Croatian.)
25691 + * (I can feel those flames coming already.)
25692 + */
25693 + switch (sub)
25694 + {
25695 + case SUBLANG_DEFAULT: return "hr_HR";
25696 + case SUBLANG_SERBIAN_LATIN: return "sr_CS";
25697 + case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
25698 + }
25699 + return "hr";
25700 + case LANG_CZECH: return "cs_CZ";
25701 + case LANG_DANISH: return "da_DK";
25702 + case LANG_DIVEHI: return "dv_MV";
25703 + case LANG_DUTCH:
25704 + switch (sub)
25705 + {
25706 + case SUBLANG_DUTCH: return "nl_NL";
25707 + case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
25708 + }
25709 + return "nl";
25710 + case LANG_EDO: return "bin_NG";
25711 + case LANG_ENGLISH:
25712 + switch (sub)
25713 + {
25714 + /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
25715 + * English was the language spoken in England.
25716 + * Oh well.
25717 + */
25718 + case SUBLANG_ENGLISH_US: return "en_US";
25719 + case SUBLANG_ENGLISH_UK: return "en_GB";
25720 + case SUBLANG_ENGLISH_AUS: return "en_AU";
25721 + case SUBLANG_ENGLISH_CAN: return "en_CA";
25722 + case SUBLANG_ENGLISH_NZ: return "en_NZ";
25723 + case SUBLANG_ENGLISH_EIRE: return "en_IE";
25724 + case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
25725 + case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
25726 + case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
25727 + case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
25728 + case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
25729 + case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
25730 + case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
25731 + case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
25732 + case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
25733 + case SUBLANG_ENGLISH_INDIA: return "en_IN";
25734 + case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
25735 + case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
25736 + }
25737 + return "en";
25738 + case LANG_ESTONIAN: return "et_EE";
25739 + case LANG_FAEROESE: return "fo_FO";
25740 + case LANG_FARSI: return "fa_IR";
25741 + case LANG_FINNISH: return "fi_FI";
25742 + case LANG_FRENCH:
25743 + switch (sub)
25744 + {
25745 + case SUBLANG_FRENCH: return "fr_FR";
25746 + case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
25747 + case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
25748 + case SUBLANG_FRENCH_SWISS: return "fr_CH";
25749 + case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
25750 + case SUBLANG_FRENCH_MONACO: return "fr_MC";
25751 + case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
25752 + case SUBLANG_FRENCH_REUNION: return "fr_RE";
25753 + case SUBLANG_FRENCH_CONGO: return "fr_CG";
25754 + case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
25755 + case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
25756 + case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
25757 + case SUBLANG_FRENCH_MALI: return "fr_ML";
25758 + case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
25759 + case SUBLANG_FRENCH_HAITI: return "fr_HT";
25760 + }
25761 + return "fr";
25762 + case LANG_FRISIAN: return "fy_NL";
25763 + case LANG_FULFULDE:
25764 + /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
25765 + return "ff_NG";
25766 + case LANG_GAELIC:
25767 + switch (sub)
25768 + {
25769 + case 0x01: /* SCOTTISH */ return "gd_GB";
25770 + case 0x02: /* IRISH */ return "ga_IE";
25771 + }
25772 + return "C";
25773 + case LANG_GALICIAN: return "gl_ES";
25774 + case LANG_GEORGIAN: return "ka_GE";
25775 + case LANG_GERMAN:
25776 + switch (sub)
25777 + {
25778 + case SUBLANG_GERMAN: return "de_DE";
25779 + case SUBLANG_GERMAN_SWISS: return "de_CH";
25780 + case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
25781 + case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
25782 + case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
25783 + }
25784 + return "de";
25785 + case LANG_GREEK: return "el_GR";
25786 + case LANG_GUARANI: return "gn_PY";
25787 + case LANG_GUJARATI: return "gu_IN";
25788 + case LANG_HAUSA: return "ha_NG";
25789 + case LANG_HAWAIIAN:
25790 + /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
25791 + or Hawaii Creole English ("cpe_US", 600000 speakers)? */
25792 + return "cpe_US";
25793 + case LANG_HEBREW: return "he_IL";
25794 + case LANG_HINDI: return "hi_IN";
25795 + case LANG_HUNGARIAN: return "hu_HU";
25796 + case LANG_IBIBIO: return "nic_NG";
25797 + case LANG_ICELANDIC: return "is_IS";
25798 + case LANG_IGBO: return "ig_NG";
25799 + case LANG_INDONESIAN: return "id_ID";
25800 + case LANG_INUKTITUT: return "iu_CA";
25801 + case LANG_ITALIAN:
25802 + switch (sub)
25803 + {
25804 + case SUBLANG_ITALIAN: return "it_IT";
25805 + case SUBLANG_ITALIAN_SWISS: return "it_CH";
25806 + }
25807 + return "it";
25808 + case LANG_JAPANESE: return "ja_JP";
25809 + case LANG_KANNADA: return "kn_IN";
25810 + case LANG_KANURI: return "kr_NG";
25811 + case LANG_KASHMIRI:
25812 + switch (sub)
25813 + {
25814 + case SUBLANG_DEFAULT: return "ks_PK";
25815 + case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
25816 + }
25817 + return "ks";
25818 + case LANG_KAZAK: return "kk_KZ";
25819 + case LANG_KONKANI:
25820 + /* FIXME: Adjust this when such locales appear on Unix. */
25821 + return "kok_IN";
25822 + case LANG_KOREAN: return "ko_KR";
25823 + case LANG_KYRGYZ: return "ky_KG";
25824 + case LANG_LAO: return "lo_LA";
25825 + case LANG_LATIN: return "la_VA";
25826 + case LANG_LATVIAN: return "lv_LV";
25827 + case LANG_LITHUANIAN: return "lt_LT";
25828 + case LANG_MACEDONIAN: return "mk_MK";
25829 + case LANG_MALAY:
25830 + switch (sub)
25831 + {
25832 + case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
25833 + case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
25834 + }
25835 + return "ms";
25836 + case LANG_MALAYALAM: return "ml_IN";
25837 + case LANG_MALTESE: return "mt_MT";
25838 + case LANG_MANIPURI:
25839 + /* FIXME: Adjust this when such locales appear on Unix. */
25840 + return "mni_IN";
25841 + case LANG_MARATHI: return "mr_IN";
25842 + case LANG_MONGOLIAN:
25843 + return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
25844 + case LANG_NEPALI:
25845 + switch (sub)
25846 + {
25847 + case SUBLANG_DEFAULT: return "ne_NP";
25848 + case SUBLANG_NEPALI_INDIA: return "ne_IN";
25849 + }
25850 + return "ne";
25851 + case LANG_NORWEGIAN:
25852 + switch (sub)
25853 + {
25854 + case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
25855 + case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
25856 + }
25857 + return "no";
25858 + case LANG_ORIYA: return "or_IN";
25859 + case LANG_OROMO: return "om_ET";
25860 + case LANG_PAPIAMENTU: return "pap_AN";
25861 + case LANG_PASHTO:
25862 + return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
25863 + case LANG_POLISH: return "pl_PL";
25864 + case LANG_PORTUGUESE:
25865 + switch (sub)
25866 + {
25867 + case SUBLANG_PORTUGUESE: return "pt_PT";
25868 + /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
25869 + Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
25870 + case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
25871 + }
25872 + return "pt";
25873 + case LANG_PUNJABI:
25874 + switch (sub)
25875 + {
25876 + case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
25877 + case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
25878 + }
25879 + return "pa";
25880 + case LANG_RHAETO_ROMANCE: return "rm_CH";
25881 + case LANG_ROMANIAN:
25882 + switch (sub)
25883 + {
25884 + case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
25885 + case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
25886 + }
25887 + return "ro";
25888 + case LANG_RUSSIAN:
25889 + return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
25890 + case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
25891 + case LANG_SANSKRIT: return "sa_IN";
25892 + case LANG_SINDHI:
25893 + switch (sub)
25894 + {
25895 + case SUBLANG_SINDHI_INDIA: return "sd_IN";
25896 + case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
25897 + }
25898 + return "sd";
25899 + case LANG_SINHALESE: return "si_LK";
25900 + case LANG_SLOVAK: return "sk_SK";
25901 + case LANG_SLOVENIAN: return "sl_SI";
25902 + case LANG_SOMALI: return "so_SO";
25903 + case LANG_SORBIAN:
25904 + /* FIXME: Adjust this when such locales appear on Unix. */
25905 + return "wen_DE";
25906 + case LANG_SPANISH:
25907 + switch (sub)
25908 + {
25909 + case SUBLANG_SPANISH: return "es_ES";
25910 + case SUBLANG_SPANISH_MEXICAN: return "es_MX";
25911 + case SUBLANG_SPANISH_MODERN:
25912 + return "es_ES@modern"; /* not seen on Unix */
25913 + case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
25914 + case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
25915 + case SUBLANG_SPANISH_PANAMA: return "es_PA";
25916 + case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
25917 + case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
25918 + case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
25919 + case SUBLANG_SPANISH_PERU: return "es_PE";
25920 + case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
25921 + case SUBLANG_SPANISH_ECUADOR: return "es_EC";
25922 + case SUBLANG_SPANISH_CHILE: return "es_CL";
25923 + case SUBLANG_SPANISH_URUGUAY: return "es_UY";
25924 + case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
25925 + case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
25926 + case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
25927 + case SUBLANG_SPANISH_HONDURAS: return "es_HN";
25928 + case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
25929 + case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
25930 + }
25931 + return "es";
25932 + case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
25933 + case LANG_SWAHILI: return "sw_KE";
25934 + case LANG_SWEDISH:
25935 + switch (sub)
25936 + {
25937 + case SUBLANG_DEFAULT: return "sv_SE";
25938 + case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
25939 + }
25940 + return "sv";
25941 + case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
25942 + case LANG_TAGALOG: return "tl_PH";
25943 + case LANG_TAJIK: return "tg_TJ";
25944 + case LANG_TAMAZIGHT:
25945 + switch (sub)
25946 + {
25947 + /* FIXME: Adjust this when Tamazight locales appear on Unix. */
25948 + case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
25949 + case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
25950 + }
25951 + return "ber_MA";
25952 + case LANG_TAMIL:
25953 + return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
25954 + case LANG_TATAR: return "tt_RU";
25955 + case LANG_TELUGU: return "te_IN";
25956 + case LANG_THAI: return "th_TH";
25957 + case LANG_TIBETAN: return "bo_CN";
25958 + case LANG_TIGRINYA:
25959 + switch (sub)
25960 + {
25961 + case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
25962 + case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
25963 + }
25964 + return "ti";
25965 + case LANG_TSONGA: return "ts_ZA";
25966 + case LANG_TSWANA: return "tn_BW";
25967 + case LANG_TURKISH: return "tr_TR";
25968 + case LANG_TURKMEN: return "tk_TM";
25969 + case LANG_UKRAINIAN: return "uk_UA";
25970 + case LANG_URDU:
25971 + switch (sub)
25972 + {
25973 + case SUBLANG_URDU_PAKISTAN: return "ur_PK";
25974 + case SUBLANG_URDU_INDIA: return "ur_IN";
25975 + }
25976 + return "ur";
25977 + case LANG_UZBEK:
25978 + switch (sub)
25979 + {
25980 + case SUBLANG_UZBEK_LATIN: return "uz_UZ";
25981 + case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
25982 + }
25983 + return "uz";
25984 + case LANG_VENDA: return "ve_ZA";
25985 + case LANG_VIETNAMESE: return "vi_VN";
25986 + case LANG_WELSH: return "cy_GB";
25987 + case LANG_XHOSA: return "xh_ZA";
25988 + case LANG_YI: return "sit_CN";
25989 + case LANG_YIDDISH: return "yi_IL";
25990 + case LANG_YORUBA: return "yo_NG";
25991 + case LANG_ZULU: return "zu_ZA";
25992 + default: return "C";
25993 + }
25994 +
25995 +#endif
25996 +}
25997 --- /dev/null
25998 +++ lxpanel-0.5.6/intl/loadinfo.h
25999 @@ -0,0 +1,145 @@
26000 +/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
26001 + This file is part of the GNU C Library.
26002 + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
26003 +
26004 + This program is free software; you can redistribute it and/or modify it
26005 + under the terms of the GNU Library General Public License as published
26006 + by the Free Software Foundation; either version 2, or (at your option)
26007 + any later version.
26008 +
26009 + This program is distributed in the hope that it will be useful,
26010 + but WITHOUT ANY WARRANTY; without even the implied warranty of
26011 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26012 + Library General Public License for more details.
26013 +
26014 + You should have received a copy of the GNU Library General Public
26015 + License along with this program; if not, write to the Free Software
26016 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
26017 + USA. */
26018 +
26019 +#ifndef _LOADINFO_H
26020 +#define _LOADINFO_H 1
26021 +
26022 +/* Declarations of locale dependent catalog lookup functions.
26023 + Implemented in
26024 +
26025 + localealias.c Possibly replace a locale name by another.
26026 + explodename.c Split a locale name into its various fields.
26027 + l10nflist.c Generate a list of filenames of possible message catalogs.
26028 + finddomain.c Find and open the relevant message catalogs.
26029 +
26030 + The main function _nl_find_domain() in finddomain.c is declared
26031 + in gettextP.h.
26032 + */
26033 +
26034 +#ifndef internal_function
26035 +# define internal_function
26036 +#endif
26037 +
26038 +/* Tell the compiler when a conditional or integer expression is
26039 + almost always true or almost always false. */
26040 +#ifndef HAVE_BUILTIN_EXPECT
26041 +# define __builtin_expect(expr, val) (expr)
26042 +#endif
26043 +
26044 +/* Separator in PATH like lists of pathnames. */
26045 +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
26046 + /* Win32, OS/2, DOS */
26047 +# define PATH_SEPARATOR ';'
26048 +#else
26049 + /* Unix */
26050 +# define PATH_SEPARATOR ':'
26051 +#endif
26052 +
26053 +/* Encoding of locale name parts. */
26054 +#define CEN_REVISION 1
26055 +#define CEN_SPONSOR 2
26056 +#define CEN_SPECIAL 4
26057 +#define XPG_NORM_CODESET 8
26058 +#define XPG_CODESET 16
26059 +#define TERRITORY 32
26060 +#define CEN_AUDIENCE 64
26061 +#define XPG_MODIFIER 128
26062 +
26063 +#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
26064 +#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
26065 +
26066 +
26067 +struct loaded_l10nfile
26068 +{
26069 + const char *filename;
26070 + int decided;
26071 +
26072 + const void *data;
26073 +
26074 + struct loaded_l10nfile *next;
26075 + struct loaded_l10nfile *successor[1];
26076 +};
26077 +
26078 +
26079 +/* Normalize codeset name. There is no standard for the codeset
26080 + names. Normalization allows the user to use any of the common
26081 + names. The return value is dynamically allocated and has to be
26082 + freed by the caller. */
26083 +extern const char *_nl_normalize_codeset (const char *codeset,
26084 + size_t name_len);
26085 +
26086 +/* Lookup a locale dependent file.
26087 + *L10NFILE_LIST denotes a pool of lookup results of locale dependent
26088 + files of the same kind, sorted in decreasing order of ->filename.
26089 + DIRLIST and DIRLIST_LEN are an argz list of directories in which to
26090 + look, containing at least one directory (i.e. DIRLIST_LEN > 0).
26091 + MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
26092 + SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
26093 + produced by _nl_explode_name(). FILENAME is the filename suffix.
26094 + The return value is the lookup result, either found in *L10NFILE_LIST,
26095 + or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
26096 + If the return value is non-NULL, it is added to *L10NFILE_LIST, and
26097 + its ->next field denotes the chaining inside *L10NFILE_LIST, and
26098 + furthermore its ->successor[] field contains a list of other lookup
26099 + results from which this lookup result inherits. */
26100 +extern struct loaded_l10nfile *
26101 +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
26102 + const char *dirlist, size_t dirlist_len, int mask,
26103 + const char *language, const char *territory,
26104 + const char *codeset, const char *normalized_codeset,
26105 + const char *modifier, const char *special,
26106 + const char *sponsor, const char *revision,
26107 + const char *filename, int do_allocate);
26108 +
26109 +/* Lookup the real locale name for a locale alias NAME, or NULL if
26110 + NAME is not a locale alias (but possibly a real locale name).
26111 + The return value is statically allocated and must not be freed. */
26112 +extern const char *_nl_expand_alias (const char *name);
26113 +
26114 +/* Split a locale name NAME into its pieces: language, modifier,
26115 + territory, codeset, special, sponsor, revision.
26116 + NAME gets destructively modified: NUL bytes are inserted here and
26117 + there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
26118 + *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
26119 + pointer into the old NAME string, or NULL. *NORMALIZED_CODESET
26120 + gets assigned the expanded *CODESET, if it is different from *CODESET;
26121 + this one is dynamically allocated and has to be freed by the caller.
26122 + The return value is a bitmask, where each bit corresponds to one
26123 + filled-in value:
26124 + XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER,
26125 + TERRITORY for *TERRITORY,
26126 + XPG_CODESET for *CODESET,
26127 + XPG_NORM_CODESET for *NORMALIZED_CODESET,
26128 + CEN_SPECIAL for *SPECIAL,
26129 + CEN_SPONSOR for *SPONSOR,
26130 + CEN_REVISION for *REVISION.
26131 + */
26132 +extern int _nl_explode_name (char *name, const char **language,
26133 + const char **modifier, const char **territory,
26134 + const char **codeset,
26135 + const char **normalized_codeset,
26136 + const char **special, const char **sponsor,
26137 + const char **revision);
26138 +
26139 +/* Split a locale name NAME into a leading language part and all the
26140 + rest. Return a pointer to the first character after the language,
26141 + i.e. to the first byte of the rest. */
26142 +extern char *_nl_find_language (const char *name);
26143 +
26144 +#endif /* loadinfo.h */
26145 --- /dev/null
26146 +++ lxpanel-0.5.6/intl/relocatable.c
26147 @@ -0,0 +1,449 @@
26148 +/* Provide relocatable packages.
26149 + Copyright (C) 2003 Free Software Foundation, Inc.
26150 + Written by Bruno Haible <bruno@clisp.org>, 2003.
26151 +
26152 + This program is free software; you can redistribute it and/or modify it
26153 + under the terms of the GNU Library General Public License as published
26154 + by the Free Software Foundation; either version 2, or (at your option)
26155 + any later version.
26156 +
26157 + This program is distributed in the hope that it will be useful,
26158 + but WITHOUT ANY WARRANTY; without even the implied warranty of
26159 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26160 + Library General Public License for more details.
26161 +
26162 + You should have received a copy of the GNU Library General Public
26163 + License along with this program; if not, write to the Free Software
26164 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
26165 + USA. */
26166 +
26167 +
26168 +/* Tell glibc's <stdio.h> to provide a prototype for getline().
26169 + This must come before <config.h> because <config.h> may include
26170 + <features.h>, and once <features.h> has been included, it's too late. */
26171 +#ifndef _GNU_SOURCE
26172 +# define _GNU_SOURCE 1
26173 +#endif
26174 +
26175 +#ifdef HAVE_CONFIG_H
26176 +# include "config.h"
26177 +#endif
26178 +
26179 +/* Specification. */
26180 +#include "relocatable.h"
26181 +
26182 +#if ENABLE_RELOCATABLE
26183 +
26184 +#include <stddef.h>
26185 +#include <stdio.h>
26186 +#include <stdlib.h>
26187 +#include <string.h>
26188 +
26189 +#ifdef NO_XMALLOC
26190 +# define xmalloc malloc
26191 +#else
26192 +# include "xalloc.h"
26193 +#endif
26194 +
26195 +#if defined _WIN32 || defined __WIN32__
26196 +# define WIN32_LEAN_AND_MEAN
26197 +# include <windows.h>
26198 +#endif
26199 +
26200 +#if DEPENDS_ON_LIBCHARSET
26201 +# include <libcharset.h>
26202 +#endif
26203 +#if DEPENDS_ON_LIBICONV && HAVE_ICONV
26204 +# include <iconv.h>
26205 +#endif
26206 +#if DEPENDS_ON_LIBINTL && ENABLE_NLS
26207 +# include <libintl.h>
26208 +#endif
26209 +
26210 +/* Faked cheap 'bool'. */
26211 +#undef bool
26212 +#undef false
26213 +#undef true
26214 +#define bool int
26215 +#define false 0
26216 +#define true 1
26217 +
26218 +/* Pathname support.
26219 + ISSLASH(C) tests whether C is a directory separator character.
26220 + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
26221 + */
26222 +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
26223 + /* Win32, OS/2, DOS */
26224 +# define ISSLASH(C) ((C) == '/' || (C) == '\\')
26225 +# define HAS_DEVICE(P) \
26226 + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
26227 + && (P)[1] == ':')
26228 +# define IS_PATH_WITH_DIR(P) \
26229 + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
26230 +# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
26231 +#else
26232 + /* Unix */
26233 +# define ISSLASH(C) ((C) == '/')
26234 +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
26235 +# define FILESYSTEM_PREFIX_LEN(P) 0
26236 +#endif
26237 +
26238 +/* Original installation prefix. */
26239 +static char *orig_prefix;
26240 +static size_t orig_prefix_len;
26241 +/* Current installation prefix. */
26242 +static char *curr_prefix;
26243 +static size_t curr_prefix_len;
26244 +/* These prefixes do not end in a slash. Anything that will be concatenated
26245 + to them must start with a slash. */
26246 +
26247 +/* Sets the original and the current installation prefix of this module.
26248 + Relocation simply replaces a pathname starting with the original prefix
26249 + by the corresponding pathname with the current prefix instead. Both
26250 + prefixes should be directory names without trailing slash (i.e. use ""
26251 + instead of "/"). */
26252 +static void
26253 +set_this_relocation_prefix (const char *orig_prefix_arg,
26254 + const char *curr_prefix_arg)
26255 +{
26256 + if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
26257 + /* Optimization: if orig_prefix and curr_prefix are equal, the
26258 + relocation is a nop. */
26259 + && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
26260 + {
26261 + /* Duplicate the argument strings. */
26262 + char *memory;
26263 +
26264 + orig_prefix_len = strlen (orig_prefix_arg);
26265 + curr_prefix_len = strlen (curr_prefix_arg);
26266 + memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
26267 +#ifdef NO_XMALLOC
26268 + if (memory != NULL)
26269 +#endif
26270 + {
26271 + memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
26272 + orig_prefix = memory;
26273 + memory += orig_prefix_len + 1;
26274 + memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
26275 + curr_prefix = memory;
26276 + return;
26277 + }
26278 + }
26279 + orig_prefix = NULL;
26280 + curr_prefix = NULL;
26281 + /* Don't worry about wasted memory here - this function is usually only
26282 + called once. */
26283 +}
26284 +
26285 +/* Sets the original and the current installation prefix of the package.
26286 + Relocation simply replaces a pathname starting with the original prefix
26287 + by the corresponding pathname with the current prefix instead. Both
26288 + prefixes should be directory names without trailing slash (i.e. use ""
26289 + instead of "/"). */
26290 +void
26291 +set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
26292 +{
26293 + set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
26294 +
26295 + /* Now notify all dependent libraries. */
26296 +#if DEPENDS_ON_LIBCHARSET
26297 + libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
26298 +#endif
26299 +#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
26300 + libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
26301 +#endif
26302 +#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
26303 + libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
26304 +#endif
26305 +}
26306 +
26307 +#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
26308 +
26309 +/* Convenience function:
26310 + Computes the current installation prefix, based on the original
26311 + installation prefix, the original installation directory of a particular
26312 + file, and the current pathname of this file. Returns NULL upon failure. */
26313 +#ifdef IN_LIBRARY
26314 +#define compute_curr_prefix local_compute_curr_prefix
26315 +static
26316 +#endif
26317 +const char *
26318 +compute_curr_prefix (const char *orig_installprefix,
26319 + const char *orig_installdir,
26320 + const char *curr_pathname)
26321 +{
26322 + const char *curr_installdir;
26323 + const char *rel_installdir;
26324 +
26325 + if (curr_pathname == NULL)
26326 + return NULL;
26327 +
26328 + /* Determine the relative installation directory, relative to the prefix.
26329 + This is simply the difference between orig_installprefix and
26330 + orig_installdir. */
26331 + if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
26332 + != 0)
26333 + /* Shouldn't happen - nothing should be installed outside $(prefix). */
26334 + return NULL;
26335 + rel_installdir = orig_installdir + strlen (orig_installprefix);
26336 +
26337 + /* Determine the current installation directory. */
26338 + {
26339 + const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
26340 + const char *p = curr_pathname + strlen (curr_pathname);
26341 + char *q;
26342 +
26343 + while (p > p_base)
26344 + {
26345 + p--;
26346 + if (ISSLASH (*p))
26347 + break;
26348 + }
26349 +
26350 + q = (char *) xmalloc (p - curr_pathname + 1);
26351 +#ifdef NO_XMALLOC
26352 + if (q == NULL)
26353 + return NULL;
26354 +#endif
26355 + memcpy (q, curr_pathname, p - curr_pathname);
26356 + q[p - curr_pathname] = '\0';
26357 + curr_installdir = q;
26358 + }
26359 +
26360 + /* Compute the current installation prefix by removing the trailing
26361 + rel_installdir from it. */
26362 + {
26363 + const char *rp = rel_installdir + strlen (rel_installdir);
26364 + const char *cp = curr_installdir + strlen (curr_installdir);
26365 + const char *cp_base =
26366 + curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
26367 +
26368 + while (rp > rel_installdir && cp > cp_base)
26369 + {
26370 + bool same = false;
26371 + const char *rpi = rp;
26372 + const char *cpi = cp;
26373 +
26374 + while (rpi > rel_installdir && cpi > cp_base)
26375 + {
26376 + rpi--;
26377 + cpi--;
26378 + if (ISSLASH (*rpi) || ISSLASH (*cpi))
26379 + {
26380 + if (ISSLASH (*rpi) && ISSLASH (*cpi))
26381 + same = true;
26382 + break;
26383 + }
26384 +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
26385 + /* Win32, OS/2, DOS - case insignificant filesystem */
26386 + if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
26387 + != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
26388 + break;
26389 +#else
26390 + if (*rpi != *cpi)
26391 + break;
26392 +#endif
26393 + }
26394 + if (!same)
26395 + break;
26396 + /* The last pathname component was the same. opi and cpi now point
26397 + to the slash before it. */
26398 + rp = rpi;
26399 + cp = cpi;
26400 + }
26401 +
26402 + if (rp > rel_installdir)
26403 + /* Unexpected: The curr_installdir does not end with rel_installdir. */
26404 + return NULL;
26405 +
26406 + {
26407 + size_t curr_prefix_len = cp - curr_installdir;
26408 + char *curr_prefix;
26409 +
26410 + curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
26411 +#ifdef NO_XMALLOC
26412 + if (curr_prefix == NULL)
26413 + return NULL;
26414 +#endif
26415 + memcpy (curr_prefix, curr_installdir, curr_prefix_len);
26416 + curr_prefix[curr_prefix_len] = '\0';
26417 +
26418 + return curr_prefix;
26419 + }
26420 + }
26421 +}
26422 +
26423 +#endif /* !IN_LIBRARY || PIC */
26424 +
26425 +#if defined PIC && defined INSTALLDIR
26426 +
26427 +/* Full pathname of shared library, or NULL. */
26428 +static char *shared_library_fullname;
26429 +
26430 +#if defined _WIN32 || defined __WIN32__
26431 +
26432 +/* Determine the full pathname of the shared library when it is loaded. */
26433 +
26434 +BOOL WINAPI
26435 +DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
26436 +{
26437 + (void) reserved;
26438 +
26439 + if (event == DLL_PROCESS_ATTACH)
26440 + {
26441 + /* The DLL is being loaded into an application's address range. */
26442 + static char location[MAX_PATH];
26443 +
26444 + if (!GetModuleFileName (module_handle, location, sizeof (location)))
26445 + /* Shouldn't happen. */
26446 + return FALSE;
26447 +
26448 + if (!IS_PATH_WITH_DIR (location))
26449 + /* Shouldn't happen. */
26450 + return FALSE;
26451 +
26452 + shared_library_fullname = strdup (location);
26453 + }
26454 +
26455 + return TRUE;
26456 +}
26457 +
26458 +#else /* Unix */
26459 +
26460 +static void
26461 +find_shared_library_fullname ()
26462 +{
26463 +#if defined __linux__ && __GLIBC__ >= 2
26464 + /* Linux has /proc/self/maps. glibc 2 has the getline() function. */
26465 + FILE *fp;
26466 +
26467 + /* Open the current process' maps file. It describes one VMA per line. */
26468 + fp = fopen ("/proc/self/maps", "r");
26469 + if (fp)
26470 + {
26471 + unsigned long address = (unsigned long) &find_shared_library_fullname;
26472 + for (;;)
26473 + {
26474 + unsigned long start, end;
26475 + int c;
26476 +
26477 + if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
26478 + break;
26479 + if (address >= start && address <= end - 1)
26480 + {
26481 + /* Found it. Now see if this line contains a filename. */
26482 + while (c = getc (fp), c != EOF && c != '\n' && c != '/')
26483 + continue;
26484 + if (c == '/')
26485 + {
26486 + size_t size;
26487 + int len;
26488 +
26489 + ungetc (c, fp);
26490 + shared_library_fullname = NULL; size = 0;
26491 + len = getline (&shared_library_fullname, &size, fp);
26492 + if (len >= 0)
26493 + {
26494 + /* Success: filled shared_library_fullname. */
26495 + if (len > 0 && shared_library_fullname[len - 1] == '\n')
26496 + shared_library_fullname[len - 1] = '\0';
26497 + }
26498 + }
26499 + break;
26500 + }
26501 + while (c = getc (fp), c != EOF && c != '\n')
26502 + continue;
26503 + }
26504 + fclose (fp);
26505 + }
26506 +#endif
26507 +}
26508 +
26509 +#endif /* WIN32 / Unix */
26510 +
26511 +/* Return the full pathname of the current shared library.
26512 + Return NULL if unknown.
26513 + Guaranteed to work only on Linux and Woe32. */
26514 +static char *
26515 +get_shared_library_fullname ()
26516 +{
26517 +#if !(defined _WIN32 || defined __WIN32__)
26518 + static bool tried_find_shared_library_fullname;
26519 + if (!tried_find_shared_library_fullname)
26520 + {
26521 + find_shared_library_fullname ();
26522 + tried_find_shared_library_fullname = true;
26523 + }
26524 +#endif
26525 + return shared_library_fullname;
26526 +}
26527 +
26528 +#endif /* PIC */
26529 +
26530 +/* Returns the pathname, relocated according to the current installation
26531 + directory. */
26532 +const char *
26533 +relocate (const char *pathname)
26534 +{
26535 +#if defined PIC && defined INSTALLDIR
26536 + static int initialized;
26537 +
26538 + /* Initialization code for a shared library. */
26539 + if (!initialized)
26540 + {
26541 + /* At this point, orig_prefix and curr_prefix likely have already been
26542 + set through the main program's set_program_name_and_installdir
26543 + function. This is sufficient in the case that the library has
26544 + initially been installed in the same orig_prefix. But we can do
26545 + better, to also cover the cases that 1. it has been installed
26546 + in a different prefix before being moved to orig_prefix and (later)
26547 + to curr_prefix, 2. unlike the program, it has not moved away from
26548 + orig_prefix. */
26549 + const char *orig_installprefix = INSTALLPREFIX;
26550 + const char *orig_installdir = INSTALLDIR;
26551 + const char *curr_prefix_better;
26552 +
26553 + curr_prefix_better =
26554 + compute_curr_prefix (orig_installprefix, orig_installdir,
26555 + get_shared_library_fullname ());
26556 + if (curr_prefix_better == NULL)
26557 + curr_prefix_better = curr_prefix;
26558 +
26559 + set_relocation_prefix (orig_installprefix, curr_prefix_better);
26560 +
26561 + initialized = 1;
26562 + }
26563 +#endif
26564 +
26565 + /* Note: It is not necessary to perform case insensitive comparison here,
26566 + even for DOS-like filesystems, because the pathname argument was
26567 + typically created from the same Makefile variable as orig_prefix came
26568 + from. */
26569 + if (orig_prefix != NULL && curr_prefix != NULL
26570 + && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
26571 + {
26572 + if (pathname[orig_prefix_len] == '\0')
26573 + /* pathname equals orig_prefix. */
26574 + return curr_prefix;
26575 + if (ISSLASH (pathname[orig_prefix_len]))
26576 + {
26577 + /* pathname starts with orig_prefix. */
26578 + const char *pathname_tail = &pathname[orig_prefix_len];
26579 + char *result =
26580 + (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
26581 +
26582 +#ifdef NO_XMALLOC
26583 + if (result != NULL)
26584 +#endif
26585 + {
26586 + memcpy (result, curr_prefix, curr_prefix_len);
26587 + strcpy (result + curr_prefix_len, pathname_tail);
26588 + return result;
26589 + }
26590 + }
26591 + }
26592 + /* Nothing to relocate. */
26593 + return pathname;
26594 +}
26595 +
26596 +#endif
26597 --- /dev/null
26598 +++ lxpanel-0.5.6/intl/ngettext.c
26599 @@ -0,0 +1,65 @@
26600 +/* Implementation of ngettext(3) function.
26601 + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
26602 +
26603 + This program is free software; you can redistribute it and/or modify it
26604 + under the terms of the GNU Library General Public License as published
26605 + by the Free Software Foundation; either version 2, or (at your option)
26606 + any later version.
26607 +
26608 + This program is distributed in the hope that it will be useful,
26609 + but WITHOUT ANY WARRANTY; without even the implied warranty of
26610 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26611 + Library General Public License for more details.
26612 +
26613 + You should have received a copy of the GNU Library General Public
26614 + License along with this program; if not, write to the Free Software
26615 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
26616 + USA. */
26617 +
26618 +#ifdef HAVE_CONFIG_H
26619 +# include <config.h>
26620 +#endif
26621 +
26622 +#ifdef _LIBC
26623 +# define __need_NULL
26624 +# include <stddef.h>
26625 +#else
26626 +# include <stdlib.h> /* Just for NULL. */
26627 +#endif
26628 +
26629 +#include "gettextP.h"
26630 +#ifdef _LIBC
26631 +# include <libintl.h>
26632 +#else
26633 +# include "libgnuintl.h"
26634 +#endif
26635 +
26636 +#include <locale.h>
26637 +
26638 +/* @@ end of prolog @@ */
26639 +
26640 +/* Names for the libintl functions are a problem. They must not clash
26641 + with existing names and they should follow ANSI C. But this source
26642 + code is also used in GNU C Library where the names have a __
26643 + prefix. So we have to make a difference here. */
26644 +#ifdef _LIBC
26645 +# define NGETTEXT __ngettext
26646 +# define DCNGETTEXT __dcngettext
26647 +#else
26648 +# define NGETTEXT libintl_ngettext
26649 +# define DCNGETTEXT libintl_dcngettext
26650 +#endif
26651 +
26652 +/* Look up MSGID in the current default message catalog for the current
26653 + LC_MESSAGES locale. If not found, returns MSGID itself (the default
26654 + text). */
26655 +char *
26656 +NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
26657 +{
26658 + return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
26659 +}
26660 +
26661 +#ifdef _LIBC
26662 +/* Alias for function name in GNU C Library. */
26663 +weak_alias (__ngettext, ngettext);
26664 +#endif
26665 --- /dev/null
26666 +++ lxpanel-0.5.6/intl/gmo.h
26667 @@ -0,0 +1,149 @@
26668 +/* Description of GNU message catalog format: general file layout.
26669 + Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
26670 +
26671 + This program is free software; you can redistribute it and/or modify it
26672 + under the terms of the GNU Library General Public License as published
26673 + by the Free Software Foundation; either version 2, or (at your option)
26674 + any later version.
26675 +
26676 + This program is distributed in the hope that it will be useful,
26677 + but WITHOUT ANY WARRANTY; without even the implied warranty of
26678 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26679 + Library General Public License for more details.
26680 +
26681 + You should have received a copy of the GNU Library General Public
26682 + License along with this program; if not, write to the Free Software
26683 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
26684 + USA. */
26685 +
26686 +#ifndef _GETTEXT_H
26687 +#define _GETTEXT_H 1
26688 +
26689 +#include <limits.h>
26690 +
26691 +/* @@ end of prolog @@ */
26692 +
26693 +/* The magic number of the GNU message catalog format. */
26694 +#define _MAGIC 0x950412de
26695 +#define _MAGIC_SWAPPED 0xde120495
26696 +
26697 +/* Revision number of the currently used .mo (binary) file format. */
26698 +#define MO_REVISION_NUMBER 0
26699 +#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
26700 +
26701 +/* The following contortions are an attempt to use the C preprocessor
26702 + to determine an unsigned integral type that is 32 bits wide. An
26703 + alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
26704 + as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
26705 + when cross-compiling. */
26706 +
26707 +#if __STDC__
26708 +# define UINT_MAX_32_BITS 4294967295U
26709 +#else
26710 +# define UINT_MAX_32_BITS 0xFFFFFFFF
26711 +#endif
26712 +
26713 +/* If UINT_MAX isn't defined, assume it's a 32-bit type.
26714 + This should be valid for all systems GNU cares about because
26715 + that doesn't include 16-bit systems, and only modern systems
26716 + (that certainly have <limits.h>) have 64+-bit integral types. */
26717 +
26718 +#ifndef UINT_MAX
26719 +# define UINT_MAX UINT_MAX_32_BITS
26720 +#endif
26721 +
26722 +#if UINT_MAX == UINT_MAX_32_BITS
26723 +typedef unsigned nls_uint32;
26724 +#else
26725 +# if USHRT_MAX == UINT_MAX_32_BITS
26726 +typedef unsigned short nls_uint32;
26727 +# else
26728 +# if ULONG_MAX == UINT_MAX_32_BITS
26729 +typedef unsigned long nls_uint32;
26730 +# else
26731 + /* The following line is intended to throw an error. Using #error is
26732 + not portable enough. */
26733 + "Cannot determine unsigned 32-bit data type."
26734 +# endif
26735 +# endif
26736 +#endif
26737 +
26738 +
26739 +/* Header for binary .mo file format. */
26740 +struct mo_file_header
26741 +{
26742 + /* The magic number. */
26743 + nls_uint32 magic;
26744 + /* The revision number of the file format. */
26745 + nls_uint32 revision;
26746 +
26747 + /* The following are only used in .mo files with major revision 0 or 1. */
26748 +
26749 + /* The number of strings pairs. */
26750 + nls_uint32 nstrings;
26751 + /* Offset of table with start offsets of original strings. */
26752 + nls_uint32 orig_tab_offset;
26753 + /* Offset of table with start offsets of translated strings. */
26754 + nls_uint32 trans_tab_offset;
26755 + /* Size of hash table. */
26756 + nls_uint32 hash_tab_size;
26757 + /* Offset of first hash table entry. */
26758 + nls_uint32 hash_tab_offset;
26759 +
26760 + /* The following are only used in .mo files with minor revision >= 1. */
26761 +
26762 + /* The number of system dependent segments. */
26763 + nls_uint32 n_sysdep_segments;
26764 + /* Offset of table describing system dependent segments. */
26765 + nls_uint32 sysdep_segments_offset;
26766 + /* The number of system dependent strings pairs. */
26767 + nls_uint32 n_sysdep_strings;
26768 + /* Offset of table with start offsets of original sysdep strings. */
26769 + nls_uint32 orig_sysdep_tab_offset;
26770 + /* Offset of table with start offsets of translated sysdep strings. */
26771 + nls_uint32 trans_sysdep_tab_offset;
26772 +};
26773 +
26774 +/* Descriptor for static string contained in the binary .mo file. */
26775 +struct string_desc
26776 +{
26777 + /* Length of addressed string, not including the trailing NUL. */
26778 + nls_uint32 length;
26779 + /* Offset of string in file. */
26780 + nls_uint32 offset;
26781 +};
26782 +
26783 +/* The following are only used in .mo files with minor revision >= 1. */
26784 +
26785 +/* Descriptor for system dependent string segment. */
26786 +struct sysdep_segment
26787 +{
26788 + /* Length of addressed string, including the trailing NUL. */
26789 + nls_uint32 length;
26790 + /* Offset of string in file. */
26791 + nls_uint32 offset;
26792 +};
26793 +
26794 +/* Descriptor for system dependent string. */
26795 +struct sysdep_string
26796 +{
26797 + /* Offset of static string segments in file. */
26798 + nls_uint32 offset;
26799 + /* Alternating sequence of static and system dependent segments.
26800 + The last segment is a static segment, including the trailing NUL. */
26801 + struct segment_pair
26802 + {
26803 + /* Size of static segment. */
26804 + nls_uint32 segsize;
26805 + /* Reference to system dependent string segment, or ~0 at the end. */
26806 + nls_uint32 sysdepref;
26807 + } segments[1];
26808 +};
26809 +
26810 +/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF,
26811 + regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */
26812 +#define SEGMENTS_END ((nls_uint32) ~0)
26813 +
26814 +/* @@ begin of epilog @@ */
26815 +
26816 +#endif /* gettext.h */
26817 --- /dev/null
26818 +++ lxpanel-0.5.6/intl/dgettext.c
26819 @@ -0,0 +1,58 @@
26820 +/* Implementation of the dgettext(3) function.
26821 + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
26822 +
26823 + This program is free software; you can redistribute it and/or modify it
26824 + under the terms of the GNU Library General Public License as published
26825 + by the Free Software Foundation; either version 2, or (at your option)
26826 + any later version.
26827 +
26828 + This program is distributed in the hope that it will be useful,
26829 + but WITHOUT ANY WARRANTY; without even the implied warranty of
26830 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26831 + Library General Public License for more details.
26832 +
26833 + You should have received a copy of the GNU Library General Public
26834 + License along with this program; if not, write to the Free Software
26835 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
26836 + USA. */
26837 +
26838 +#ifdef HAVE_CONFIG_H
26839 +# include <config.h>
26840 +#endif
26841 +
26842 +#include "gettextP.h"
26843 +
26844 +#include <locale.h>
26845 +
26846 +#ifdef _LIBC
26847 +# include <libintl.h>
26848 +#else
26849 +# include "libgnuintl.h"
26850 +#endif
26851 +
26852 +/* @@ end of prolog @@ */
26853 +
26854 +/* Names for the libintl functions are a problem. They must not clash
26855 + with existing names and they should follow ANSI C. But this source
26856 + code is also used in GNU C Library where the names have a __
26857 + prefix. So we have to make a difference here. */
26858 +#ifdef _LIBC
26859 +# define DGETTEXT __dgettext
26860 +# define DCGETTEXT INTUSE(__dcgettext)
26861 +#else
26862 +# define DGETTEXT libintl_dgettext
26863 +# define DCGETTEXT libintl_dcgettext
26864 +#endif
26865 +
26866 +/* Look up MSGID in the DOMAINNAME message catalog of the current
26867 + LC_MESSAGES locale. */
26868 +char *
26869 +DGETTEXT (const char *domainname, const char *msgid)
26870 +{
26871 + return DCGETTEXT (domainname, msgid, LC_MESSAGES);
26872 +}
26873 +
26874 +#ifdef _LIBC
26875 +/* Alias for function name in GNU C Library. */
26876 +weak_alias (__dgettext, dgettext);
26877 +#endif
26878 --- /dev/null
26879 +++ lxpanel-0.5.6/intl/locale.alias
26880 @@ -0,0 +1,78 @@
26881 +# Locale name alias data base.
26882 +# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
26883 +#
26884 +# This program is free software; you can redistribute it and/or modify it
26885 +# under the terms of the GNU Library General Public License as published
26886 +# by the Free Software Foundation; either version 2, or (at your option)
26887 +# any later version.
26888 +#
26889 +# This program is distributed in the hope that it will be useful,
26890 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
26891 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26892 +# Library General Public License for more details.
26893 +#
26894 +# You should have received a copy of the GNU Library General Public
26895 +# License along with this program; if not, write to the Free Software
26896 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
26897 +# USA.
26898 +
26899 +# The format of this file is the same as for the corresponding file of
26900 +# the X Window System, which normally can be found in
26901 +# /usr/lib/X11/locale/locale.alias
26902 +# A single line contains two fields: an alias and a substitution value.
26903 +# All entries are case independent.
26904 +
26905 +# Note: This file is far from being complete. If you have a value for
26906 +# your own site which you think might be useful for others too, share
26907 +# it with the rest of us. Send it using the `glibcbug' script to
26908 +# bugs@gnu.org.
26909 +
26910 +# Packages using this file:
26911 +
26912 +bokmal nb_NO.ISO-8859-1
26913 +bokmål nb_NO.ISO-8859-1
26914 +catalan ca_ES.ISO-8859-1
26915 +croatian hr_HR.ISO-8859-2
26916 +czech cs_CZ.ISO-8859-2
26917 +danish da_DK.ISO-8859-1
26918 +dansk da_DK.ISO-8859-1
26919 +deutsch de_DE.ISO-8859-1
26920 +dutch nl_NL.ISO-8859-1
26921 +eesti et_EE.ISO-8859-1
26922 +estonian et_EE.ISO-8859-1
26923 +finnish fi_FI.ISO-8859-1
26924 +français fr_FR.ISO-8859-1
26925 +french fr_FR.ISO-8859-1
26926 +galego gl_ES.ISO-8859-1
26927 +galician gl_ES.ISO-8859-1
26928 +german de_DE.ISO-8859-1
26929 +greek el_GR.ISO-8859-7
26930 +hebrew he_IL.ISO-8859-8
26931 +hrvatski hr_HR.ISO-8859-2
26932 +hungarian hu_HU.ISO-8859-2
26933 +icelandic is_IS.ISO-8859-1
26934 +italian it_IT.ISO-8859-1
26935 +japanese ja_JP.eucJP
26936 +japanese.euc ja_JP.eucJP
26937 +ja_JP ja_JP.eucJP
26938 +ja_JP.ujis ja_JP.eucJP
26939 +japanese.sjis ja_JP.SJIS
26940 +korean ko_KR.eucKR
26941 +korean.euc ko_KR.eucKR
26942 +ko_KR ko_KR.eucKR
26943 +lithuanian lt_LT.ISO-8859-13
26944 +no_NO nb_NO.ISO-8859-1
26945 +no_NO.ISO-8859-1 nb_NO.ISO-8859-1
26946 +norwegian nb_NO.ISO-8859-1
26947 +nynorsk nn_NO.ISO-8859-1
26948 +polish pl_PL.ISO-8859-2
26949 +portuguese pt_PT.ISO-8859-1
26950 +romanian ro_RO.ISO-8859-2
26951 +russian ru_RU.ISO-8859-5
26952 +slovak sk_SK.ISO-8859-2
26953 +slovene sl_SI.ISO-8859-2
26954 +slovenian sl_SI.ISO-8859-2
26955 +spanish es_ES.ISO-8859-1
26956 +swedish sv_SE.ISO-8859-1
26957 +thai th_TH.TIS-620
26958 +turkish tr_TR.ISO-8859-9
26959 --- /dev/null
26960 +++ lxpanel-0.5.6/intl/printf-args.c
26961 @@ -0,0 +1,119 @@
26962 +/* Decomposed printf argument list.
26963 + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
26964 +
26965 + This program is free software; you can redistribute it and/or modify it
26966 + under the terms of the GNU Library General Public License as published
26967 + by the Free Software Foundation; either version 2, or (at your option)
26968 + any later version.
26969 +
26970 + This program is distributed in the hope that it will be useful,
26971 + but WITHOUT ANY WARRANTY; without even the implied warranty of
26972 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26973 + Library General Public License for more details.
26974 +
26975 + You should have received a copy of the GNU Library General Public
26976 + License along with this program; if not, write to the Free Software
26977 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
26978 + USA. */
26979 +
26980 +#ifdef HAVE_CONFIG_H
26981 +# include <config.h>
26982 +#endif
26983 +
26984 +/* Specification. */
26985 +#include "printf-args.h"
26986 +
26987 +#ifdef STATIC
26988 +STATIC
26989 +#endif
26990 +int
26991 +printf_fetchargs (va_list args, arguments *a)
26992 +{
26993 + size_t i;
26994 + argument *ap;
26995 +
26996 + for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
26997 + switch (ap->type)
26998 + {
26999 + case TYPE_SCHAR:
27000 + ap->a.a_schar = va_arg (args, /*signed char*/ int);
27001 + break;
27002 + case TYPE_UCHAR:
27003 + ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
27004 + break;
27005 + case TYPE_SHORT:
27006 + ap->a.a_short = va_arg (args, /*short*/ int);
27007 + break;
27008 + case TYPE_USHORT:
27009 + ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
27010 + break;
27011 + case TYPE_INT:
27012 + ap->a.a_int = va_arg (args, int);
27013 + break;
27014 + case TYPE_UINT:
27015 + ap->a.a_uint = va_arg (args, unsigned int);
27016 + break;
27017 + case TYPE_LONGINT:
27018 + ap->a.a_longint = va_arg (args, long int);
27019 + break;
27020 + case TYPE_ULONGINT:
27021 + ap->a.a_ulongint = va_arg (args, unsigned long int);
27022 + break;
27023 +#ifdef HAVE_LONG_LONG
27024 + case TYPE_LONGLONGINT:
27025 + ap->a.a_longlongint = va_arg (args, long long int);
27026 + break;
27027 + case TYPE_ULONGLONGINT:
27028 + ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
27029 + break;
27030 +#endif
27031 + case TYPE_DOUBLE:
27032 + ap->a.a_double = va_arg (args, double);
27033 + break;
27034 +#ifdef HAVE_LONG_DOUBLE
27035 + case TYPE_LONGDOUBLE:
27036 + ap->a.a_longdouble = va_arg (args, long double);
27037 + break;
27038 +#endif
27039 + case TYPE_CHAR:
27040 + ap->a.a_char = va_arg (args, int);
27041 + break;
27042 +#ifdef HAVE_WINT_T
27043 + case TYPE_WIDE_CHAR:
27044 + ap->a.a_wide_char = va_arg (args, wint_t);
27045 + break;
27046 +#endif
27047 + case TYPE_STRING:
27048 + ap->a.a_string = va_arg (args, const char *);
27049 + break;
27050 +#ifdef HAVE_WCHAR_T
27051 + case TYPE_WIDE_STRING:
27052 + ap->a.a_wide_string = va_arg (args, const wchar_t *);
27053 + break;
27054 +#endif
27055 + case TYPE_POINTER:
27056 + ap->a.a_pointer = va_arg (args, void *);
27057 + break;
27058 + case TYPE_COUNT_SCHAR_POINTER:
27059 + ap->a.a_count_schar_pointer = va_arg (args, signed char *);
27060 + break;
27061 + case TYPE_COUNT_SHORT_POINTER:
27062 + ap->a.a_count_short_pointer = va_arg (args, short *);
27063 + break;
27064 + case TYPE_COUNT_INT_POINTER:
27065 + ap->a.a_count_int_pointer = va_arg (args, int *);
27066 + break;
27067 + case TYPE_COUNT_LONGINT_POINTER:
27068 + ap->a.a_count_longint_pointer = va_arg (args, long int *);
27069 + break;
27070 +#ifdef HAVE_LONG_LONG
27071 + case TYPE_COUNT_LONGLONGINT_POINTER:
27072 + ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
27073 + break;
27074 +#endif
27075 + default:
27076 + /* Unknown type. */
27077 + return -1;
27078 + }
27079 + return 0;
27080 +}
27081 --- /dev/null
27082 +++ lxpanel-0.5.6/intl/localealias.c
27083 @@ -0,0 +1,414 @@
27084 +/* Handle aliases for locale names.
27085 + Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
27086 +
27087 + This program is free software; you can redistribute it and/or modify it
27088 + under the terms of the GNU Library General Public License as published
27089 + by the Free Software Foundation; either version 2, or (at your option)
27090 + any later version.
27091 +
27092 + This program is distributed in the hope that it will be useful,
27093 + but WITHOUT ANY WARRANTY; without even the implied warranty of
27094 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27095 + Library General Public License for more details.
27096 +
27097 + You should have received a copy of the GNU Library General Public
27098 + License along with this program; if not, write to the Free Software
27099 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
27100 + USA. */
27101 +
27102 +/* Tell glibc's <string.h> to provide a prototype for mempcpy().
27103 + This must come before <config.h> because <config.h> may include
27104 + <features.h>, and once <features.h> has been included, it's too late. */
27105 +#ifndef _GNU_SOURCE
27106 +# define _GNU_SOURCE 1
27107 +#endif
27108 +
27109 +#ifdef HAVE_CONFIG_H
27110 +# include <config.h>
27111 +#endif
27112 +
27113 +#include <ctype.h>
27114 +#include <stdio.h>
27115 +#if defined _LIBC || defined HAVE___FSETLOCKING
27116 +# include <stdio_ext.h>
27117 +#endif
27118 +#include <sys/types.h>
27119 +
27120 +#ifdef __GNUC__
27121 +# undef alloca
27122 +# define alloca __builtin_alloca
27123 +# define HAVE_ALLOCA 1
27124 +#else
27125 +# ifdef _MSC_VER
27126 +# include <malloc.h>
27127 +# define alloca _alloca
27128 +# else
27129 +# if defined HAVE_ALLOCA_H || defined _LIBC
27130 +# include <alloca.h>
27131 +# else
27132 +# ifdef _AIX
27133 + #pragma alloca
27134 +# else
27135 +# ifndef alloca
27136 +char *alloca ();
27137 +# endif
27138 +# endif
27139 +# endif
27140 +# endif
27141 +#endif
27142 +
27143 +#include <stdlib.h>
27144 +#include <string.h>
27145 +
27146 +#include "gettextP.h"
27147 +
27148 +#if ENABLE_RELOCATABLE
27149 +# include "relocatable.h"
27150 +#else
27151 +# define relocate(pathname) (pathname)
27152 +#endif
27153 +
27154 +/* @@ end of prolog @@ */
27155 +
27156 +#ifdef _LIBC
27157 +/* Rename the non ANSI C functions. This is required by the standard
27158 + because some ANSI C functions will require linking with this object
27159 + file and the name space must not be polluted. */
27160 +# define strcasecmp __strcasecmp
27161 +
27162 +# ifndef mempcpy
27163 +# define mempcpy __mempcpy
27164 +# endif
27165 +# define HAVE_MEMPCPY 1
27166 +# define HAVE___FSETLOCKING 1
27167 +
27168 +/* We need locking here since we can be called from different places. */
27169 +# include <bits/libc-lock.h>
27170 +
27171 +__libc_lock_define_initialized (static, lock);
27172 +#endif
27173 +
27174 +#ifndef internal_function
27175 +# define internal_function
27176 +#endif
27177 +
27178 +/* Some optimizations for glibc. */
27179 +#ifdef _LIBC
27180 +# define FEOF(fp) feof_unlocked (fp)
27181 +# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
27182 +#else
27183 +# define FEOF(fp) feof (fp)
27184 +# define FGETS(buf, n, fp) fgets (buf, n, fp)
27185 +#endif
27186 +
27187 +/* For those losing systems which don't have `alloca' we have to add
27188 + some additional code emulating it. */
27189 +#ifdef HAVE_ALLOCA
27190 +# define freea(p) /* nothing */
27191 +#else
27192 +# define alloca(n) malloc (n)
27193 +# define freea(p) free (p)
27194 +#endif
27195 +
27196 +#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
27197 +# undef fgets
27198 +# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
27199 +#endif
27200 +#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
27201 +# undef feof
27202 +# define feof(s) feof_unlocked (s)
27203 +#endif
27204 +
27205 +
27206 +struct alias_map
27207 +{
27208 + const char *alias;
27209 + const char *value;
27210 +};
27211 +
27212 +
27213 +#ifndef _LIBC
27214 +# define libc_freeres_ptr(decl) decl
27215 +#endif
27216 +
27217 +libc_freeres_ptr (static char *string_space);
27218 +static size_t string_space_act;
27219 +static size_t string_space_max;
27220 +libc_freeres_ptr (static struct alias_map *map);
27221 +static size_t nmap;
27222 +static size_t maxmap;
27223 +
27224 +
27225 +/* Prototypes for local functions. */
27226 +static size_t read_alias_file (const char *fname, int fname_len)
27227 + internal_function;
27228 +static int extend_alias_table (void);
27229 +static int alias_compare (const struct alias_map *map1,
27230 + const struct alias_map *map2);
27231 +
27232 +
27233 +const char *
27234 +_nl_expand_alias (const char *name)
27235 +{
27236 + static const char *locale_alias_path;
27237 + struct alias_map *retval;
27238 + const char *result = NULL;
27239 + size_t added;
27240 +
27241 +#ifdef _LIBC
27242 + __libc_lock_lock (lock);
27243 +#endif
27244 +
27245 + if (locale_alias_path == NULL)
27246 + locale_alias_path = LOCALE_ALIAS_PATH;
27247 +
27248 + do
27249 + {
27250 + struct alias_map item;
27251 +
27252 + item.alias = name;
27253 +
27254 + if (nmap > 0)
27255 + retval = (struct alias_map *) bsearch (&item, map, nmap,
27256 + sizeof (struct alias_map),
27257 + (int (*) (const void *,
27258 + const void *)
27259 + ) alias_compare);
27260 + else
27261 + retval = NULL;
27262 +
27263 + /* We really found an alias. Return the value. */
27264 + if (retval != NULL)
27265 + {
27266 + result = retval->value;
27267 + break;
27268 + }
27269 +
27270 + /* Perhaps we can find another alias file. */
27271 + added = 0;
27272 + while (added == 0 && locale_alias_path[0] != '\0')
27273 + {
27274 + const char *start;
27275 +
27276 + while (locale_alias_path[0] == PATH_SEPARATOR)
27277 + ++locale_alias_path;
27278 + start = locale_alias_path;
27279 +
27280 + while (locale_alias_path[0] != '\0'
27281 + && locale_alias_path[0] != PATH_SEPARATOR)
27282 + ++locale_alias_path;
27283 +
27284 + if (start < locale_alias_path)
27285 + added = read_alias_file (start, locale_alias_path - start);
27286 + }
27287 + }
27288 + while (added != 0);
27289 +
27290 +#ifdef _LIBC
27291 + __libc_lock_unlock (lock);
27292 +#endif
27293 +
27294 + return result;
27295 +}
27296 +
27297 +
27298 +static size_t
27299 +internal_function
27300 +read_alias_file (const char *fname, int fname_len)
27301 +{
27302 + FILE *fp;
27303 + char *full_fname;
27304 + size_t added;
27305 + static const char aliasfile[] = "/locale.alias";
27306 +
27307 + full_fname = (char *) alloca (fname_len + sizeof aliasfile);
27308 +#ifdef HAVE_MEMPCPY
27309 + mempcpy (mempcpy (full_fname, fname, fname_len),
27310 + aliasfile, sizeof aliasfile);
27311 +#else
27312 + memcpy (full_fname, fname, fname_len);
27313 + memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
27314 +#endif
27315 +
27316 + fp = fopen (relocate (full_fname), "r");
27317 + freea (full_fname);
27318 + if (fp == NULL)
27319 + return 0;
27320 +
27321 +#ifdef HAVE___FSETLOCKING
27322 + /* No threads present. */
27323 + __fsetlocking (fp, FSETLOCKING_BYCALLER);
27324 +#endif
27325 +
27326 + added = 0;
27327 + while (!FEOF (fp))
27328 + {
27329 + /* It is a reasonable approach to use a fix buffer here because
27330 + a) we are only interested in the first two fields
27331 + b) these fields must be usable as file names and so must not
27332 + be that long
27333 + We avoid a multi-kilobyte buffer here since this would use up
27334 + stack space which we might not have if the program ran out of
27335 + memory. */
27336 + char buf[400];
27337 + char *alias;
27338 + char *value;
27339 + char *cp;
27340 +
27341 + if (FGETS (buf, sizeof buf, fp) == NULL)
27342 + /* EOF reached. */
27343 + break;
27344 +
27345 + cp = buf;
27346 + /* Ignore leading white space. */
27347 + while (isspace ((unsigned char) cp[0]))
27348 + ++cp;
27349 +
27350 + /* A leading '#' signals a comment line. */
27351 + if (cp[0] != '\0' && cp[0] != '#')
27352 + {
27353 + alias = cp++;
27354 + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
27355 + ++cp;
27356 + /* Terminate alias name. */
27357 + if (cp[0] != '\0')
27358 + *cp++ = '\0';
27359 +
27360 + /* Now look for the beginning of the value. */
27361 + while (isspace ((unsigned char) cp[0]))
27362 + ++cp;
27363 +
27364 + if (cp[0] != '\0')
27365 + {
27366 + size_t alias_len;
27367 + size_t value_len;
27368 +
27369 + value = cp++;
27370 + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
27371 + ++cp;
27372 + /* Terminate value. */
27373 + if (cp[0] == '\n')
27374 + {
27375 + /* This has to be done to make the following test
27376 + for the end of line possible. We are looking for
27377 + the terminating '\n' which do not overwrite here. */
27378 + *cp++ = '\0';
27379 + *cp = '\n';
27380 + }
27381 + else if (cp[0] != '\0')
27382 + *cp++ = '\0';
27383 +
27384 + if (nmap >= maxmap)
27385 + if (__builtin_expect (extend_alias_table (), 0))
27386 + return added;
27387 +
27388 + alias_len = strlen (alias) + 1;
27389 + value_len = strlen (value) + 1;
27390 +
27391 + if (string_space_act + alias_len + value_len > string_space_max)
27392 + {
27393 + /* Increase size of memory pool. */
27394 + size_t new_size = (string_space_max
27395 + + (alias_len + value_len > 1024
27396 + ? alias_len + value_len : 1024));
27397 + char *new_pool = (char *) realloc (string_space, new_size);
27398 + if (new_pool == NULL)
27399 + return added;
27400 +
27401 + if (__builtin_expect (string_space != new_pool, 0))
27402 + {
27403 + size_t i;
27404 +
27405 + for (i = 0; i < nmap; i++)
27406 + {
27407 + map[i].alias += new_pool - string_space;
27408 + map[i].value += new_pool - string_space;
27409 + }
27410 + }
27411 +
27412 + string_space = new_pool;
27413 + string_space_max = new_size;
27414 + }
27415 +
27416 + map[nmap].alias = memcpy (&string_space[string_space_act],
27417 + alias, alias_len);
27418 + string_space_act += alias_len;
27419 +
27420 + map[nmap].value = memcpy (&string_space[string_space_act],
27421 + value, value_len);
27422 + string_space_act += value_len;
27423 +
27424 + ++nmap;
27425 + ++added;
27426 + }
27427 + }
27428 +
27429 + /* Possibly not the whole line fits into the buffer. Ignore
27430 + the rest of the line. */
27431 + while (strchr (buf, '\n') == NULL)
27432 + if (FGETS (buf, sizeof buf, fp) == NULL)
27433 + /* Make sure the inner loop will be left. The outer loop
27434 + will exit at the `feof' test. */
27435 + break;
27436 + }
27437 +
27438 + /* Should we test for ferror()? I think we have to silently ignore
27439 + errors. --drepper */
27440 + fclose (fp);
27441 +
27442 + if (added > 0)
27443 + qsort (map, nmap, sizeof (struct alias_map),
27444 + (int (*) (const void *, const void *)) alias_compare);
27445 +
27446 + return added;
27447 +}
27448 +
27449 +
27450 +static int
27451 +extend_alias_table ()
27452 +{
27453 + size_t new_size;
27454 + struct alias_map *new_map;
27455 +
27456 + new_size = maxmap == 0 ? 100 : 2 * maxmap;
27457 + new_map = (struct alias_map *) realloc (map, (new_size
27458 + * sizeof (struct alias_map)));
27459 + if (new_map == NULL)
27460 + /* Simply don't extend: we don't have any more core. */
27461 + return -1;
27462 +
27463 + map = new_map;
27464 + maxmap = new_size;
27465 + return 0;
27466 +}
27467 +
27468 +
27469 +static int
27470 +alias_compare (const struct alias_map *map1, const struct alias_map *map2)
27471 +{
27472 +#if defined _LIBC || defined HAVE_STRCASECMP
27473 + return strcasecmp (map1->alias, map2->alias);
27474 +#else
27475 + const unsigned char *p1 = (const unsigned char *) map1->alias;
27476 + const unsigned char *p2 = (const unsigned char *) map2->alias;
27477 + unsigned char c1, c2;
27478 +
27479 + if (p1 == p2)
27480 + return 0;
27481 +
27482 + do
27483 + {
27484 + /* I know this seems to be odd but the tolower() function in
27485 + some systems libc cannot handle nonalpha characters. */
27486 + c1 = isupper (*p1) ? tolower (*p1) : *p1;
27487 + c2 = isupper (*p2) ? tolower (*p2) : *p2;
27488 + if (c1 == '\0')
27489 + break;
27490 + ++p1;
27491 + ++p2;
27492 + }
27493 + while (c1 == c2);
27494 +
27495 + return c1 - c2;
27496 +#endif
27497 +}
27498 --- lxpanel-0.5.6.orig/data/Makefile.in
27499 +++ lxpanel-0.5.6/data/Makefile.in
27500 @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin
27501 $(top_srcdir)/configure.ac
27502 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
27503 $(ACLOCAL_M4)
27504 -mkinstalldirs = $(install_sh) -d
27505 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27506 CONFIG_HEADER = $(top_builddir)/config.h
27507 CONFIG_CLEAN_FILES =
27508 CONFIG_CLEAN_VPATH_FILES =
27509 @@ -78,6 +78,8 @@ ACLOCAL = @ACLOCAL@
27510 ALL_LINGUAS = @ALL_LINGUAS@
27511 ALL_PLUGINS_LIST = @ALL_PLUGINS_LIST@
27512 AMTAR = @AMTAR@
27513 +APPLET_CFLAGS = @APPLET_CFLAGS@
27514 +APPLET_LIBS = @APPLET_LIBS@
27515 AR = @AR@
27516 AUTOCONF = @AUTOCONF@
27517 AUTOHEADER = @AUTOHEADER@
27518 @@ -107,6 +109,8 @@ GMOFILES = @GMOFILES@
27519 GMSGFMT = @GMSGFMT@
27520 GREP = @GREP@
27521 G_CAST_CHECKS = @G_CAST_CHECKS@
27522 +INDICATORDIR = @INDICATORDIR@
27523 +INDICATORICONSDIR = @INDICATORICONSDIR@
27524 INSTALL = @INSTALL@
27525 INSTALL_DATA = @INSTALL_DATA@
27526 INSTALL_PROGRAM = @INSTALL_PROGRAM@
27527 @@ -152,8 +156,6 @@ PACKAGE_URL = @PACKAGE_URL@
27528 PACKAGE_VERSION = @PACKAGE_VERSION@
27529 PATH_SEPARATOR = @PATH_SEPARATOR@
27530 PKG_CONFIG = @PKG_CONFIG@
27531 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
27532 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
27533 PLUGINS_LIST = @PLUGINS_LIST@
27534 POFILES = @POFILES@
27535 POSUB = @POSUB@
27536 @@ -209,6 +211,7 @@ libdir = @libdir@
27537 libexecdir = @libexecdir@
27538 localedir = @localedir@
27539 localstatedir = @localstatedir@
27540 +lt_ECHO = @lt_ECHO@
27541 mandir = @mandir@
27542 mkdir_p = @mkdir_p@
27543 oldincludedir = @oldincludedir@