Ubuntu
libgnomecanvas package

Merge lp:~bcurtiswx/ubuntu/maverick/libgnomecanvas/libgnomecanvas-2.30.2 into lp:ubuntu/maverick/libgnomecanvas

  1. Maverick (10.10)
  2. libgnomecanvas-2.30.2
  3. Merge into maverick
Proposed by Brian Curtis
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~bcurtiswx/ubuntu/maverick/libgnomecanvas/libgnomecanvas-2.30.2
Merge into: lp:ubuntu/maverick/libgnomecanvas
Diff against target: 32575 lines
To merge this branch: bzr merge lp:~bcurtiswx/ubuntu/maverick/libgnomecanvas/libgnomecanvas-2.30.2
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+36785@code.launchpad.net

Description of the change

* New Upstream Release

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2009-02-09 10:31:45 +0000
3+++ INSTALL 2010-09-27 20:34:40 +0000
4@@ -2,15 +2,15 @@
5 *************************
6
7 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
8-2006, 2007 Free Software Foundation, Inc.
9+2006, 2007, 2008 Free Software Foundation, Inc.
10
11-This file is free documentation; the Free Software Foundation gives
12+ This file is free documentation; the Free Software Foundation gives
13 unlimited permission to copy, distribute and modify it.
14
15 Basic Installation
16 ==================
17
18-Briefly, the shell commands `./configure; make; make install' should
19+ Briefly, the shell commands `./configure; make; make install' should
20 configure, build, and install this package. The following
21 more-detailed instructions are generic; see the `README' file for
22 instructions specific to this package.
23@@ -73,9 +73,9 @@
24 Compilers and Options
25 =====================
26
27-Some systems require unusual options for compilation or linking that the
28-`configure' script does not know about. Run `./configure --help' for
29-details on some of the pertinent environment variables.
30+ Some systems require unusual options for compilation or linking that
31+the `configure' script does not know about. Run `./configure --help'
32+for details on some of the pertinent environment variables.
33
34 You can give `configure' initial values for configuration parameters
35 by setting variables in the command line or in the environment. Here
36@@ -88,7 +88,7 @@
37 Compiling For Multiple Architectures
38 ====================================
39
40-You can compile the package for more than one kind of computer at the
41+ You can compile the package for more than one kind of computer at the
42 same time, by placing the object files for each architecture in their
43 own directory. To do this, you can use GNU `make'. `cd' to the
44 directory where you want the object files and executables to go and run
45@@ -100,10 +100,24 @@
46 installed the package for one architecture, use `make distclean' before
47 reconfiguring for another architecture.
48
49+ On MacOS X 10.5 and later systems, you can create libraries and
50+executables that work on multiple system types--known as "fat" or
51+"universal" binaries--by specifying multiple `-arch' options to the
52+compiler but only a single `-arch' option to the preprocessor. Like
53+this:
54+
55+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
56+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
57+ CPP="gcc -E" CXXCPP="g++ -E"
58+
59+ This is not guaranteed to produce working output in all cases, you
60+may have to build one architecture at a time and combine the results
61+using the `lipo' tool if you have problems.
62+
63 Installation Names
64 ==================
65
66-By default, `make install' installs the package's commands under
67+ By default, `make install' installs the package's commands under
68 `/usr/local/bin', include files under `/usr/local/include', etc. You
69 can specify an installation prefix other than `/usr/local' by giving
70 `configure' the option `--prefix=PREFIX'.
71@@ -126,7 +140,7 @@
72 Optional Features
73 =================
74
75-Some packages pay attention to `--enable-FEATURE' options to
76+ Some packages pay attention to `--enable-FEATURE' options to
77 `configure', where FEATURE indicates an optional part of the package.
78 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
79 is something like `gnu-as' or `x' (for the X Window System). The
80@@ -138,14 +152,36 @@
81 you can use the `configure' options `--x-includes=DIR' and
82 `--x-libraries=DIR' to specify their locations.
83
84+Particular systems
85+==================
86+
87+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
88+CC is not installed, it is recommended to use the following options in
89+order to use an ANSI C compiler:
90+
91+ ./configure CC="cc -Ae"
92+
93+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
94+
95+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
96+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
97+a workaround. If GNU CC is not installed, it is therefore recommended
98+to try
99+
100+ ./configure CC="cc"
101+
102+and if that doesn't work, try
103+
104+ ./configure CC="cc -nodtk"
105+
106 Specifying the System Type
107 ==========================
108
109-There may be some features `configure' cannot figure out automatically,
110-but needs to determine by the type of machine the package will run on.
111-Usually, assuming the package is built to be run on the _same_
112-architectures, `configure' can figure that out, but if it prints a
113-message saying it cannot guess the machine type, give it the
114+ There may be some features `configure' cannot figure out
115+automatically, but needs to determine by the type of machine the package
116+will run on. Usually, assuming the package is built to be run on the
117+_same_ architectures, `configure' can figure that out, but if it prints
118+a message saying it cannot guess the machine type, give it the
119 `--build=TYPE' option. TYPE can either be a short name for the system
120 type, such as `sun4', or a canonical name which has the form:
121
122@@ -171,9 +207,9 @@
123 Sharing Defaults
124 ================
125
126-If you want to set default values for `configure' scripts to share, you
127-can create a site shell script called `config.site' that gives default
128-values for variables like `CC', `cache_file', and `prefix'.
129+ If you want to set default values for `configure' scripts to share,
130+you can create a site shell script called `config.site' that gives
131+default values for variables like `CC', `cache_file', and `prefix'.
132 `configure' looks for `PREFIX/share/config.site' if it exists, then
133 `PREFIX/etc/config.site' if it exists. Or, you can set the
134 `CONFIG_SITE' environment variable to the location of the site script.
135@@ -182,7 +218,7 @@
136 Defining Variables
137 ==================
138
139-Variables not defined in a site shell script can be set in the
140+ Variables not defined in a site shell script can be set in the
141 environment passed to `configure'. However, some packages may run
142 configure again during the build, and the customized values of these
143 variables may be lost. In order to avoid this problem, you should set
144@@ -201,11 +237,19 @@
145 `configure' Invocation
146 ======================
147
148-`configure' recognizes the following options to control how it operates.
149+ `configure' recognizes the following options to control how it
150+operates.
151
152 `--help'
153 `-h'
154- Print a summary of the options to `configure', and exit.
155+ Print a summary of all of the options to `configure', and exit.
156+
157+`--help=short'
158+`--help=recursive'
159+ Print a summary of the options unique to this package's
160+ `configure', and exit. The `short' variant lists options used
161+ only in the top level, while the `recursive' variant lists options
162+ also present in any nested packages.
163
164 `--version'
165 `-V'
166@@ -232,6 +276,16 @@
167 Look for the package's source code in directory DIR. Usually
168 `configure' can determine that directory automatically.
169
170+`--prefix=DIR'
171+ Use DIR as the installation prefix. *Note Installation Names::
172+ for more details, including other options available for fine-tuning
173+ the installation locations.
174+
175+`--no-create'
176+`-n'
177+ Run the configure checks, but stop before creating any output
178+ files.
179+
180 `configure' also accepts some other, not widely useful, options. Run
181 `configure --help' for more details.
182
183
184=== modified file 'Makefile.in'
185--- Makefile.in 2010-03-30 19:58:47 +0000
186+++ Makefile.in 2010-09-27 20:34:40 +0000
187@@ -1,4 +1,4 @@
188-# Makefile.in generated by automake 1.11 from Makefile.am.
189+# Makefile.in generated by automake 1.11.1 from Makefile.am.
190 # @configure_input@
191
192 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
193@@ -189,10 +189,13 @@
194 PACKAGE_NAME = @PACKAGE_NAME@
195 PACKAGE_STRING = @PACKAGE_STRING@
196 PACKAGE_TARNAME = @PACKAGE_TARNAME@
197+PACKAGE_URL = @PACKAGE_URL@
198 PACKAGE_VERSION = @PACKAGE_VERSION@
199 PATH_SEPARATOR = @PATH_SEPARATOR@
200 PERL = @PERL@
201 PKG_CONFIG = @PKG_CONFIG@
202+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
203+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
204 POFILES = @POFILES@
205 POSUB = @POSUB@
206 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
207@@ -243,7 +246,6 @@
208 libexecdir = @libexecdir@
209 localedir = @localedir@
210 localstatedir = @localstatedir@
211-lt_ECHO = @lt_ECHO@
212 mandir = @mandir@
213 mkdir_p = @mkdir_p@
214 oldincludedir = @oldincludedir@
215@@ -348,7 +350,7 @@
216 # (which will cause the Makefiles to be regenerated when you run `make');
217 # (2) otherwise, pass the desired values on the `make' command line.
218 $(RECURSIVE_TARGETS):
219- @failcom='exit 1'; \
220+ @fail= failcom='exit 1'; \
221 for f in x $$MAKEFLAGS; do \
222 case $$f in \
223 *=* | --[!k]*);; \
224@@ -373,7 +375,7 @@
225 fi; test -z "$$fail"
226
227 $(RECURSIVE_CLEAN_TARGETS):
228- @failcom='exit 1'; \
229+ @fail= failcom='exit 1'; \
230 for f in x $$MAKEFLAGS; do \
231 case $$f in \
232 *=* | --[!k]*);; \
233@@ -537,7 +539,8 @@
234 fi; \
235 done
236 -test -n "$(am__skip_mode_fix)" \
237- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
238+ || find "$(distdir)" -type d ! -perm -755 \
239+ -exec chmod u+rwx,go+rx {} \; -o \
240 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
241 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
242 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
243@@ -581,17 +584,17 @@
244 distcheck: dist
245 case '$(DIST_ARCHIVES)' in \
246 *.tar.gz*) \
247- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
248+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
249 *.tar.bz2*) \
250- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
251+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
252 *.tar.lzma*) \
253- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
254+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
255 *.tar.xz*) \
256 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
257 *.tar.Z*) \
258 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
259 *.shar.gz*) \
260- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
261+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
262 *.zip*) \
263 unzip $(distdir).zip ;;\
264 esac
265
266=== modified file 'NEWS'
267--- NEWS 2010-04-01 21:42:40 +0000
268+++ NEWS 2010-09-27 20:34:40 +0000
269@@ -1,3 +1,19 @@
270+libgnomecanvas 2.30.2
271+---------------------
272+
273+What's new since 2.30.1
274+
275+Translations
276+ * Takayuki KUSANO (ja)
277+ * Dirgita (in)
278+ * Fran Diéguez (ga)
279+ * Matej Urbančič (sl)
280+ * Kristjan Schmidt (eo)
281+ * Thomas Thurman (sh)
282+ * Andika Triwidada (in)
283+ * Peteris Krisjanis (lv)
284+ * Shankar Prasad (ka)
285+
286 libgnomecanvas 2.30.1
287 ---------------------
288
289
290=== modified file 'aclocal.m4'
291--- aclocal.m4 2010-03-30 19:58:47 +0000
292+++ aclocal.m4 2010-09-27 20:34:40 +0000
293@@ -1,4 +1,4 @@
294-# generated automatically by aclocal 1.11 -*- Autoconf -*-
295+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
296
297 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
298 # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
299@@ -13,8 +13,8 @@
300
301 m4_ifndef([AC_AUTOCONF_VERSION],
302 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
303-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
304-[m4_warning([this file was generated for autoconf 2.63.
305+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
306+[m4_warning([this file was generated for autoconf 2.66.
307 You have another version of autoconf. It may work, but is not guaranteed to.
308 If you have problems, you may need to regenerate the build system entirely.
309 To do so, use the procedure documented by the package, typically `autoreconf'.])])
310@@ -34,7 +34,7 @@
311 [am__api_version='1.11'
312 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
313 dnl require some minimum version. Point them to the right macro.
314-m4_if([$1], [1.11], [],
315+m4_if([$1], [1.11.1], [],
316 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
317 ])
318
319@@ -50,7 +50,7 @@
320 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
321 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
322 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
323-[AM_AUTOMAKE_VERSION([1.11])dnl
324+[AM_AUTOMAKE_VERSION([1.11.1])dnl
325 m4_ifndef([AC_AUTOCONF_VERSION],
326 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
327 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
328@@ -1001,841 +1001,11 @@
329 AC_SUBST([am__untar])
330 ]) # _AM_PROG_TAR
331
332-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
333-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
334-#
335-# This file is free software, distributed under the terms of the GNU
336-# General Public License. As a special exception to the GNU General
337-# Public License, this file may be distributed as part of a program
338-# that contains a configuration script generated by Autoconf, under
339-# the same distribution terms as the rest of that program.
340-#
341-# This file can be copied and used freely without restrictions. It can
342-# be used in projects which are not available under the GNU Public License
343-# but which still want to provide support for the GNU gettext functionality.
344-#
345-# Macro to add for using GNU gettext.
346-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
347-#
348-# Modified to never use included libintl.
349-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
350-#
351-# Major rework to remove unused code
352-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
353-#
354-# Added better handling of ALL_LINGUAS from GNU gettext version
355-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
356-#
357-# Modified to require ngettext
358-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
359-#
360-# We need this here as well, since someone might use autoconf-2.5x
361-# to configure GLib then an older version to configure a package
362-# using AM_GLIB_GNU_GETTEXT
363-AC_PREREQ(2.53)
364-
365-dnl
366-dnl We go to great lengths to make sure that aclocal won't
367-dnl try to pull in the installed version of these macros
368-dnl when running aclocal in the glib directory.
369-dnl
370-m4_copy([AC_DEFUN],[glib_DEFUN])
371-m4_copy([AC_REQUIRE],[glib_REQUIRE])
372-dnl
373-dnl At the end, if we're not within glib, we'll define the public
374-dnl definitions in terms of our private definitions.
375-dnl
376-
377-# GLIB_LC_MESSAGES
378-#--------------------
379-glib_DEFUN([GLIB_LC_MESSAGES],
380- [AC_CHECK_HEADERS([locale.h])
381- if test $ac_cv_header_locale_h = yes; then
382- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
383- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
384- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
385- if test $am_cv_val_LC_MESSAGES = yes; then
386- AC_DEFINE(HAVE_LC_MESSAGES, 1,
387- [Define if your <locale.h> file defines LC_MESSAGES.])
388- fi
389- fi])
390-
391-# GLIB_PATH_PROG_WITH_TEST
392-#----------------------------
393-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
394-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
395-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
396-[# Extract the first word of "$2", so it can be a program name with args.
397-set dummy $2; ac_word=[$]2
398-AC_MSG_CHECKING([for $ac_word])
399-AC_CACHE_VAL(ac_cv_path_$1,
400-[case "[$]$1" in
401- /*)
402- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
403- ;;
404- *)
405- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
406- for ac_dir in ifelse([$5], , $PATH, [$5]); do
407- test -z "$ac_dir" && ac_dir=.
408- if test -f $ac_dir/$ac_word; then
409- if [$3]; then
410- ac_cv_path_$1="$ac_dir/$ac_word"
411- break
412- fi
413- fi
414- done
415- IFS="$ac_save_ifs"
416-dnl If no 4th arg is given, leave the cache variable unset,
417-dnl so AC_PATH_PROGS will keep looking.
418-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
419-])dnl
420- ;;
421-esac])dnl
422-$1="$ac_cv_path_$1"
423-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
424- AC_MSG_RESULT([$]$1)
425-else
426- AC_MSG_RESULT(no)
427-fi
428-AC_SUBST($1)dnl
429-])
430-
431-# GLIB_WITH_NLS
432-#-----------------
433-glib_DEFUN([GLIB_WITH_NLS],
434- dnl NLS is obligatory
435- [USE_NLS=yes
436- AC_SUBST(USE_NLS)
437-
438- gt_cv_have_gettext=no
439-
440- CATOBJEXT=NONE
441- XGETTEXT=:
442- INTLLIBS=
443-
444- AC_CHECK_HEADER(libintl.h,
445- [gt_cv_func_dgettext_libintl="no"
446- libintl_extra_libs=""
447-
448- #
449- # First check in libc
450- #
451- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
452- [AC_TRY_LINK([
453-#include <libintl.h>
454-],
455- [return !ngettext ("","", 1)],
456- gt_cv_func_ngettext_libc=yes,
457- gt_cv_func_ngettext_libc=no)
458- ])
459-
460- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
461- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
462- [AC_TRY_LINK([
463-#include <libintl.h>
464-],
465- [return !dgettext ("","")],
466- gt_cv_func_dgettext_libc=yes,
467- gt_cv_func_dgettext_libc=no)
468- ])
469- fi
470-
471- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
472- AC_CHECK_FUNCS(bind_textdomain_codeset)
473- fi
474-
475- #
476- # If we don't have everything we want, check in libintl
477- #
478- if test "$gt_cv_func_dgettext_libc" != "yes" \
479- || test "$gt_cv_func_ngettext_libc" != "yes" \
480- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
481-
482- AC_CHECK_LIB(intl, bindtextdomain,
483- [AC_CHECK_LIB(intl, ngettext,
484- [AC_CHECK_LIB(intl, dgettext,
485- gt_cv_func_dgettext_libintl=yes)])])
486-
487- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
488- AC_MSG_CHECKING([if -liconv is needed to use gettext])
489- AC_MSG_RESULT([])
490- AC_CHECK_LIB(intl, ngettext,
491- [AC_CHECK_LIB(intl, dcgettext,
492- [gt_cv_func_dgettext_libintl=yes
493- libintl_extra_libs=-liconv],
494- :,-liconv)],
495- :,-liconv)
496- fi
497-
498- #
499- # If we found libintl, then check in it for bind_textdomain_codeset();
500- # we'll prefer libc if neither have bind_textdomain_codeset(),
501- # and both have dgettext and ngettext
502- #
503- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
504- glib_save_LIBS="$LIBS"
505- LIBS="$LIBS -lintl $libintl_extra_libs"
506- unset ac_cv_func_bind_textdomain_codeset
507- AC_CHECK_FUNCS(bind_textdomain_codeset)
508- LIBS="$glib_save_LIBS"
509-
510- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
511- gt_cv_func_dgettext_libc=no
512- else
513- if test "$gt_cv_func_dgettext_libc" = "yes" \
514- && test "$gt_cv_func_ngettext_libc" = "yes"; then
515- gt_cv_func_dgettext_libintl=no
516- fi
517- fi
518- fi
519- fi
520-
521- if test "$gt_cv_func_dgettext_libc" = "yes" \
522- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
523- gt_cv_have_gettext=yes
524- fi
525-
526- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
527- INTLLIBS="-lintl $libintl_extra_libs"
528- fi
529-
530- if test "$gt_cv_have_gettext" = "yes"; then
531- AC_DEFINE(HAVE_GETTEXT,1,
532- [Define if the GNU gettext() function is already present or preinstalled.])
533- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
534- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
535- if test "$MSGFMT" != "no"; then
536- glib_save_LIBS="$LIBS"
537- LIBS="$LIBS $INTLLIBS"
538- AC_CHECK_FUNCS(dcgettext)
539- MSGFMT_OPTS=
540- AC_MSG_CHECKING([if msgfmt accepts -c])
541- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
542-msgid ""
543-msgstr ""
544-"Content-Type: text/plain; charset=UTF-8\n"
545-"Project-Id-Version: test 1.0\n"
546-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
547-"Last-Translator: test <foo@bar.xx>\n"
548-"Language-Team: C <LL@li.org>\n"
549-"MIME-Version: 1.0\n"
550-"Content-Transfer-Encoding: 8bit\n"
551-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
552- AC_SUBST(MSGFMT_OPTS)
553- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
554- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
555- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
556- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
557- return _nl_msg_cat_cntr],
558- [CATOBJEXT=.gmo
559- DATADIRNAME=share],
560- [case $host in
561- *-*-solaris*)
562- dnl On Solaris, if bind_textdomain_codeset is in libc,
563- dnl GNU format message catalog is always supported,
564- dnl since both are added to the libc all together.
565- dnl Hence, we'd like to go with DATADIRNAME=share and
566- dnl and CATOBJEXT=.gmo in this case.
567- AC_CHECK_FUNC(bind_textdomain_codeset,
568- [CATOBJEXT=.gmo
569- DATADIRNAME=share],
570- [CATOBJEXT=.mo
571- DATADIRNAME=lib])
572- ;;
573- *)
574- CATOBJEXT=.mo
575- DATADIRNAME=lib
576- ;;
577- esac])
578- LIBS="$glib_save_LIBS"
579- INSTOBJEXT=.mo
580- else
581- gt_cv_have_gettext=no
582- fi
583- fi
584- ])
585-
586- if test "$gt_cv_have_gettext" = "yes" ; then
587- AC_DEFINE(ENABLE_NLS, 1,
588- [always defined to indicate that i18n is enabled])
589- fi
590-
591- dnl Test whether we really found GNU xgettext.
592- if test "$XGETTEXT" != ":"; then
593- dnl If it is not GNU xgettext we define it as : so that the
594- dnl Makefiles still can work.
595- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
596- : ;
597- else
598- AC_MSG_RESULT(
599- [found xgettext program is not GNU xgettext; ignore it])
600- XGETTEXT=":"
601- fi
602- fi
603-
604- # We need to process the po/ directory.
605- POSUB=po
606-
607- AC_OUTPUT_COMMANDS(
608- [case "$CONFIG_FILES" in *po/Makefile.in*)
609- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
610- esac])
611-
612- dnl These rules are solely for the distribution goal. While doing this
613- dnl we only have to keep exactly one list of the available catalogs
614- dnl in configure.in.
615- for lang in $ALL_LINGUAS; do
616- GMOFILES="$GMOFILES $lang.gmo"
617- POFILES="$POFILES $lang.po"
618- done
619-
620- dnl Make all variables we use known to autoconf.
621- AC_SUBST(CATALOGS)
622- AC_SUBST(CATOBJEXT)
623- AC_SUBST(DATADIRNAME)
624- AC_SUBST(GMOFILES)
625- AC_SUBST(INSTOBJEXT)
626- AC_SUBST(INTLLIBS)
627- AC_SUBST(PO_IN_DATADIR_TRUE)
628- AC_SUBST(PO_IN_DATADIR_FALSE)
629- AC_SUBST(POFILES)
630- AC_SUBST(POSUB)
631- ])
632-
633-# AM_GLIB_GNU_GETTEXT
634-# -------------------
635-# Do checks necessary for use of gettext. If a suitable implementation
636-# of gettext is found in either in libintl or in the C library,
637-# it will set INTLLIBS to the libraries needed for use of gettext
638-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
639-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
640-# on various variables needed by the Makefile.in.in installed by
641-# glib-gettextize.
642-dnl
643-glib_DEFUN([GLIB_GNU_GETTEXT],
644- [AC_REQUIRE([AC_PROG_CC])dnl
645- AC_REQUIRE([AC_HEADER_STDC])dnl
646-
647- GLIB_LC_MESSAGES
648- GLIB_WITH_NLS
649-
650- if test "$gt_cv_have_gettext" = "yes"; then
651- if test "x$ALL_LINGUAS" = "x"; then
652- LINGUAS=
653- else
654- AC_MSG_CHECKING(for catalogs to be installed)
655- NEW_LINGUAS=
656- for presentlang in $ALL_LINGUAS; do
657- useit=no
658- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
659- desiredlanguages="$LINGUAS"
660- else
661- desiredlanguages="$ALL_LINGUAS"
662- fi
663- for desiredlang in $desiredlanguages; do
664- # Use the presentlang catalog if desiredlang is
665- # a. equal to presentlang, or
666- # b. a variant of presentlang (because in this case,
667- # presentlang can be used as a fallback for messages
668- # which are not translated in the desiredlang catalog).
669- case "$desiredlang" in
670- "$presentlang"*) useit=yes;;
671- esac
672- done
673- if test $useit = yes; then
674- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
675- fi
676- done
677- LINGUAS=$NEW_LINGUAS
678- AC_MSG_RESULT($LINGUAS)
679- fi
680-
681- dnl Construct list of names of catalog files to be constructed.
682- if test -n "$LINGUAS"; then
683- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
684- fi
685- fi
686-
687- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
688- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
689- dnl Try to locate is.
690- MKINSTALLDIRS=
691- if test -n "$ac_aux_dir"; then
692- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
693- fi
694- if test -z "$MKINSTALLDIRS"; then
695- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
696- fi
697- AC_SUBST(MKINSTALLDIRS)
698-
699- dnl Generate list of files to be processed by xgettext which will
700- dnl be included in po/Makefile.
701- test -d po || mkdir po
702- if test "x$srcdir" != "x."; then
703- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
704- posrcprefix="$srcdir/"
705- else
706- posrcprefix="../$srcdir/"
707- fi
708- else
709- posrcprefix="../"
710- fi
711- rm -f po/POTFILES
712- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
713- < $srcdir/po/POTFILES.in > po/POTFILES
714- ])
715-
716-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
717-# -------------------------------
718-# Define VARIABLE to the location where catalog files will
719-# be installed by po/Makefile.
720-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
721-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
722-glib_save_prefix="$prefix"
723-glib_save_exec_prefix="$exec_prefix"
724-glib_save_datarootdir="$datarootdir"
725-test "x$prefix" = xNONE && prefix=$ac_default_prefix
726-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
727-datarootdir=`eval echo "${datarootdir}"`
728-if test "x$CATOBJEXT" = "x.mo" ; then
729- localedir=`eval echo "${libdir}/locale"`
730-else
731- localedir=`eval echo "${datadir}/locale"`
732-fi
733-prefix="$glib_save_prefix"
734-exec_prefix="$glib_save_exec_prefix"
735-datarootdir="$glib_save_datarootdir"
736-AC_DEFINE_UNQUOTED($1, "$localedir",
737- [Define the location where the catalogs will be installed])
738-])
739-
740-dnl
741-dnl Now the definitions that aclocal will find
742-dnl
743-ifdef(glib_configure_in,[],[
744-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
745-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
746-])dnl
747-
748-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
749-#
750-# Create a temporary file with TEST-FILE as its contents and pass the
751-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
752-# 0 and perform ACTION-IF-FAIL for any other exit status.
753-AC_DEFUN([GLIB_RUN_PROG],
754-[cat >conftest.foo <<_ACEOF
755-$2
756-_ACEOF
757-if AC_RUN_LOG([$1 conftest.foo]); then
758- m4_ifval([$3], [$3], [:])
759-m4_ifvaln([$4], [else $4])dnl
760-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
761-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
762-fi])
763-
764-
765-dnl GNOME_COMPILE_WARNINGS
766-dnl Turn on many useful compiler warnings
767-dnl For now, only works on GCC
768-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
769- dnl ******************************
770- dnl More compiler warnings
771- dnl ******************************
772-
773- AC_ARG_ENABLE(compile-warnings,
774- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
775- [Turn on compiler warnings]),,
776- [enable_compile_warnings="m4_default([$1],[yes])"])
777-
778- warnCFLAGS=
779- if test "x$GCC" != xyes; then
780- enable_compile_warnings=no
781- fi
782-
783- warning_flags=
784- realsave_CFLAGS="$CFLAGS"
785-
786- case "$enable_compile_warnings" in
787- no)
788- warning_flags=
789- ;;
790- minimum)
791- warning_flags="-Wall"
792- ;;
793- yes)
794- warning_flags="-Wall -Wmissing-prototypes"
795- ;;
796- maximum|error)
797- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
798- CFLAGS="$warning_flags $CFLAGS"
799- for option in -Wno-sign-compare; do
800- SAVE_CFLAGS="$CFLAGS"
801- CFLAGS="$CFLAGS $option"
802- AC_MSG_CHECKING([whether gcc understands $option])
803- AC_TRY_COMPILE([], [],
804- has_option=yes,
805- has_option=no,)
806- CFLAGS="$SAVE_CFLAGS"
807- AC_MSG_RESULT($has_option)
808- if test $has_option = yes; then
809- warning_flags="$warning_flags $option"
810- fi
811- unset has_option
812- unset SAVE_CFLAGS
813- done
814- unset option
815- if test "$enable_compile_warnings" = "error" ; then
816- warning_flags="$warning_flags -Werror"
817- fi
818- ;;
819- *)
820- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
821- ;;
822- esac
823- CFLAGS="$realsave_CFLAGS"
824- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
825- AC_MSG_RESULT($warning_flags)
826-
827- AC_ARG_ENABLE(iso-c,
828- AC_HELP_STRING([--enable-iso-c],
829- [Try to warn if code is not ISO C ]),,
830- [enable_iso_c=no])
831-
832- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
833- complCFLAGS=
834- if test "x$enable_iso_c" != "xno"; then
835- if test "x$GCC" = "xyes"; then
836- case " $CFLAGS " in
837- *[\ \ ]-ansi[\ \ ]*) ;;
838- *) complCFLAGS="$complCFLAGS -ansi" ;;
839- esac
840- case " $CFLAGS " in
841- *[\ \ ]-pedantic[\ \ ]*) ;;
842- *) complCFLAGS="$complCFLAGS -pedantic" ;;
843- esac
844- fi
845- fi
846- AC_MSG_RESULT($complCFLAGS)
847-
848- WARN_CFLAGS="$warning_flags $complCFLAGS"
849- AC_SUBST(WARN_CFLAGS)
850-])
851-
852-dnl For C++, do basically the same thing.
853-
854-AC_DEFUN([GNOME_CXX_WARNINGS],[
855- AC_ARG_ENABLE(cxx-warnings,
856- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
857- [Turn on compiler warnings.]),,
858- [enable_cxx_warnings="m4_default([$1],[minimum])"])
859-
860- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
861- warnCXXFLAGS=
862- if test "x$GXX" != xyes; then
863- enable_cxx_warnings=no
864- fi
865- if test "x$enable_cxx_warnings" != "xno"; then
866- if test "x$GXX" = "xyes"; then
867- case " $CXXFLAGS " in
868- *[\ \ ]-Wall[\ \ ]*) ;;
869- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
870- esac
871-
872- ## -W is not all that useful. And it cannot be controlled
873- ## with individual -Wno-xxx flags, unlike -Wall
874- if test "x$enable_cxx_warnings" = "xyes"; then
875- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
876- fi
877- fi
878- fi
879- AC_MSG_RESULT($warnCXXFLAGS)
880-
881- AC_ARG_ENABLE(iso-cxx,
882- AC_HELP_STRING([--enable-iso-cxx],
883- [Try to warn if code is not ISO C++ ]),,
884- [enable_iso_cxx=no])
885-
886- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
887- complCXXFLAGS=
888- if test "x$enable_iso_cxx" != "xno"; then
889- if test "x$GXX" = "xyes"; then
890- case " $CXXFLAGS " in
891- *[\ \ ]-ansi[\ \ ]*) ;;
892- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
893- esac
894-
895- case " $CXXFLAGS " in
896- *[\ \ ]-pedantic[\ \ ]*) ;;
897- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
898- esac
899- fi
900- fi
901- AC_MSG_RESULT($complCXXFLAGS)
902-
903- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
904- AC_SUBST(WARN_CXXFLAGS)
905-])
906-
907-dnl -*- mode: autoconf -*-
908-
909-# serial 1
910-
911-dnl Usage:
912-dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
913-AC_DEFUN([GTK_DOC_CHECK],
914-[
915- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
916- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
917-
918- dnl check for tools we added during development
919- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
920- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
921- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
922-
923- dnl for overriding the documentation installation directory
924- AC_ARG_WITH([html-dir],
925- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
926- [with_html_dir='${datadir}/gtk-doc/html'])
927- HTML_DIR="$with_html_dir"
928- AC_SUBST([HTML_DIR])
929-
930- dnl enable/disable documentation building
931- AC_ARG_ENABLE([gtk-doc],
932- AS_HELP_STRING([--enable-gtk-doc],
933- [use gtk-doc to build documentation [[default=no]]]),,
934- [enable_gtk_doc=no])
935-
936- if test x$enable_gtk_doc = xyes; then
937- ifelse([$1],[],
938- [PKG_CHECK_EXISTS([gtk-doc],,
939- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
940- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
941- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
942- fi
943-
944- AC_MSG_CHECKING([whether to build gtk-doc documentation])
945- AC_MSG_RESULT($enable_gtk_doc)
946-
947- dnl enable/disable output formats
948- AC_ARG_ENABLE([gtk-doc-html],
949- AS_HELP_STRING([--enable-gtk-doc-html],
950- [build documentation in html format [[default=yes]]]),,
951- [enable_gtk_doc_html=yes])
952- AC_ARG_ENABLE([gtk-doc-pdf],
953- AS_HELP_STRING([--enable-gtk-doc-pdf],
954- [build documentation in pdf format [[default=no]]]),,
955- [enable_gtk_doc_pdf=no])
956-
957- if test -z "$GTKDOC_MKPDF"; then
958- enable_gtk_doc_pdf=no
959- fi
960-
961-
962- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
963- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
964- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
965- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
966- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
967-])
968-
969-
970-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
971-# serial 40 IT_PROG_INTLTOOL
972-AC_DEFUN([IT_PROG_INTLTOOL], [
973-AC_PREREQ([2.50])dnl
974-AC_REQUIRE([AM_NLS])dnl
975-
976-case "$am__api_version" in
977- 1.[01234])
978- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
979- ;;
980- *)
981- ;;
982-esac
983-
984-if test -n "$1"; then
985- AC_MSG_CHECKING([for intltool >= $1])
986-
987- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
988- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
989- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
990- ]
991- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
992- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
993- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
994-fi
995-
996-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
997-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
998-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
999-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
1000- AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
1001-fi
1002-
1003- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1004-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1005- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1006- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1007- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
1008- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1009- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1010- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1011-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1012- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1013- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1014- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
1015- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1016- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1017- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1018- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1019- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1020- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1021- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1022-
1023-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
1024-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
1025-_IT_SUBST(INTLTOOL_KEYS_RULE)
1026-_IT_SUBST(INTLTOOL_PROP_RULE)
1027-_IT_SUBST(INTLTOOL_OAF_RULE)
1028-_IT_SUBST(INTLTOOL_PONG_RULE)
1029-_IT_SUBST(INTLTOOL_SERVER_RULE)
1030-_IT_SUBST(INTLTOOL_SHEET_RULE)
1031-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
1032-_IT_SUBST(INTLTOOL_UI_RULE)
1033-_IT_SUBST(INTLTOOL_XAM_RULE)
1034-_IT_SUBST(INTLTOOL_KBD_RULE)
1035-_IT_SUBST(INTLTOOL_XML_RULE)
1036-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
1037-_IT_SUBST(INTLTOOL_CAVES_RULE)
1038-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
1039-_IT_SUBST(INTLTOOL_THEME_RULE)
1040-_IT_SUBST(INTLTOOL_SERVICE_RULE)
1041-_IT_SUBST(INTLTOOL_POLICY_RULE)
1042-
1043-# Check the gettext tools to make sure they are GNU
1044-AC_PATH_PROG(XGETTEXT, xgettext)
1045-AC_PATH_PROG(MSGMERGE, msgmerge)
1046-AC_PATH_PROG(MSGFMT, msgfmt)
1047-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1048-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
1049- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
1050-fi
1051-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
1052-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
1053-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
1054-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
1055- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
1056-fi
1057-
1058-AC_PATH_PROG(INTLTOOL_PERL, perl)
1059-if test -z "$INTLTOOL_PERL"; then
1060- AC_MSG_ERROR([perl not found])
1061-fi
1062-AC_MSG_CHECKING([for perl >= 5.8.1])
1063-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
1064-if test $? -ne 0; then
1065- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
1066-else
1067- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
1068- AC_MSG_RESULT([$IT_PERL_VERSION])
1069-fi
1070-if test "x$2" != "xno-xml"; then
1071- AC_MSG_CHECKING([for XML::Parser])
1072- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
1073- AC_MSG_RESULT([ok])
1074- else
1075- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
1076- fi
1077-fi
1078-
1079-# Substitute ALL_LINGUAS so we can use it in po/Makefile
1080-AC_SUBST(ALL_LINGUAS)
1081-
1082-# Set DATADIRNAME correctly if it is not set yet
1083-# (copied from glib-gettext.m4)
1084-if test -z "$DATADIRNAME"; then
1085- AC_LINK_IFELSE(
1086- [AC_LANG_PROGRAM([[]],
1087- [[extern int _nl_msg_cat_cntr;
1088- return _nl_msg_cat_cntr]])],
1089- [DATADIRNAME=share],
1090- [case $host in
1091- *-*-solaris*)
1092- dnl On Solaris, if bind_textdomain_codeset is in libc,
1093- dnl GNU format message catalog is always supported,
1094- dnl since both are added to the libc all together.
1095- dnl Hence, we'd like to go with DATADIRNAME=share
1096- dnl in this case.
1097- AC_CHECK_FUNC(bind_textdomain_codeset,
1098- [DATADIRNAME=share], [DATADIRNAME=lib])
1099- ;;
1100- *)
1101- [DATADIRNAME=lib]
1102- ;;
1103- esac])
1104-fi
1105-AC_SUBST(DATADIRNAME)
1106-
1107-IT_PO_SUBDIR([po])
1108-
1109-])
1110-
1111-
1112-# IT_PO_SUBDIR(DIRNAME)
1113-# ---------------------
1114-# All po subdirs have to be declared with this macro; the subdir "po" is
1115-# declared by IT_PROG_INTLTOOL.
1116-#
1117-AC_DEFUN([IT_PO_SUBDIR],
1118-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
1119-dnl
1120-dnl The following CONFIG_COMMANDS should be exetuted at the very end
1121-dnl of config.status.
1122-AC_CONFIG_COMMANDS_PRE([
1123- AC_CONFIG_COMMANDS([$1/stamp-it], [
1124- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
1125- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
1126- fi
1127- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
1128- >"$1/stamp-it.tmp"
1129- [sed '/^#/d
1130- s/^[[].*] *//
1131- /^[ ]*$/d
1132- '"s|^| $ac_top_srcdir/|" \
1133- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
1134- ]
1135- [sed '/^POTFILES =/,/[^\\]$/ {
1136- /^POTFILES =/!d
1137- r $1/POTFILES
1138- }
1139- ' "$1/Makefile.in" >"$1/Makefile"]
1140- rm -f "$1/Makefile.tmp"
1141- mv "$1/stamp-it.tmp" "$1/stamp-it"
1142- ])
1143-])dnl
1144-])
1145-
1146-# _IT_SUBST(VARIABLE)
1147-# -------------------
1148-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
1149-#
1150-AC_DEFUN([_IT_SUBST],
1151-[
1152-AC_SUBST([$1])
1153-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
1154-]
1155-)
1156-
1157-# deprecated macros
1158-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
1159-# A hint is needed for aclocal from Automake <= 1.9.4:
1160-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
1161-
1162-
1163 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1164 #
1165 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1166-# 2006, 2007, 2008 Free Software Foundation, Inc.
1167+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1168+# Inc.
1169 # Written by Gordon Matzigkeit, 1996
1170 #
1171 # This file is free software; the Free Software Foundation gives
1172@@ -1844,7 +1014,8 @@
1173
1174 m4_define([_LT_COPYING], [dnl
1175 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1176-# 2006, 2007, 2008 Free Software Foundation, Inc.
1177+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1178+# Inc.
1179 # Written by Gordon Matzigkeit, 1996
1180 #
1181 # This file is part of GNU Libtool.
1182@@ -1871,7 +1042,7 @@
1183 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1184 ])
1185
1186-# serial 56 LT_INIT
1187+# serial 57 LT_INIT
1188
1189
1190 # LT_PREREQ(VERSION)
1191@@ -1900,6 +1071,7 @@
1192 # ------------------
1193 AC_DEFUN([LT_INIT],
1194 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
1195+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1196 AC_BEFORE([$0], [LT_LANG])dnl
1197 AC_BEFORE([$0], [LT_OUTPUT])dnl
1198 AC_BEFORE([$0], [LTDL_INIT])dnl
1199@@ -1916,6 +1088,8 @@
1200 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
1201 m4_require([_LT_PROG_LTMAIN])dnl
1202
1203+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
1204+
1205 dnl Parse OPTIONS
1206 _LT_SET_OPTIONS([$0], [$1])
1207
1208@@ -1952,7 +1126,7 @@
1209 *) break;;
1210 esac
1211 done
1212-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1213+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
1214 ])
1215
1216
1217@@ -1972,6 +1146,9 @@
1218 m4_defun([_LT_SETUP],
1219 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
1220 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1221+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
1222+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
1223+
1224 _LT_DECL([], [host_alias], [0], [The host system])dnl
1225 _LT_DECL([], [host], [0])dnl
1226 _LT_DECL([], [host_os], [0])dnl
1227@@ -2013,7 +1190,6 @@
1228 _LT_CHECK_OBJDIR
1229
1230 m4_require([_LT_TAG_COMPILER])dnl
1231-_LT_PROG_ECHO_BACKSLASH
1232
1233 case $host_os in
1234 aix3*)
1235@@ -2027,23 +1203,6 @@
1236 ;;
1237 esac
1238
1239-# Sed substitution that helps us do robust quoting. It backslashifies
1240-# metacharacters that are still active within double-quoted strings.
1241-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
1242-
1243-# Same as above, but do not quote variable references.
1244-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
1245-
1246-# Sed substitution to delay expansion of an escaped shell variable in a
1247-# double_quote_subst'ed string.
1248-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1249-
1250-# Sed substitution to delay expansion of an escaped single quote.
1251-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
1252-
1253-# Sed substitution to avoid accidental globbing in evaled expressions
1254-no_glob_subst='s/\*/\\\*/g'
1255-
1256 # Global variables:
1257 ofile=libtool
1258 can_build_shared=yes
1259@@ -2084,6 +1243,28 @@
1260 ])# _LT_SETUP
1261
1262
1263+# _LT_PREPARE_SED_QUOTE_VARS
1264+# --------------------------
1265+# Define a few sed substitution that help us do robust quoting.
1266+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
1267+[# Backslashify metacharacters that are still active within
1268+# double-quoted strings.
1269+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
1270+
1271+# Same as above, but do not quote variable references.
1272+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
1273+
1274+# Sed substitution to delay expansion of an escaped shell variable in a
1275+# double_quote_subst'ed string.
1276+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1277+
1278+# Sed substitution to delay expansion of an escaped single quote.
1279+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
1280+
1281+# Sed substitution to avoid accidental globbing in evaled expressions
1282+no_glob_subst='s/\*/\\\*/g'
1283+])
1284+
1285 # _LT_PROG_LTMAIN
1286 # ---------------
1287 # Note that this code is called both from `configure', and `config.status'
1288@@ -2236,7 +1417,7 @@
1289 # declaration there will have the same value as in `configure'. VARNAME
1290 # must have a single quote delimited value for this to work.
1291 m4_define([_LT_CONFIG_STATUS_DECLARE],
1292-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
1293+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
1294
1295
1296 # _LT_CONFIG_STATUS_DECLARATIONS
1297@@ -2246,7 +1427,7 @@
1298 # embedded single quotes properly. In configure, this macro expands
1299 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
1300 #
1301-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
1302+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
1303 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
1304 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
1305 [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
1306@@ -2345,12 +1526,20 @@
1307 LTCFLAGS='$LTCFLAGS'
1308 compiler='$compiler_DEFAULT'
1309
1310+# A function that is used when there is no print builtin or printf.
1311+func_fallback_echo ()
1312+{
1313+ eval 'cat <<_LTECHO_EOF
1314+\$[]1
1315+_LTECHO_EOF'
1316+}
1317+
1318 # Quote evaled strings.
1319 for var in lt_decl_all_varnames([[ \
1320 ]], lt_decl_quote_varnames); do
1321- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
1322+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
1323 *[[\\\\\\\`\\"\\\$]]*)
1324- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
1325+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
1326 ;;
1327 *)
1328 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
1329@@ -2361,9 +1550,9 @@
1330 # Double-quote double-evaled strings.
1331 for var in lt_decl_all_varnames([[ \
1332 ]], lt_decl_dquote_varnames); do
1333- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
1334+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
1335 *[[\\\\\\\`\\"\\\$]]*)
1336- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
1337+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
1338 ;;
1339 *)
1340 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
1341@@ -2371,16 +1560,38 @@
1342 esac
1343 done
1344
1345-# Fix-up fallback echo if it was mangled by the above quoting rules.
1346-case \$lt_ECHO in
1347-*'\\\[$]0 --fallback-echo"')dnl "
1348- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
1349- ;;
1350-esac
1351-
1352 _LT_OUTPUT_LIBTOOL_INIT
1353 ])
1354
1355+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
1356+# ------------------------------------
1357+# Generate a child script FILE with all initialization necessary to
1358+# reuse the environment learned by the parent script, and make the
1359+# file executable. If COMMENT is supplied, it is inserted after the
1360+# `#!' sequence but before initialization text begins. After this
1361+# macro, additional text can be appended to FILE to form the body of
1362+# the child script. The macro ends with non-zero status if the
1363+# file could not be fully written (such as if the disk is full).
1364+m4_ifdef([AS_INIT_GENERATED],
1365+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
1366+[m4_defun([_LT_GENERATED_FILE_INIT],
1367+[m4_require([AS_PREPARE])]dnl
1368+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
1369+[lt_write_fail=0
1370+cat >$1 <<_ASEOF || lt_write_fail=1
1371+#! $SHELL
1372+# Generated by $as_me.
1373+$2
1374+SHELL=\${CONFIG_SHELL-$SHELL}
1375+export SHELL
1376+_ASEOF
1377+cat >>$1 <<\_ASEOF || lt_write_fail=1
1378+AS_SHELL_SANITIZE
1379+_AS_PREPARE
1380+exec AS_MESSAGE_FD>&1
1381+_ASEOF
1382+test $lt_write_fail = 0 && chmod +x $1[]dnl
1383+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
1384
1385 # LT_OUTPUT
1386 # ---------
1387@@ -2390,20 +1601,11 @@
1388 AC_DEFUN([LT_OUTPUT],
1389 [: ${CONFIG_LT=./config.lt}
1390 AC_MSG_NOTICE([creating $CONFIG_LT])
1391-cat >"$CONFIG_LT" <<_LTEOF
1392-#! $SHELL
1393-# Generated by $as_me.
1394-# Run this file to recreate a libtool stub with the current configuration.
1395+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
1396+[# Run this file to recreate a libtool stub with the current configuration.])
1397
1398+cat >>"$CONFIG_LT" <<\_LTEOF
1399 lt_cl_silent=false
1400-SHELL=\${CONFIG_SHELL-$SHELL}
1401-_LTEOF
1402-
1403-cat >>"$CONFIG_LT" <<\_LTEOF
1404-AS_SHELL_SANITIZE
1405-_AS_PREPARE
1406-
1407-exec AS_MESSAGE_FD>&1
1408 exec AS_MESSAGE_LOG_FD>>config.log
1409 {
1410 echo
1411@@ -2429,7 +1631,7 @@
1412 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
1413 configured by $[0], generated by m4_PACKAGE_STRING.
1414
1415-Copyright (C) 2008 Free Software Foundation, Inc.
1416+Copyright (C) 2010 Free Software Foundation, Inc.
1417 This config.lt script is free software; the Free Software Foundation
1418 gives unlimited permision to copy, distribute and modify it."
1419
1420@@ -2474,15 +1676,13 @@
1421 # appending to config.log, which fails on DOS, as config.log is still kept
1422 # open by configure. Here we exec the FD to /dev/null, effectively closing
1423 # config.log, so it can be properly (re)opened and appended to by config.lt.
1424-if test "$no_create" != yes; then
1425- lt_cl_success=:
1426- test "$silent" = yes &&
1427- lt_config_lt_args="$lt_config_lt_args --quiet"
1428- exec AS_MESSAGE_LOG_FD>/dev/null
1429- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
1430- exec AS_MESSAGE_LOG_FD>>config.log
1431- $lt_cl_success || AS_EXIT(1)
1432-fi
1433+lt_cl_success=:
1434+test "$silent" = yes &&
1435+ lt_config_lt_args="$lt_config_lt_args --quiet"
1436+exec AS_MESSAGE_LOG_FD>/dev/null
1437+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
1438+exec AS_MESSAGE_LOG_FD>>config.log
1439+$lt_cl_success || AS_EXIT(1)
1440 ])# LT_OUTPUT
1441
1442
1443@@ -2659,11 +1859,13 @@
1444 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
1445 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
1446 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
1447+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
1448 dnl aclocal-1.4 backwards compatibility:
1449 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
1450 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
1451 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
1452 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
1453+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
1454
1455
1456 # _LT_TAG_COMPILER
1457@@ -2768,6 +1970,31 @@
1458 [lt_cv_ld_exported_symbols_list=no])
1459 LDFLAGS="$save_LDFLAGS"
1460 ])
1461+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
1462+ [lt_cv_ld_force_load=no
1463+ cat > conftest.c << _LT_EOF
1464+int forced_loaded() { return 2;}
1465+_LT_EOF
1466+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
1467+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
1468+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1469+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
1470+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
1471+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
1472+ cat > conftest.c << _LT_EOF
1473+int main() { return 0;}
1474+_LT_EOF
1475+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
1476+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
1477+ _lt_result=$?
1478+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1479+ lt_cv_ld_force_load=yes
1480+ else
1481+ cat conftest.err >&AS_MESSAGE_LOG_FD
1482+ fi
1483+ rm -f conftest.err libconftest.a conftest conftest.c
1484+ rm -rf conftest.dSYM
1485+ ])
1486 case $host_os in
1487 rhapsody* | darwin1.[[012]])
1488 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
1489@@ -2795,7 +2022,7 @@
1490 else
1491 _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
1492 fi
1493- if test "$DSYMUTIL" != ":"; then
1494+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
1495 _lt_dsymutil='~$DSYMUTIL $lib || :'
1496 else
1497 _lt_dsymutil=
1498@@ -2815,7 +2042,11 @@
1499 _LT_TAGVAR(hardcode_direct, $1)=no
1500 _LT_TAGVAR(hardcode_automatic, $1)=yes
1501 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1502- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1503+ if test "$lt_cv_ld_force_load" = "yes"; then
1504+ _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\"`'
1505+ else
1506+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1507+ fi
1508 _LT_TAGVAR(link_all_deplibs, $1)=yes
1509 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
1510 case $cc_basename in
1511@@ -2823,7 +2054,7 @@
1512 *) _lt_dar_can_shared=$GCC ;;
1513 esac
1514 if test "$_lt_dar_can_shared" = "yes"; then
1515- output_verbose_link_cmd=echo
1516+ output_verbose_link_cmd=func_echo_all
1517 _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}"
1518 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1519 _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}"
1520@@ -2869,170 +2100,65 @@
1521 # _LT_SHELL_INIT(ARG)
1522 # -------------------
1523 m4_define([_LT_SHELL_INIT],
1524-[ifdef([AC_DIVERSION_NOTICE],
1525- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
1526- [AC_DIVERT_PUSH(NOTICE)])
1527-$1
1528-AC_DIVERT_POP
1529-])# _LT_SHELL_INIT
1530+[m4_divert_text([M4SH-INIT], [$1
1531+])])# _LT_SHELL_INIT
1532+
1533
1534
1535 # _LT_PROG_ECHO_BACKSLASH
1536 # -----------------------
1537-# Add some code to the start of the generated configure script which
1538-# will find an echo command which doesn't interpret backslashes.
1539+# Find how we can fake an echo command that does not interpret backslash.
1540+# In particular, with Autoconf 2.60 or later we add some code to the start
1541+# of the generated configure script which will find a shell with a builtin
1542+# printf (which we can use as an echo command).
1543 m4_defun([_LT_PROG_ECHO_BACKSLASH],
1544-[_LT_SHELL_INIT([
1545-# Check that we are running under the correct shell.
1546-SHELL=${CONFIG_SHELL-/bin/sh}
1547-
1548-case X$lt_ECHO in
1549-X*--fallback-echo)
1550- # Remove one level of quotation (which was required for Make).
1551- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
1552- ;;
1553+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1554+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
1555+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1556+
1557+AC_MSG_CHECKING([how to print strings])
1558+# Test print first, because it will be a builtin if present.
1559+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
1560+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1561+ ECHO='print -r --'
1562+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
1563+ ECHO='printf %s\n'
1564+else
1565+ # Use this function as a fallback that always works.
1566+ func_fallback_echo ()
1567+ {
1568+ eval 'cat <<_LTECHO_EOF
1569+$[]1
1570+_LTECHO_EOF'
1571+ }
1572+ ECHO='func_fallback_echo'
1573+fi
1574+
1575+# func_echo_all arg...
1576+# Invoke $ECHO with all args, space-separated.
1577+func_echo_all ()
1578+{
1579+ $ECHO "$*"
1580+}
1581+
1582+case "$ECHO" in
1583+ printf*) AC_MSG_RESULT([printf]) ;;
1584+ print*) AC_MSG_RESULT([print -r]) ;;
1585+ *) AC_MSG_RESULT([cat]) ;;
1586 esac
1587
1588-ECHO=${lt_ECHO-echo}
1589-if test "X[$]1" = X--no-reexec; then
1590- # Discard the --no-reexec flag, and continue.
1591- shift
1592-elif test "X[$]1" = X--fallback-echo; then
1593- # Avoid inline document here, it may be left over
1594- :
1595-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
1596- # Yippee, $ECHO works!
1597- :
1598-else
1599- # Restart under the correct shell.
1600- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
1601-fi
1602-
1603-if test "X[$]1" = X--fallback-echo; then
1604- # used as fallback echo
1605- shift
1606- cat <<_LT_EOF
1607-[$]*
1608-_LT_EOF
1609- exit 0
1610-fi
1611-
1612-# The HP-UX ksh and POSIX shell print the target directory to stdout
1613-# if CDPATH is set.
1614-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1615-
1616-if test -z "$lt_ECHO"; then
1617- if test "X${echo_test_string+set}" != Xset; then
1618- # find a string as large as possible, as long as the shell can cope with it
1619- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
1620- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
1621- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
1622- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
1623- then
1624- break
1625- fi
1626- done
1627- fi
1628-
1629- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1630- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1631- test "X$echo_testing_string" = "X$echo_test_string"; then
1632- :
1633- else
1634- # The Solaris, AIX, and Digital Unix default echo programs unquote
1635- # backslashes. This makes it impossible to quote backslashes using
1636- # echo "$something" | sed 's/\\/\\\\/g'
1637- #
1638- # So, first we look for a working echo in the user's PATH.
1639-
1640- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1641- for dir in $PATH /usr/ucb; do
1642- IFS="$lt_save_ifs"
1643- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
1644- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
1645- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
1646- test "X$echo_testing_string" = "X$echo_test_string"; then
1647- ECHO="$dir/echo"
1648- break
1649- fi
1650- done
1651- IFS="$lt_save_ifs"
1652-
1653- if test "X$ECHO" = Xecho; then
1654- # We didn't find a better echo, so look for alternatives.
1655- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
1656- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
1657- test "X$echo_testing_string" = "X$echo_test_string"; then
1658- # This shell has a builtin print -r that does the trick.
1659- ECHO='print -r'
1660- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
1661- test "X$CONFIG_SHELL" != X/bin/ksh; then
1662- # If we have ksh, try running configure again with it.
1663- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
1664- export ORIGINAL_CONFIG_SHELL
1665- CONFIG_SHELL=/bin/ksh
1666- export CONFIG_SHELL
1667- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
1668- else
1669- # Try using printf.
1670- ECHO='printf %s\n'
1671- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1672- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1673- test "X$echo_testing_string" = "X$echo_test_string"; then
1674- # Cool, printf works
1675- :
1676- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1677- test "X$echo_testing_string" = 'X\t' &&
1678- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1679- test "X$echo_testing_string" = "X$echo_test_string"; then
1680- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
1681- export CONFIG_SHELL
1682- SHELL="$CONFIG_SHELL"
1683- export SHELL
1684- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1685- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1686- test "X$echo_testing_string" = 'X\t' &&
1687- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1688- test "X$echo_testing_string" = "X$echo_test_string"; then
1689- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1690- else
1691- # maybe with a smaller string...
1692- prev=:
1693-
1694- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
1695- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
1696- then
1697- break
1698- fi
1699- prev="$cmd"
1700- done
1701-
1702- if test "$prev" != 'sed 50q "[$]0"'; then
1703- echo_test_string=`eval $prev`
1704- export echo_test_string
1705- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
1706- else
1707- # Oops. We lost completely, so just stick with echo.
1708- ECHO=echo
1709- fi
1710- fi
1711- fi
1712- fi
1713- fi
1714-fi
1715-
1716-# Copy echo and quote the copy suitably for passing to libtool from
1717-# the Makefile, instead of quoting the original, which is used later.
1718-lt_ECHO=$ECHO
1719-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
1720- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
1721-fi
1722-
1723-AC_SUBST(lt_ECHO)
1724-])
1725+m4_ifdef([_AS_DETECT_SUGGESTED],
1726+[_AS_DETECT_SUGGESTED([
1727+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
1728+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1729+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
1730+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1731+ PATH=/empty FPATH=/empty; export PATH FPATH
1732+ test "X`printf %s $ECHO`" = "X$ECHO" \
1733+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
1734+
1735 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
1736-_LT_DECL([], [ECHO], [1],
1737- [An echo program that does not interpret backslashes])
1738+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
1739 ])# _LT_PROG_ECHO_BACKSLASH
1740
1741
1742@@ -3064,7 +2190,7 @@
1743 ;;
1744 *-*-irix6*)
1745 # Find out which ABI we are using.
1746- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
1747+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
1748 if AC_TRY_EVAL(ac_compile); then
1749 if test "$lt_cv_prog_gnu_ld" = yes; then
1750 case `/usr/bin/file conftest.$ac_objext` in
1751@@ -3216,10 +2342,19 @@
1752 esac
1753 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1754 fi
1755+
1756+case $host_os in
1757+ darwin*)
1758+ lock_old_archive_extraction=yes ;;
1759+ *)
1760+ lock_old_archive_extraction=no ;;
1761+esac
1762 _LT_DECL([], [old_postinstall_cmds], [2])
1763 _LT_DECL([], [old_postuninstall_cmds], [2])
1764 _LT_TAGDECL([], [old_archive_cmds], [2],
1765 [Commands used to build an old-style archive])
1766+_LT_DECL([], [lock_old_archive_extraction], [0],
1767+ [Whether to use a lock for old archive extraction])
1768 ])# _LT_CMD_OLD_ARCHIVE
1769
1770
1771@@ -3244,15 +2379,15 @@
1772 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1773 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1774 -e 's:$: $lt_compiler_flag:'`
1775- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1776+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1777 (eval "$lt_compile" 2>conftest.err)
1778 ac_status=$?
1779 cat conftest.err >&AS_MESSAGE_LOG_FD
1780- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1781+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1782 if (exit $ac_status) && test -s "$ac_outfile"; then
1783 # The compiler can only warn and ignore the option if not recognized
1784 # So say no if there are warnings other than the usual output.
1785- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1786+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
1787 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1788 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1789 $2=yes
1790@@ -3292,7 +2427,7 @@
1791 if test -s conftest.err; then
1792 # Append any errors to the config.log.
1793 cat conftest.err 1>&AS_MESSAGE_LOG_FD
1794- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1795+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
1796 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1797 if diff conftest.exp conftest.er2 >/dev/null; then
1798 $2=yes
1799@@ -3355,6 +2490,11 @@
1800 lt_cv_sys_max_cmd_len=8192;
1801 ;;
1802
1803+ mint*)
1804+ # On MiNT this can take a long time and run out of memory.
1805+ lt_cv_sys_max_cmd_len=8192;
1806+ ;;
1807+
1808 amigaos*)
1809 # On AmigaOS with pdksh, this test takes hours, literally.
1810 # So we just punt and use a minimum line length of 8192.
1811@@ -3419,8 +2559,8 @@
1812 # If test is not a shell built-in, we'll probably end up computing a
1813 # maximum length that is only half of the actual maximum length, but
1814 # we can't tell.
1815- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
1816- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
1817+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
1818+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
1819 test $i != 17 # 1/2 MB should be enough
1820 do
1821 i=`expr $i + 1`
1822@@ -3471,7 +2611,7 @@
1823 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1824 lt_status=$lt_dlunknown
1825 cat > conftest.$ac_ext <<_LT_EOF
1826-[#line __oline__ "configure"
1827+[#line $LINENO "configure"
1828 #include "confdefs.h"
1829
1830 #if HAVE_DLFCN_H
1831@@ -3512,7 +2652,13 @@
1832 # endif
1833 #endif
1834
1835-void fnord() { int i=42;}
1836+/* When -fvisbility=hidden is used, assume the code has been annotated
1837+ correspondingly for the symbols needed. */
1838+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1839+void fnord () __attribute__((visibility("default")));
1840+#endif
1841+
1842+void fnord () { int i=42; }
1843 int main ()
1844 {
1845 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1846@@ -3521,7 +2667,11 @@
1847 if (self)
1848 {
1849 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
1850- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1851+ else
1852+ {
1853+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1854+ else puts (dlerror ());
1855+ }
1856 /* dlclose (self); */
1857 }
1858 else
1859@@ -3697,16 +2847,16 @@
1860 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1861 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1862 -e 's:$: $lt_compiler_flag:'`
1863- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1864+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1865 (eval "$lt_compile" 2>out/conftest.err)
1866 ac_status=$?
1867 cat out/conftest.err >&AS_MESSAGE_LOG_FD
1868- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1869+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1870 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1871 then
1872 # The compiler can only warn and ignore the option if not recognized
1873 # So say no if there are warnings
1874- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
1875+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
1876 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
1877 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
1878 _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
1879@@ -3865,6 +3015,7 @@
1880 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1881 m4_require([_LT_DECL_OBJDUMP])dnl
1882 m4_require([_LT_DECL_SED])dnl
1883+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
1884 AC_MSG_CHECKING([dynamic linker characteristics])
1885 m4_if([$1],
1886 [], [
1887@@ -3873,16 +3024,23 @@
1888 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
1889 *) lt_awk_arg="/^libraries:/" ;;
1890 esac
1891- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
1892- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
1893+ case $host_os in
1894+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
1895+ *) lt_sed_strip_eq="s,=/,/,g" ;;
1896+ esac
1897+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
1898+ case $lt_search_path_spec in
1899+ *\;*)
1900 # if the path contains ";" then we assume it to be the separator
1901 # otherwise default to the standard path separator (i.e. ":") - it is
1902 # assumed that no part of a normal pathname contains ";" but that should
1903 # okay in the real world where ";" in dirpaths is itself problematic.
1904- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
1905- else
1906- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1907- fi
1908+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
1909+ ;;
1910+ *)
1911+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
1912+ ;;
1913+ esac
1914 # Ok, now we have the path, separated by spaces, we can step through it
1915 # and add multilib dir if necessary.
1916 lt_tmp_lt_search_path_spec=
1917@@ -3895,7 +3053,7 @@
1918 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
1919 fi
1920 done
1921- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
1922+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
1923 BEGIN {RS=" "; FS="/|\n";} {
1924 lt_foo="";
1925 lt_count=0;
1926@@ -3915,7 +3073,13 @@
1927 if (lt_foo != "") { lt_freq[[lt_foo]]++; }
1928 if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
1929 }'`
1930- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
1931+ # AWK program above erroneously prepends '/' to C:/dos/paths
1932+ # for these hosts.
1933+ case $host_os in
1934+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
1935+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
1936+ esac
1937+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
1938 else
1939 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
1940 fi])
1941@@ -4003,7 +3167,7 @@
1942 m68k)
1943 library_names_spec='$libname.ixlibrary $libname.a'
1944 # Create ${libname}_ixlibrary.a entries in /sys/libs.
1945- 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'
1946+ 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'
1947 ;;
1948 esac
1949 ;;
1950@@ -4056,23 +3220,12 @@
1951 cygwin*)
1952 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
1953 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1954- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
1955+m4_if([$1], [],[
1956+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
1957 ;;
1958 mingw* | cegcc*)
1959 # MinGW DLLs use traditional 'lib' prefix
1960 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1961- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
1962- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
1963- # It is most probably a Windows format PATH printed by
1964- # mingw gcc, but we are running on Cygwin. Gcc prints its search
1965- # path with ; separators, and with drive letters. We can handle the
1966- # drive letters (cygwin fileutils understands them), so leave them,
1967- # especially as we might pass files found there to a mingw objdump,
1968- # which wouldn't understand a cygwinified path. Ahh.
1969- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1970- else
1971- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1972- fi
1973 ;;
1974 pw32*)
1975 # pw32 DLLs use 'pw' prefix rather than 'lib'
1976@@ -4172,6 +3325,19 @@
1977 hardcode_into_libs=yes
1978 ;;
1979
1980+haiku*)
1981+ version_type=linux
1982+ need_lib_prefix=no
1983+ need_version=no
1984+ dynamic_linker="$host_os runtime_loader"
1985+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1986+ soname_spec='${libname}${release}${shared_ext}$major'
1987+ shlibpath_var=LIBRARY_PATH
1988+ shlibpath_overrides_runpath=yes
1989+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1990+ hardcode_into_libs=yes
1991+ ;;
1992+
1993 hpux9* | hpux10* | hpux11*)
1994 # Give a soname corresponding to the major version so that dld.sl refuses to
1995 # link against other versions.
1996@@ -4214,8 +3380,10 @@
1997 soname_spec='${libname}${release}${shared_ext}$major'
1998 ;;
1999 esac
2000- # HP-UX runs *really* slowly unless shared libraries are mode 555.
2001+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
2002 postinstall_cmds='chmod 555 $lib'
2003+ # or fails outright, so override atomically:
2004+ install_override_mode=555
2005 ;;
2006
2007 interix[[3-9]]*)
2008@@ -4273,7 +3441,7 @@
2009 ;;
2010
2011 # This must be Linux ELF.
2012-linux* | k*bsd*-gnu)
2013+linux* | k*bsd*-gnu | kopensolaris*-gnu)
2014 version_type=linux
2015 need_lib_prefix=no
2016 need_version=no
2017@@ -4282,26 +3450,35 @@
2018 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
2019 shlibpath_var=LD_LIBRARY_PATH
2020 shlibpath_overrides_runpath=no
2021+
2022 # Some binutils ld are patched to set DT_RUNPATH
2023- save_LDFLAGS=$LDFLAGS
2024- save_libdir=$libdir
2025- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
2026- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
2027- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2028- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
2029- [shlibpath_overrides_runpath=yes])])
2030- LDFLAGS=$save_LDFLAGS
2031- libdir=$save_libdir
2032+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
2033+ [lt_cv_shlibpath_overrides_runpath=no
2034+ save_LDFLAGS=$LDFLAGS
2035+ save_libdir=$libdir
2036+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
2037+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
2038+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2039+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
2040+ [lt_cv_shlibpath_overrides_runpath=yes])])
2041+ LDFLAGS=$save_LDFLAGS
2042+ libdir=$save_libdir
2043+ ])
2044+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
2045
2046 # This implies no fast_install, which is unacceptable.
2047 # Some rework will be needed to allow for fast_install
2048 # before this can be enabled.
2049 hardcode_into_libs=yes
2050
2051+ # Add ABI-specific directories to the system library path.
2052+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
2053+
2054 # Append ld.so.conf contents to the search path
2055 if test -f /etc/ld.so.conf; then
2056- 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' ' '`
2057- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
2058+ 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' ' '`
2059+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
2060+
2061 fi
2062
2063 # We used to test for /lib/ld.so.1 and disable shared libraries on
2064@@ -4533,6 +3710,8 @@
2065 The last name is the one that the linker finds with -lNAME]])
2066 _LT_DECL([], [soname_spec], [1],
2067 [[The coded name of the library, if different from the real name]])
2068+_LT_DECL([], [install_override_mode], [1],
2069+ [Permission mode override for installation of shared libraries])
2070 _LT_DECL([], [postinstall_cmds], [2],
2071 [Command to use after installation of a shared archive])
2072 _LT_DECL([], [postuninstall_cmds], [2],
2073@@ -4645,6 +3824,7 @@
2074 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
2075 m4_require([_LT_DECL_SED])dnl
2076 m4_require([_LT_DECL_EGREP])dnl
2077+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
2078
2079 AC_ARG_WITH([gnu-ld],
2080 [AS_HELP_STRING([--with-gnu-ld],
2081@@ -4774,8 +3954,8 @@
2082 fi
2083 ;;
2084 esac
2085-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
2086-_LT_DECL([], [reload_cmds], [2])dnl
2087+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
2088+_LT_TAGDECL([], [reload_cmds], [2])dnl
2089 ])# _LT_CMD_RELOAD
2090
2091
2092@@ -4827,16 +4007,18 @@
2093 # Base MSYS/MinGW do not provide the 'file' command needed by
2094 # func_win32_libid shell function, so use a weaker test based on 'objdump',
2095 # unless we find 'file', for example because we are cross-compiling.
2096- if ( file / ) >/dev/null 2>&1; then
2097+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
2098+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
2099 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2100 lt_cv_file_magic_cmd='func_win32_libid'
2101 else
2102- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2103+ # Keep this pattern in sync with the one in func_win32_libid.
2104+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2105 lt_cv_file_magic_cmd='$OBJDUMP -f'
2106 fi
2107 ;;
2108
2109-cegcc)
2110+cegcc*)
2111 # use the weaker test based on 'objdump'. See mingw*.
2112 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
2113 lt_cv_file_magic_cmd='$OBJDUMP -f'
2114@@ -4866,6 +4048,10 @@
2115 lt_cv_deplibs_check_method=pass_all
2116 ;;
2117
2118+haiku*)
2119+ lt_cv_deplibs_check_method=pass_all
2120+ ;;
2121+
2122 hpux10.20* | hpux11*)
2123 lt_cv_file_magic_cmd=/usr/bin/file
2124 case $host_cpu in
2125@@ -4874,11 +4060,11 @@
2126 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
2127 ;;
2128 hppa*64*)
2129- [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]']
2130+ [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]']
2131 lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
2132 ;;
2133 *)
2134- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
2135+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
2136 lt_cv_file_magic_test_file=/usr/lib/libc.sl
2137 ;;
2138 esac
2139@@ -4900,7 +4086,7 @@
2140 ;;
2141
2142 # This must be Linux ELF.
2143-linux* | k*bsd*-gnu)
2144+linux* | k*bsd*-gnu | kopensolaris*-gnu)
2145 lt_cv_deplibs_check_method=pass_all
2146 ;;
2147
2148@@ -5042,7 +4228,19 @@
2149 NM="$lt_cv_path_NM"
2150 else
2151 # Didn't find any BSD compatible name lister, look for dumpbin.
2152- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
2153+ if test -n "$DUMPBIN"; then :
2154+ # Let the user override the test.
2155+ else
2156+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
2157+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
2158+ *COFF*)
2159+ DUMPBIN="$DUMPBIN -symbols"
2160+ ;;
2161+ *)
2162+ DUMPBIN=:
2163+ ;;
2164+ esac
2165+ fi
2166 AC_SUBST([DUMPBIN])
2167 if test "$DUMPBIN" != ":"; then
2168 NM="$DUMPBIN"
2169@@ -5055,13 +4253,13 @@
2170 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
2171 [lt_cv_nm_interface="BSD nm"
2172 echo "int some_variable = 0;" > conftest.$ac_ext
2173- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
2174+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
2175 (eval "$ac_compile" 2>conftest.err)
2176 cat conftest.err >&AS_MESSAGE_LOG_FD
2177- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
2178+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
2179 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
2180 cat conftest.err >&AS_MESSAGE_LOG_FD
2181- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
2182+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
2183 cat conftest.out >&AS_MESSAGE_LOG_FD
2184 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
2185 lt_cv_nm_interface="MS dumpbin"
2186@@ -5084,7 +4282,7 @@
2187 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
2188 LIBM=
2189 case $host in
2190-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
2191+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
2192 # These system don't have libm, or don't need it
2193 ;;
2194 *-ncr-sysv4.3*)
2195@@ -5112,7 +4310,12 @@
2196 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
2197
2198 if test "$GCC" = yes; then
2199- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
2200+ case $cc_basename in
2201+ nvcc*)
2202+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
2203+ *)
2204+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
2205+ esac
2206
2207 _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
2208 lt_cv_prog_compiler_rtti_exceptions,
2209@@ -5129,6 +4332,7 @@
2210 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
2211 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
2212 AC_REQUIRE([AC_PROG_CC])dnl
2213+AC_REQUIRE([AC_PROG_AWK])dnl
2214 AC_REQUIRE([LT_PATH_NM])dnl
2215 AC_REQUIRE([LT_PATH_LD])dnl
2216 m4_require([_LT_DECL_SED])dnl
2217@@ -5254,7 +4458,7 @@
2218 if AC_TRY_EVAL(ac_compile); then
2219 # Now try to grab the symbols.
2220 nlist=conftest.nm
2221- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
2222+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
2223 # Try sorting and uniquifying the output.
2224 if sort "$nlist" | uniq > "$nlist"T; then
2225 mv -f "$nlist"T "$nlist"
2226@@ -5416,6 +4620,11 @@
2227 # DJGPP does not support shared libraries at all
2228 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
2229 ;;
2230+ haiku*)
2231+ # PIC is the default for Haiku.
2232+ # The "-static" flag exists, but is broken.
2233+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
2234+ ;;
2235 interix[[3-9]]*)
2236 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
2237 # Instead, we relocate shared libraries at runtime.
2238@@ -5521,7 +4730,7 @@
2239 ;;
2240 esac
2241 ;;
2242- linux* | k*bsd*-gnu)
2243+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2244 case $cc_basename in
2245 KCC*)
2246 # KAI C++ Compiler
2247@@ -5554,8 +4763,8 @@
2248 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
2249 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
2250 ;;
2251- xlc* | xlC*)
2252- # IBM XL 8.0 on PPC
2253+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
2254+ # IBM XL 8.0, 9.0 on PPC and BlueGene
2255 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2256 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
2257 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
2258@@ -5617,7 +4826,7 @@
2259 ;;
2260 solaris*)
2261 case $cc_basename in
2262- CC*)
2263+ CC* | sunCC*)
2264 # Sun C++ 4.2, 5.x and Centerline C++
2265 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2266 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2267@@ -5721,6 +4930,12 @@
2268 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
2269 ;;
2270
2271+ haiku*)
2272+ # PIC is the default for Haiku.
2273+ # The "-static" flag exists, but is broken.
2274+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
2275+ ;;
2276+
2277 hpux*)
2278 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
2279 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
2280@@ -5763,6 +4978,13 @@
2281 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
2282 ;;
2283 esac
2284+
2285+ case $cc_basename in
2286+ nvcc*) # Cuda Compiler Driver 2.2
2287+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
2288+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
2289+ ;;
2290+ esac
2291 else
2292 # PORTME Check for flag to pass linker flags through the system compiler.
2293 case $host_os in
2294@@ -5805,7 +5027,7 @@
2295 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
2296 ;;
2297
2298- linux* | k*bsd*-gnu)
2299+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2300 case $cc_basename in
2301 # old Intel for x86_64 which still supported -KPIC.
2302 ecc*)
2303@@ -5826,7 +5048,7 @@
2304 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
2305 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
2306 ;;
2307- pgcc* | pgf77* | pgf90* | pgf95*)
2308+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2309 # Portland Group compilers (*not* the Pentium gcc compiler,
2310 # which looks to be a dead project)
2311 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2312@@ -5838,26 +5060,26 @@
2313 # All Alpha code is PIC.
2314 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
2315 ;;
2316- xl*)
2317- # IBM XL C 8.0/Fortran 10.1 on PPC
2318+ xl* | bgxl* | bgf* | mpixl*)
2319+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
2320 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2321 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
2322 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
2323 ;;
2324 *)
2325 case `$CC -V 2>&1 | sed 5q` in
2326+ *Sun\ F* | *Sun*Fortran*)
2327+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
2328+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2329+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2330+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
2331+ ;;
2332 *Sun\ C*)
2333 # Sun C 5.9
2334 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2335 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2336 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
2337 ;;
2338- *Sun\ F*)
2339- # Sun Fortran 8.3 passes all unrecognized flags to the linker
2340- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2341- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2342- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
2343- ;;
2344 esac
2345 ;;
2346 esac
2347@@ -5888,7 +5110,7 @@
2348 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
2349 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
2350 case $cc_basename in
2351- f77* | f90* | f95*)
2352+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2353 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
2354 *)
2355 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
2356@@ -5998,8 +5220,10 @@
2357 aix[[4-9]]*)
2358 # If we're using GNU nm, then we don't want the "-C" option.
2359 # -C means demangle to AIX nm, but means don't demangle with GNU nm
2360+ # Also, AIX nm treats weak defined symbols like other global defined
2361+ # symbols, whereas GNU nm marks them as "W".
2362 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
2363- _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'
2364+ _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'
2365 else
2366 _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'
2367 fi
2368@@ -6077,7 +5301,33 @@
2369 esac
2370
2371 _LT_TAGVAR(ld_shlibs, $1)=yes
2372+
2373+ # On some targets, GNU ld is compatible enough with the native linker
2374+ # that we're better off using the native interface for both.
2375+ lt_use_gnu_ld_interface=no
2376 if test "$with_gnu_ld" = yes; then
2377+ case $host_os in
2378+ aix*)
2379+ # The AIX port of GNU ld has always aspired to compatibility
2380+ # with the native linker. However, as the warning in the GNU ld
2381+ # block says, versions before 2.19.5* couldn't really create working
2382+ # shared libraries, regardless of the interface used.
2383+ case `$LD -v 2>&1` in
2384+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
2385+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
2386+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
2387+ *)
2388+ lt_use_gnu_ld_interface=yes
2389+ ;;
2390+ esac
2391+ ;;
2392+ *)
2393+ lt_use_gnu_ld_interface=yes
2394+ ;;
2395+ esac
2396+ fi
2397+
2398+ if test "$lt_use_gnu_ld_interface" = yes; then
2399 # If archive_cmds runs LD, not CC, wlarc should be empty
2400 wlarc='${wl}'
2401
2402@@ -6095,6 +5345,7 @@
2403 fi
2404 supports_anon_versioning=no
2405 case `$LD -v 2>&1` in
2406+ *GNU\ gold*) supports_anon_versioning=yes ;;
2407 *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
2408 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
2409 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
2410@@ -6110,11 +5361,12 @@
2411 _LT_TAGVAR(ld_shlibs, $1)=no
2412 cat <<_LT_EOF 1>&2
2413
2414-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
2415+*** Warning: the GNU linker, at least up to release 2.19, is reported
2416 *** to be unable to reliably create shared libraries on AIX.
2417 *** Therefore, libtool is disabling shared libraries support. If you
2418-*** really care for shared libraries, you may want to modify your PATH
2419-*** so that a non-GNU linker is found, and then restart.
2420+*** really care for shared libraries, you may want to install binutils
2421+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
2422+*** You will then need to restart the configuration process.
2423
2424 _LT_EOF
2425 fi
2426@@ -6150,6 +5402,7 @@
2427 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
2428 # as there is no search path for DLLs.
2429 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2430+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
2431 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2432 _LT_TAGVAR(always_export_symbols, $1)=no
2433 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2434@@ -6171,6 +5424,11 @@
2435 fi
2436 ;;
2437
2438+ haiku*)
2439+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2440+ _LT_TAGVAR(link_all_deplibs, $1)=yes
2441+ ;;
2442+
2443 interix[[3-9]]*)
2444 _LT_TAGVAR(hardcode_direct, $1)=no
2445 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
2446@@ -6186,7 +5444,7 @@
2447 _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
2448 ;;
2449
2450- gnu* | linux* | tpf* | k*bsd*-gnu)
2451+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
2452 tmp_diet=no
2453 if test "$host_os" = linux-dietlibc; then
2454 case $cc_basename in
2455@@ -6200,11 +5458,12 @@
2456 tmp_sharedflag='-shared'
2457 case $cc_basename,$host_cpu in
2458 pgcc*) # Portland Group C compiler
2459- _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'
2460+ _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'
2461 tmp_addflag=' $pic_flag'
2462 ;;
2463- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
2464- _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'
2465+ pgf77* | pgf90* | pgf95* | pgfortran*)
2466+ # Portland Group f77 and f90 compilers
2467+ _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'
2468 tmp_addflag=' $pic_flag -Mnomain' ;;
2469 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
2470 tmp_addflag=' -i_dynamic' ;;
2471@@ -6215,13 +5474,17 @@
2472 lf95*) # Lahey Fortran 8.1
2473 _LT_TAGVAR(whole_archive_flag_spec, $1)=
2474 tmp_sharedflag='--shared' ;;
2475- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
2476+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
2477 tmp_sharedflag='-qmkshrobj'
2478 tmp_addflag= ;;
2479+ nvcc*) # Cuda Compiler Driver 2.2
2480+ _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'
2481+ _LT_TAGVAR(compiler_needs_object, $1)=yes
2482+ ;;
2483 esac
2484 case `$CC -V 2>&1 | sed 5q` in
2485 *Sun\ C*) # Sun C 5.9
2486- _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'
2487+ _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'
2488 _LT_TAGVAR(compiler_needs_object, $1)=yes
2489 tmp_sharedflag='-G' ;;
2490 *Sun\ F*) # Sun Fortran 8.3
2491@@ -6237,17 +5500,17 @@
2492 fi
2493
2494 case $cc_basename in
2495- xlf*)
2496+ xlf* | bgf* | bgxlf* | mpixlf*)
2497 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
2498 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
2499 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
2500 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
2501- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2502+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2503 if test "x$supports_anon_versioning" = xyes; then
2504 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
2505 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2506 echo "local: *; };" >> $output_objdir/$libname.ver~
2507- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2508+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2509 fi
2510 ;;
2511 esac
2512@@ -6368,8 +5631,10 @@
2513 else
2514 # If we're using GNU nm, then we don't want the "-C" option.
2515 # -C means demangle to AIX nm, but means don't demangle with GNU nm
2516+ # Also, AIX nm treats weak defined symbols like other global
2517+ # defined symbols, whereas GNU nm marks them as "W".
2518 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
2519- _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'
2520+ _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'
2521 else
2522 _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'
2523 fi
2524@@ -6458,7 +5723,7 @@
2525 # empty executable.
2526 _LT_SYS_MODULE_PATH_AIX
2527 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2528- _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"
2529+ _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"
2530 else
2531 if test "$host_cpu" = ia64; then
2532 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2533@@ -6473,8 +5738,13 @@
2534 # -berok will link without error, but may produce a broken library.
2535 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
2536 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
2537- # Exported symbols can be pulled into shared objects from archives
2538- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2539+ if test "$with_gnu_ld" = yes; then
2540+ # We only use this code for GNU lds that support --whole-archive.
2541+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2542+ else
2543+ # Exported symbols can be pulled into shared objects from archives
2544+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2545+ fi
2546 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2547 # This is similar to how AIX traditionally builds its shared libraries.
2548 _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'
2549@@ -6513,7 +5783,7 @@
2550 # Tell ltmain to make .dll files, not .so files.
2551 shrext_cmds=".dll"
2552 # FIXME: Setting linknames here is a bad hack.
2553- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
2554+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2555 # The linker will automatically build a .lib file if we build a DLL.
2556 _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
2557 # FIXME: Should let the user specify the lib program.
2558@@ -6580,7 +5850,7 @@
2559 ;;
2560
2561 hpux10*)
2562- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
2563+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
2564 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2565 else
2566 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
2567@@ -6599,7 +5869,7 @@
2568 ;;
2569
2570 hpux11*)
2571- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
2572+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
2573 case $host_cpu in
2574 hppa*64*)
2575 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
2576@@ -6620,7 +5890,14 @@
2577 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
2578 ;;
2579 *)
2580- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2581+ m4_if($1, [], [
2582+ # Older versions of the 11.00 compiler do not understand -b yet
2583+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
2584+ _LT_LINKER_OPTION([if $CC understands -b],
2585+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
2586+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
2587+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
2588+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
2589 ;;
2590 esac
2591 fi
2592@@ -6648,19 +5925,19 @@
2593
2594 irix5* | irix6* | nonstopux*)
2595 if test "$GCC" = yes; then
2596- _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'
2597+ _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'
2598 # Try to use the -exported_symbol ld option, if it does not
2599 # work, assume that -exports_file does not work either and
2600 # implicitly export all symbols.
2601 save_LDFLAGS="$LDFLAGS"
2602 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
2603 AC_LINK_IFELSE(int foo(void) {},
2604- _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'
2605+ _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'
2606 )
2607 LDFLAGS="$save_LDFLAGS"
2608 else
2609- _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'
2610- _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'
2611+ _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'
2612+ _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'
2613 fi
2614 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
2615 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2616@@ -6722,17 +5999,17 @@
2617 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2618 _LT_TAGVAR(hardcode_minus_L, $1)=yes
2619 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2620- _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'
2621+ _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'
2622 _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
2623 ;;
2624
2625 osf3*)
2626 if test "$GCC" = yes; then
2627 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2628- _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'
2629+ _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'
2630 else
2631 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2632- _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'
2633+ _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'
2634 fi
2635 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
2636 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2637@@ -6742,13 +6019,13 @@
2638 osf4* | osf5*) # as osf3* with the addition of -msym flag
2639 if test "$GCC" = yes; then
2640 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2641- _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'
2642+ _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'
2643 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2644 else
2645 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2646- _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'
2647+ _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'
2648 _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~
2649- $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'
2650+ $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'
2651
2652 # Both c and cxx compiler support -rpath directly
2653 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
2654@@ -6939,36 +6216,38 @@
2655 # Test whether the compiler implicitly links with -lc since on some
2656 # systems, -lgcc has to come before -lc. If gcc already passes -lc
2657 # to ld, don't add -lc before -lgcc.
2658- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
2659- $RM conftest*
2660- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2661+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
2662+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
2663+ [$RM conftest*
2664+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2665
2666- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
2667- soname=conftest
2668- lib=conftest
2669- libobjs=conftest.$ac_objext
2670- deplibs=
2671- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
2672- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
2673- compiler_flags=-v
2674- linker_flags=-v
2675- verstring=
2676- output_objdir=.
2677- libname=conftest
2678- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
2679- _LT_TAGVAR(allow_undefined_flag, $1)=
2680- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
2681- then
2682- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
2683- else
2684- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2685- fi
2686- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
2687- else
2688- cat conftest.err 1>&5
2689- fi
2690- $RM conftest*
2691- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
2692+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
2693+ soname=conftest
2694+ lib=conftest
2695+ libobjs=conftest.$ac_objext
2696+ deplibs=
2697+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
2698+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
2699+ compiler_flags=-v
2700+ linker_flags=-v
2701+ verstring=
2702+ output_objdir=.
2703+ libname=conftest
2704+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
2705+ _LT_TAGVAR(allow_undefined_flag, $1)=
2706+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
2707+ then
2708+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2709+ else
2710+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2711+ fi
2712+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
2713+ else
2714+ cat conftest.err 1>&5
2715+ fi
2716+ $RM conftest*
2717+ ])
2718+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
2719 ;;
2720 esac
2721 fi
2722@@ -7134,14 +6413,14 @@
2723 ])# _LT_LANG_C_CONFIG
2724
2725
2726-# _LT_PROG_CXX
2727-# ------------
2728-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
2729-# compiler, we have our own version here.
2730-m4_defun([_LT_PROG_CXX],
2731-[
2732-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
2733-AC_PROG_CXX
2734+# _LT_LANG_CXX_CONFIG([TAG])
2735+# --------------------------
2736+# Ensure that the configuration variables for a C++ compiler are suitably
2737+# defined. These variables are subsequently used by _LT_CONFIG to write
2738+# the compiler configuration to `libtool'.
2739+m4_defun([_LT_LANG_CXX_CONFIG],
2740+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2741+m4_require([_LT_DECL_EGREP])dnl
2742 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
2743 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
2744 (test "X$CXX" != "Xg++"))) ; then
2745@@ -7149,22 +6428,6 @@
2746 else
2747 _lt_caught_CXX_error=yes
2748 fi
2749-popdef([AC_MSG_ERROR])
2750-])# _LT_PROG_CXX
2751-
2752-dnl aclocal-1.4 backwards compatibility:
2753-dnl AC_DEFUN([_LT_PROG_CXX], [])
2754-
2755-
2756-# _LT_LANG_CXX_CONFIG([TAG])
2757-# --------------------------
2758-# Ensure that the configuration variables for a C++ compiler are suitably
2759-# defined. These variables are subsequently used by _LT_CONFIG to write
2760-# the compiler configuration to `libtool'.
2761-m4_defun([_LT_LANG_CXX_CONFIG],
2762-[AC_REQUIRE([_LT_PROG_CXX])dnl
2763-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2764-m4_require([_LT_DECL_EGREP])dnl
2765
2766 AC_LANG_PUSH(C++)
2767 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
2768@@ -7186,6 +6449,8 @@
2769 _LT_TAGVAR(module_expsym_cmds, $1)=
2770 _LT_TAGVAR(link_all_deplibs, $1)=unknown
2771 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2772+_LT_TAGVAR(reload_flag, $1)=$reload_flag
2773+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2774 _LT_TAGVAR(no_undefined_flag, $1)=
2775 _LT_TAGVAR(whole_archive_flag_spec, $1)=
2776 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
2777@@ -7288,7 +6553,7 @@
2778 # Commands to make compiler produce verbose output that lists
2779 # what "hidden" libraries, object files and flags are used when
2780 # linking a shared library.
2781- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2782+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2783
2784 else
2785 GXX=no
2786@@ -7400,7 +6665,7 @@
2787 _LT_SYS_MODULE_PATH_AIX
2788 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2789
2790- _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"
2791+ _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"
2792 else
2793 if test "$host_cpu" = ia64; then
2794 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2795@@ -7415,8 +6680,13 @@
2796 # -berok will link without error, but may produce a broken library.
2797 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
2798 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
2799- # Exported symbols can be pulled into shared objects from archives
2800- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2801+ if test "$with_gnu_ld" = yes; then
2802+ # We only use this code for GNU lds that support --whole-archive.
2803+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2804+ else
2805+ # Exported symbols can be pulled into shared objects from archives
2806+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2807+ fi
2808 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2809 # This is similar to how AIX traditionally builds its shared
2810 # libraries.
2811@@ -7449,6 +6719,7 @@
2812 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
2813 # as there is no search path for DLLs.
2814 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2815+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
2816 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2817 _LT_TAGVAR(always_export_symbols, $1)=no
2818 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2819@@ -7509,6 +6780,11 @@
2820 gnu*)
2821 ;;
2822
2823+ haiku*)
2824+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2825+ _LT_TAGVAR(link_all_deplibs, $1)=yes
2826+ ;;
2827+
2828 hpux9*)
2829 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
2830 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
2831@@ -7533,7 +6809,7 @@
2832 # explicitly linking system object files so we need to strip them
2833 # from the output so that they don't get included in the library
2834 # dependencies.
2835- 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'
2836+ 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"'
2837 ;;
2838 *)
2839 if test "$GXX" = yes; then
2840@@ -7598,7 +6874,7 @@
2841 # explicitly linking system object files so we need to strip them
2842 # from the output so that they don't get included in the library
2843 # dependencies.
2844- 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'
2845+ 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"'
2846 ;;
2847 *)
2848 if test "$GXX" = yes; then
2849@@ -7641,7 +6917,7 @@
2850 case $cc_basename in
2851 CC*)
2852 # SGI C++
2853- _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'
2854+ _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'
2855
2856 # Archives containing C++ object files must be created using
2857 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
2858@@ -7652,9 +6928,9 @@
2859 *)
2860 if test "$GXX" = yes; then
2861 if test "$with_gnu_ld" = no; then
2862- _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'
2863+ _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'
2864 else
2865- _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'
2866+ _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'
2867 fi
2868 fi
2869 _LT_TAGVAR(link_all_deplibs, $1)=yes
2870@@ -7665,7 +6941,7 @@
2871 _LT_TAGVAR(inherit_rpath, $1)=yes
2872 ;;
2873
2874- linux* | k*bsd*-gnu)
2875+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2876 case $cc_basename in
2877 KCC*)
2878 # Kuck and Associates, Inc. (KAI) C++ Compiler
2879@@ -7683,7 +6959,7 @@
2880 # explicitly linking system object files so we need to strip them
2881 # from the output so that they don't get included in the library
2882 # dependencies.
2883- 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'
2884+ 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"'
2885
2886 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
2887 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2888@@ -7720,26 +6996,26 @@
2889 pgCC* | pgcpp*)
2890 # Portland Group C++ compiler
2891 case `$CC -V` in
2892- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
2893+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
2894 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
2895 rm -rf $tpldir~
2896 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
2897- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
2898+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
2899 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
2900 rm -rf $tpldir~
2901 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
2902- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
2903+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
2904 $RANLIB $oldlib'
2905 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
2906 rm -rf $tpldir~
2907 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
2908- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2909+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2910 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
2911 rm -rf $tpldir~
2912 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
2913- $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'
2914+ $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'
2915 ;;
2916- *) # Version 6 will use weak symbols
2917+ *) # Version 6 and above use weak symbols
2918 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2919 _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'
2920 ;;
2921@@ -7747,7 +7023,7 @@
2922
2923 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
2924 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2925- _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'
2926+ _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'
2927 ;;
2928 cxx*)
2929 # Compaq C++
2930@@ -7766,9 +7042,9 @@
2931 # explicitly linking system object files so we need to strip them
2932 # from the output so that they don't get included in the library
2933 # dependencies.
2934- 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'
2935+ 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'
2936 ;;
2937- xl*)
2938+ xl* | mpixl* | bgxl*)
2939 # IBM XL 8.0 on PPC, with GNU ld
2940 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2941 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2942@@ -7788,13 +7064,13 @@
2943 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2944 _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'
2945 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
2946- _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'
2947+ _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'
2948 _LT_TAGVAR(compiler_needs_object, $1)=yes
2949
2950 # Not sure whether something based on
2951 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
2952 # would be better.
2953- output_verbose_link_cmd='echo'
2954+ output_verbose_link_cmd='func_echo_all'
2955
2956 # Archives containing C++ object files must be created using
2957 # "CC -xar", where "CC" is the Sun C++ compiler. This is
2958@@ -7863,7 +7139,7 @@
2959 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
2960 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
2961 fi
2962- output_verbose_link_cmd=echo
2963+ output_verbose_link_cmd=func_echo_all
2964 else
2965 _LT_TAGVAR(ld_shlibs, $1)=no
2966 fi
2967@@ -7898,15 +7174,15 @@
2968 case $host in
2969 osf3*)
2970 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2971- _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'
2972+ _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'
2973 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2974 ;;
2975 *)
2976 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2977- _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'
2978+ _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'
2979 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
2980 echo "-hidden">> $lib.exp~
2981- $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~
2982+ $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~
2983 $RM $lib.exp'
2984 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
2985 ;;
2986@@ -7922,17 +7198,17 @@
2987 # explicitly linking system object files so we need to strip them
2988 # from the output so that they don't get included in the library
2989 # dependencies.
2990- 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'
2991+ 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"'
2992 ;;
2993 *)
2994 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
2995 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2996 case $host in
2997 osf3*)
2998- _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'
2999+ _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'
3000 ;;
3001 *)
3002- _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'
3003+ _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'
3004 ;;
3005 esac
3006
3007@@ -7942,7 +7218,7 @@
3008 # Commands to make compiler produce verbose output that lists
3009 # what "hidden" libraries, object files and flags are used when
3010 # linking a shared library.
3011- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
3012+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
3013
3014 else
3015 # FIXME: insert proper C++ library support
3016@@ -7978,7 +7254,7 @@
3017
3018 solaris*)
3019 case $cc_basename in
3020- CC*)
3021+ CC* | sunCC*)
3022 # Sun C++ 4.2, 5.x and Centerline C++
3023 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
3024 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
3025@@ -7999,7 +7275,7 @@
3026 esac
3027 _LT_TAGVAR(link_all_deplibs, $1)=yes
3028
3029- output_verbose_link_cmd='echo'
3030+ output_verbose_link_cmd='func_echo_all'
3031
3032 # Archives containing C++ object files must be created using
3033 # "CC -xar", where "CC" is the Sun C++ compiler. This is
3034@@ -8026,7 +7302,7 @@
3035 # Commands to make compiler produce verbose output that lists
3036 # what "hidden" libraries, object files and flags are used when
3037 # linking a shared library.
3038- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
3039+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
3040 else
3041 # g++ 2.7 appears to require `-G' NOT `-shared' on this
3042 # platform.
3043@@ -8037,7 +7313,7 @@
3044 # Commands to make compiler produce verbose output that lists
3045 # what "hidden" libraries, object files and flags are used when
3046 # linking a shared library.
3047- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
3048+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
3049 fi
3050
3051 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
3052@@ -8091,6 +7367,10 @@
3053 CC*)
3054 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
3055 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
3056+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
3057+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
3058+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
3059+ '"$_LT_TAGVAR(reload_cmds, $1)"
3060 ;;
3061 *)
3062 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
3063@@ -8337,7 +7617,7 @@
3064
3065 solaris*)
3066 case $cc_basename in
3067- CC*)
3068+ CC* | sunCC*)
3069 # The more standards-conforming stlport4 library is
3070 # incompatible with the Cstd library. Avoid specifying
3071 # it if it's in CXXFLAGS. Ignore libCrun as
3072@@ -8381,32 +7661,16 @@
3073 ])# _LT_SYS_HIDDEN_LIBDEPS
3074
3075
3076-# _LT_PROG_F77
3077-# ------------
3078-# Since AC_PROG_F77 is broken, in that it returns the empty string
3079-# if there is no fortran compiler, we have our own version here.
3080-m4_defun([_LT_PROG_F77],
3081-[
3082-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
3083-AC_PROG_F77
3084-if test -z "$F77" || test "X$F77" = "Xno"; then
3085- _lt_disable_F77=yes
3086-fi
3087-popdef([AC_MSG_ERROR])
3088-])# _LT_PROG_F77
3089-
3090-dnl aclocal-1.4 backwards compatibility:
3091-dnl AC_DEFUN([_LT_PROG_F77], [])
3092-
3093-
3094 # _LT_LANG_F77_CONFIG([TAG])
3095 # --------------------------
3096 # Ensure that the configuration variables for a Fortran 77 compiler are
3097 # suitably defined. These variables are subsequently used by _LT_CONFIG
3098 # to write the compiler configuration to `libtool'.
3099 m4_defun([_LT_LANG_F77_CONFIG],
3100-[AC_REQUIRE([_LT_PROG_F77])dnl
3101-AC_LANG_PUSH(Fortran 77)
3102+[AC_LANG_PUSH(Fortran 77)
3103+if test -z "$F77" || test "X$F77" = "Xno"; then
3104+ _lt_disable_F77=yes
3105+fi
3106
3107 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
3108 _LT_TAGVAR(allow_undefined_flag, $1)=
3109@@ -8425,6 +7689,8 @@
3110 _LT_TAGVAR(module_expsym_cmds, $1)=
3111 _LT_TAGVAR(link_all_deplibs, $1)=unknown
3112 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3113+_LT_TAGVAR(reload_flag, $1)=$reload_flag
3114+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3115 _LT_TAGVAR(no_undefined_flag, $1)=
3116 _LT_TAGVAR(whole_archive_flag_spec, $1)=
3117 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
3118@@ -8524,32 +7790,17 @@
3119 ])# _LT_LANG_F77_CONFIG
3120
3121
3122-# _LT_PROG_FC
3123-# -----------
3124-# Since AC_PROG_FC is broken, in that it returns the empty string
3125-# if there is no fortran compiler, we have our own version here.
3126-m4_defun([_LT_PROG_FC],
3127-[
3128-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
3129-AC_PROG_FC
3130-if test -z "$FC" || test "X$FC" = "Xno"; then
3131- _lt_disable_FC=yes
3132-fi
3133-popdef([AC_MSG_ERROR])
3134-])# _LT_PROG_FC
3135-
3136-dnl aclocal-1.4 backwards compatibility:
3137-dnl AC_DEFUN([_LT_PROG_FC], [])
3138-
3139-
3140 # _LT_LANG_FC_CONFIG([TAG])
3141 # -------------------------
3142 # Ensure that the configuration variables for a Fortran compiler are
3143 # suitably defined. These variables are subsequently used by _LT_CONFIG
3144 # to write the compiler configuration to `libtool'.
3145 m4_defun([_LT_LANG_FC_CONFIG],
3146-[AC_REQUIRE([_LT_PROG_FC])dnl
3147-AC_LANG_PUSH(Fortran)
3148+[AC_LANG_PUSH(Fortran)
3149+
3150+if test -z "$FC" || test "X$FC" = "Xno"; then
3151+ _lt_disable_FC=yes
3152+fi
3153
3154 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
3155 _LT_TAGVAR(allow_undefined_flag, $1)=
3156@@ -8568,6 +7819,8 @@
3157 _LT_TAGVAR(module_expsym_cmds, $1)=
3158 _LT_TAGVAR(link_all_deplibs, $1)=unknown
3159 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3160+_LT_TAGVAR(reload_flag, $1)=$reload_flag
3161+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3162 _LT_TAGVAR(no_undefined_flag, $1)=
3163 _LT_TAGVAR(whole_archive_flag_spec, $1)=
3164 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
3165@@ -8713,6 +7966,8 @@
3166 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
3167
3168 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3169+_LT_TAGVAR(reload_flag, $1)=$reload_flag
3170+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3171
3172 if test -n "$compiler"; then
3173 _LT_COMPILER_NO_RTTI($1)
3174@@ -9074,7 +8329,7 @@
3175 func_dirname ()
3176 {
3177 # Extract subdirectory from the argument.
3178- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
3179+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3180 if test "X$func_dirname_result" = "X${1}"; then
3181 func_dirname_result="${3}"
3182 else
3183@@ -9085,7 +8340,7 @@
3184 # func_basename file
3185 func_basename ()
3186 {
3187- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
3188+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3189 }
3190
3191 dnl func_dirname_and_basename
3192@@ -9101,10 +8356,8 @@
3193 func_stripname ()
3194 {
3195 case ${2} in
3196- .*) func_stripname_result=`$ECHO "X${3}" \
3197- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
3198- *) func_stripname_result=`$ECHO "X${3}" \
3199- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
3200+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3201+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3202 esac
3203 }
3204
3205@@ -9115,20 +8368,20 @@
3206 # func_opt_split
3207 func_opt_split ()
3208 {
3209- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
3210- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
3211+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3212+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3213 }
3214
3215 # func_lo2o object
3216 func_lo2o ()
3217 {
3218- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
3219+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3220 }
3221
3222 # func_xform libobj-or-source
3223 func_xform ()
3224 {
3225- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
3226+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
3227 }
3228
3229 # func_arith arithmetic-term...
3230@@ -9176,14 +8429,15 @@
3231
3232 # Helper functions for option handling. -*- Autoconf -*-
3233 #
3234-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
3235+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
3236+# Inc.
3237 # Written by Gary V. Vaughan, 2004
3238 #
3239 # This file is free software; the Free Software Foundation gives
3240 # unlimited permission to copy and/or distribute it, with or without
3241 # modifications, as long as this notice is preserved.
3242
3243-# serial 6 ltoptions.m4
3244+# serial 7 ltoptions.m4
3245
3246 # This is to help aclocal find these macros, as it can't see m4_define.
3247 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
3248@@ -9298,7 +8552,7 @@
3249 [enable_win32_dll=yes
3250
3251 case $host in
3252-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
3253+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
3254 AC_CHECK_TOOL(AS, as, false)
3255 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
3256 AC_CHECK_TOOL(OBJDUMP, objdump, false)
3257@@ -9306,13 +8560,13 @@
3258 esac
3259
3260 test -z "$AS" && AS=as
3261-_LT_DECL([], [AS], [0], [Assembler program])dnl
3262+_LT_DECL([], [AS], [1], [Assembler program])dnl
3263
3264 test -z "$DLLTOOL" && DLLTOOL=dlltool
3265-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
3266+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
3267
3268 test -z "$OBJDUMP" && OBJDUMP=objdump
3269-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
3270+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
3271 ])# win32-dll
3272
3273 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
3274@@ -9672,29 +8926,29 @@
3275
3276 # Generated from ltversion.in.
3277
3278-# serial 3012 ltversion.m4
3279+# serial 3175 ltversion.m4
3280 # This file is part of GNU Libtool
3281
3282-m4_define([LT_PACKAGE_VERSION], [2.2.6])
3283-m4_define([LT_PACKAGE_REVISION], [1.3012])
3284+m4_define([LT_PACKAGE_VERSION], [2.2.10])
3285+m4_define([LT_PACKAGE_REVISION], [1.3175])
3286
3287 AC_DEFUN([LTVERSION_VERSION],
3288-[macro_version='2.2.6'
3289-macro_revision='1.3012'
3290+[macro_version='2.2.10'
3291+macro_revision='1.3175'
3292 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
3293 _LT_DECL(, macro_revision, 0)
3294 ])
3295
3296 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
3297 #
3298-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
3299+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
3300 # Written by Scott James Remnant, 2004.
3301 #
3302 # This file is free software; the Free Software Foundation gives
3303 # unlimited permission to copy and/or distribute it, with or without
3304 # modifications, as long as this notice is preserved.
3305
3306-# serial 4 lt~obsolete.m4
3307+# serial 5 lt~obsolete.m4
3308
3309 # These exist entirely to fool aclocal when bootstrapping libtool.
3310 #
3311@@ -9764,7 +9018,6 @@
3312 m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
3313 m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
3314 m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
3315-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
3316 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
3317 m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
3318 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
3319@@ -9777,9 +9030,17 @@
3320 m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
3321 m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
3322 m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
3323+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
3324+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
3325+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
3326+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
3327+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
3328+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
3329+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
3330
3331-# nls.m4 serial 3 (gettext-0.15)
3332-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
3333+# nls.m4 serial 5 (gettext-0.18)
3334+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
3335+dnl Inc.
3336 dnl This file is free software; the Free Software Foundation
3337 dnl gives unlimited permission to copy and/or distribute it,
3338 dnl with or without modifications, as long as this notice is preserved.
3339@@ -9797,20 +9058,21 @@
3340 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
3341 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
3342
3343-AC_PREREQ(2.50)
3344+AC_PREREQ([2.50])
3345
3346 AC_DEFUN([AM_NLS],
3347 [
3348 AC_MSG_CHECKING([whether NLS is requested])
3349 dnl Default is enabled NLS
3350- AC_ARG_ENABLE(nls,
3351+ AC_ARG_ENABLE([nls],
3352 [ --disable-nls do not use Native Language Support],
3353 USE_NLS=$enableval, USE_NLS=yes)
3354- AC_MSG_RESULT($USE_NLS)
3355- AC_SUBST(USE_NLS)
3356+ AC_MSG_RESULT([$USE_NLS])
3357+ AC_SUBST([USE_NLS])
3358 ])
3359
3360 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
3361+# serial 1 (pkg-config-0.24)
3362 #
3363 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
3364 #
3365@@ -9838,7 +9100,10 @@
3366 AC_DEFUN([PKG_PROG_PKG_CONFIG],
3367 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
3368 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
3369-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
3370+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
3371+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
3372+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
3373+
3374 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
3375 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
3376 fi
3377@@ -9851,7 +9116,6 @@
3378 AC_MSG_RESULT([no])
3379 PKG_CONFIG=""
3380 fi
3381-
3382 fi[]dnl
3383 ])# PKG_PROG_PKG_CONFIG
3384
3385@@ -9860,21 +9124,20 @@
3386 # Check to see whether a particular set of modules exists. Similar
3387 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
3388 #
3389-#
3390-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
3391-# this or PKG_CHECK_MODULES is called, or make sure to call
3392-# PKG_CHECK_EXISTS manually
3393+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
3394+# only at the first occurence in configure.ac, so if the first place
3395+# it's called might be skipped (such as if it is within an "if", you
3396+# have to call PKG_CHECK_EXISTS manually
3397 # --------------------------------------------------------------
3398 AC_DEFUN([PKG_CHECK_EXISTS],
3399 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
3400 if test -n "$PKG_CONFIG" && \
3401 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
3402- m4_ifval([$2], [$2], [:])
3403+ m4_default([$2], [:])
3404 m4_ifvaln([$3], [else
3405 $3])dnl
3406 fi])
3407
3408-
3409 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
3410 # ---------------------------------------------
3411 m4_define([_PKG_CONFIG],
3412@@ -9927,6 +9190,7 @@
3413 See the pkg-config man page for more details.])
3414
3415 if test $pkg_failed = yes; then
3416+ AC_MSG_RESULT([no])
3417 _PKG_SHORT_ERRORS_SUPPORTED
3418 if test $_pkg_short_errors_supported = yes; then
3419 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
3420@@ -9936,7 +9200,7 @@
3421 # Put the nasty error message in config.log where it belongs
3422 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
3423
3424- ifelse([$4], , [AC_MSG_ERROR(dnl
3425+ m4_default([$4], [AC_MSG_ERROR(
3426 [Package requirements ($2) were not met:
3427
3428 $$1_PKG_ERRORS
3429@@ -9944,25 +9208,855 @@
3430 Consider adjusting the PKG_CONFIG_PATH environment variable if you
3431 installed software in a non-standard prefix.
3432
3433-_PKG_TEXT
3434-])],
3435- [AC_MSG_RESULT([no])
3436- $4])
3437+_PKG_TEXT])
3438+ ])
3439 elif test $pkg_failed = untried; then
3440- ifelse([$4], , [AC_MSG_FAILURE(dnl
3441+ AC_MSG_RESULT([no])
3442+ m4_default([$4], [AC_MSG_FAILURE(
3443 [The pkg-config script could not be found or is too old. Make sure it
3444 is in your PATH or set the PKG_CONFIG environment variable to the full
3445 path to pkg-config.
3446
3447 _PKG_TEXT
3448
3449-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
3450- [$4])
3451+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
3452+ ])
3453 else
3454 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
3455 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
3456 AC_MSG_RESULT([yes])
3457- ifelse([$3], , :, [$3])
3458+ $3
3459 fi[]dnl
3460 ])# PKG_CHECK_MODULES
3461
3462+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
3463+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
3464+#
3465+# This file is free software, distributed under the terms of the GNU
3466+# General Public License. As a special exception to the GNU General
3467+# Public License, this file may be distributed as part of a program
3468+# that contains a configuration script generated by Autoconf, under
3469+# the same distribution terms as the rest of that program.
3470+#
3471+# This file can be copied and used freely without restrictions. It can
3472+# be used in projects which are not available under the GNU Public License
3473+# but which still want to provide support for the GNU gettext functionality.
3474+#
3475+# Macro to add for using GNU gettext.
3476+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
3477+#
3478+# Modified to never use included libintl.
3479+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
3480+#
3481+# Major rework to remove unused code
3482+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
3483+#
3484+# Added better handling of ALL_LINGUAS from GNU gettext version
3485+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
3486+#
3487+# Modified to require ngettext
3488+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
3489+#
3490+# We need this here as well, since someone might use autoconf-2.5x
3491+# to configure GLib then an older version to configure a package
3492+# using AM_GLIB_GNU_GETTEXT
3493+AC_PREREQ(2.53)
3494+
3495+dnl
3496+dnl We go to great lengths to make sure that aclocal won't
3497+dnl try to pull in the installed version of these macros
3498+dnl when running aclocal in the glib directory.
3499+dnl
3500+m4_copy([AC_DEFUN],[glib_DEFUN])
3501+m4_copy([AC_REQUIRE],[glib_REQUIRE])
3502+dnl
3503+dnl At the end, if we're not within glib, we'll define the public
3504+dnl definitions in terms of our private definitions.
3505+dnl
3506+
3507+# GLIB_LC_MESSAGES
3508+#--------------------
3509+glib_DEFUN([GLIB_LC_MESSAGES],
3510+ [AC_CHECK_HEADERS([locale.h])
3511+ if test $ac_cv_header_locale_h = yes; then
3512+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
3513+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
3514+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
3515+ if test $am_cv_val_LC_MESSAGES = yes; then
3516+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
3517+ [Define if your <locale.h> file defines LC_MESSAGES.])
3518+ fi
3519+ fi])
3520+
3521+# GLIB_PATH_PROG_WITH_TEST
3522+#----------------------------
3523+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
3524+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
3525+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
3526+[# Extract the first word of "$2", so it can be a program name with args.
3527+set dummy $2; ac_word=[$]2
3528+AC_MSG_CHECKING([for $ac_word])
3529+AC_CACHE_VAL(ac_cv_path_$1,
3530+[case "[$]$1" in
3531+ /*)
3532+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
3533+ ;;
3534+ *)
3535+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
3536+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
3537+ test -z "$ac_dir" && ac_dir=.
3538+ if test -f $ac_dir/$ac_word; then
3539+ if [$3]; then
3540+ ac_cv_path_$1="$ac_dir/$ac_word"
3541+ break
3542+ fi
3543+ fi
3544+ done
3545+ IFS="$ac_save_ifs"
3546+dnl If no 4th arg is given, leave the cache variable unset,
3547+dnl so AC_PATH_PROGS will keep looking.
3548+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
3549+])dnl
3550+ ;;
3551+esac])dnl
3552+$1="$ac_cv_path_$1"
3553+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
3554+ AC_MSG_RESULT([$]$1)
3555+else
3556+ AC_MSG_RESULT(no)
3557+fi
3558+AC_SUBST($1)dnl
3559+])
3560+
3561+# GLIB_WITH_NLS
3562+#-----------------
3563+glib_DEFUN([GLIB_WITH_NLS],
3564+ dnl NLS is obligatory
3565+ [USE_NLS=yes
3566+ AC_SUBST(USE_NLS)
3567+
3568+ gt_cv_have_gettext=no
3569+
3570+ CATOBJEXT=NONE
3571+ XGETTEXT=:
3572+ INTLLIBS=
3573+
3574+ AC_CHECK_HEADER(libintl.h,
3575+ [gt_cv_func_dgettext_libintl="no"
3576+ libintl_extra_libs=""
3577+
3578+ #
3579+ # First check in libc
3580+ #
3581+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
3582+ [AC_TRY_LINK([
3583+#include <libintl.h>
3584+],
3585+ [return !ngettext ("","", 1)],
3586+ gt_cv_func_ngettext_libc=yes,
3587+ gt_cv_func_ngettext_libc=no)
3588+ ])
3589+
3590+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
3591+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
3592+ [AC_TRY_LINK([
3593+#include <libintl.h>
3594+],
3595+ [return !dgettext ("","")],
3596+ gt_cv_func_dgettext_libc=yes,
3597+ gt_cv_func_dgettext_libc=no)
3598+ ])
3599+ fi
3600+
3601+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
3602+ AC_CHECK_FUNCS(bind_textdomain_codeset)
3603+ fi
3604+
3605+ #
3606+ # If we don't have everything we want, check in libintl
3607+ #
3608+ if test "$gt_cv_func_dgettext_libc" != "yes" \
3609+ || test "$gt_cv_func_ngettext_libc" != "yes" \
3610+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
3611+
3612+ AC_CHECK_LIB(intl, bindtextdomain,
3613+ [AC_CHECK_LIB(intl, ngettext,
3614+ [AC_CHECK_LIB(intl, dgettext,
3615+ gt_cv_func_dgettext_libintl=yes)])])
3616+
3617+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
3618+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
3619+ AC_MSG_RESULT([])
3620+ AC_CHECK_LIB(intl, ngettext,
3621+ [AC_CHECK_LIB(intl, dcgettext,
3622+ [gt_cv_func_dgettext_libintl=yes
3623+ libintl_extra_libs=-liconv],
3624+ :,-liconv)],
3625+ :,-liconv)
3626+ fi
3627+
3628+ #
3629+ # If we found libintl, then check in it for bind_textdomain_codeset();
3630+ # we'll prefer libc if neither have bind_textdomain_codeset(),
3631+ # and both have dgettext and ngettext
3632+ #
3633+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
3634+ glib_save_LIBS="$LIBS"
3635+ LIBS="$LIBS -lintl $libintl_extra_libs"
3636+ unset ac_cv_func_bind_textdomain_codeset
3637+ AC_CHECK_FUNCS(bind_textdomain_codeset)
3638+ LIBS="$glib_save_LIBS"
3639+
3640+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
3641+ gt_cv_func_dgettext_libc=no
3642+ else
3643+ if test "$gt_cv_func_dgettext_libc" = "yes" \
3644+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
3645+ gt_cv_func_dgettext_libintl=no
3646+ fi
3647+ fi
3648+ fi
3649+ fi
3650+
3651+ if test "$gt_cv_func_dgettext_libc" = "yes" \
3652+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
3653+ gt_cv_have_gettext=yes
3654+ fi
3655+
3656+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
3657+ INTLLIBS="-lintl $libintl_extra_libs"
3658+ fi
3659+
3660+ if test "$gt_cv_have_gettext" = "yes"; then
3661+ AC_DEFINE(HAVE_GETTEXT,1,
3662+ [Define if the GNU gettext() function is already present or preinstalled.])
3663+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
3664+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
3665+ if test "$MSGFMT" != "no"; then
3666+ glib_save_LIBS="$LIBS"
3667+ LIBS="$LIBS $INTLLIBS"
3668+ AC_CHECK_FUNCS(dcgettext)
3669+ MSGFMT_OPTS=
3670+ AC_MSG_CHECKING([if msgfmt accepts -c])
3671+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
3672+msgid ""
3673+msgstr ""
3674+"Content-Type: text/plain; charset=UTF-8\n"
3675+"Project-Id-Version: test 1.0\n"
3676+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
3677+"Last-Translator: test <foo@bar.xx>\n"
3678+"Language-Team: C <LL@li.org>\n"
3679+"MIME-Version: 1.0\n"
3680+"Content-Transfer-Encoding: 8bit\n"
3681+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
3682+ AC_SUBST(MSGFMT_OPTS)
3683+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
3684+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
3685+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
3686+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
3687+ return _nl_msg_cat_cntr],
3688+ [CATOBJEXT=.gmo
3689+ DATADIRNAME=share],
3690+ [case $host in
3691+ *-*-solaris*)
3692+ dnl On Solaris, if bind_textdomain_codeset is in libc,
3693+ dnl GNU format message catalog is always supported,
3694+ dnl since both are added to the libc all together.
3695+ dnl Hence, we'd like to go with DATADIRNAME=share and
3696+ dnl and CATOBJEXT=.gmo in this case.
3697+ AC_CHECK_FUNC(bind_textdomain_codeset,
3698+ [CATOBJEXT=.gmo
3699+ DATADIRNAME=share],
3700+ [CATOBJEXT=.mo
3701+ DATADIRNAME=lib])
3702+ ;;
3703+ *)
3704+ CATOBJEXT=.mo
3705+ DATADIRNAME=lib
3706+ ;;
3707+ esac])
3708+ LIBS="$glib_save_LIBS"
3709+ INSTOBJEXT=.mo
3710+ else
3711+ gt_cv_have_gettext=no
3712+ fi
3713+ fi
3714+ ])
3715+
3716+ if test "$gt_cv_have_gettext" = "yes" ; then
3717+ AC_DEFINE(ENABLE_NLS, 1,
3718+ [always defined to indicate that i18n is enabled])
3719+ fi
3720+
3721+ dnl Test whether we really found GNU xgettext.
3722+ if test "$XGETTEXT" != ":"; then
3723+ dnl If it is not GNU xgettext we define it as : so that the
3724+ dnl Makefiles still can work.
3725+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
3726+ : ;
3727+ else
3728+ AC_MSG_RESULT(
3729+ [found xgettext program is not GNU xgettext; ignore it])
3730+ XGETTEXT=":"
3731+ fi
3732+ fi
3733+
3734+ # We need to process the po/ directory.
3735+ POSUB=po
3736+
3737+ AC_OUTPUT_COMMANDS(
3738+ [case "$CONFIG_FILES" in *po/Makefile.in*)
3739+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
3740+ esac])
3741+
3742+ dnl These rules are solely for the distribution goal. While doing this
3743+ dnl we only have to keep exactly one list of the available catalogs
3744+ dnl in configure.ac.
3745+ for lang in $ALL_LINGUAS; do
3746+ GMOFILES="$GMOFILES $lang.gmo"
3747+ POFILES="$POFILES $lang.po"
3748+ done
3749+
3750+ dnl Make all variables we use known to autoconf.
3751+ AC_SUBST(CATALOGS)
3752+ AC_SUBST(CATOBJEXT)
3753+ AC_SUBST(DATADIRNAME)
3754+ AC_SUBST(GMOFILES)
3755+ AC_SUBST(INSTOBJEXT)
3756+ AC_SUBST(INTLLIBS)
3757+ AC_SUBST(PO_IN_DATADIR_TRUE)
3758+ AC_SUBST(PO_IN_DATADIR_FALSE)
3759+ AC_SUBST(POFILES)
3760+ AC_SUBST(POSUB)
3761+ ])
3762+
3763+# AM_GLIB_GNU_GETTEXT
3764+# -------------------
3765+# Do checks necessary for use of gettext. If a suitable implementation
3766+# of gettext is found in either in libintl or in the C library,
3767+# it will set INTLLIBS to the libraries needed for use of gettext
3768+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
3769+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
3770+# on various variables needed by the Makefile.in.in installed by
3771+# glib-gettextize.
3772+dnl
3773+glib_DEFUN([GLIB_GNU_GETTEXT],
3774+ [AC_REQUIRE([AC_PROG_CC])dnl
3775+ AC_REQUIRE([AC_HEADER_STDC])dnl
3776+
3777+ GLIB_LC_MESSAGES
3778+ GLIB_WITH_NLS
3779+
3780+ if test "$gt_cv_have_gettext" = "yes"; then
3781+ if test "x$ALL_LINGUAS" = "x"; then
3782+ LINGUAS=
3783+ else
3784+ AC_MSG_CHECKING(for catalogs to be installed)
3785+ NEW_LINGUAS=
3786+ for presentlang in $ALL_LINGUAS; do
3787+ useit=no
3788+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
3789+ desiredlanguages="$LINGUAS"
3790+ else
3791+ desiredlanguages="$ALL_LINGUAS"
3792+ fi
3793+ for desiredlang in $desiredlanguages; do
3794+ # Use the presentlang catalog if desiredlang is
3795+ # a. equal to presentlang, or
3796+ # b. a variant of presentlang (because in this case,
3797+ # presentlang can be used as a fallback for messages
3798+ # which are not translated in the desiredlang catalog).
3799+ case "$desiredlang" in
3800+ "$presentlang"*) useit=yes;;
3801+ esac
3802+ done
3803+ if test $useit = yes; then
3804+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
3805+ fi
3806+ done
3807+ LINGUAS=$NEW_LINGUAS
3808+ AC_MSG_RESULT($LINGUAS)
3809+ fi
3810+
3811+ dnl Construct list of names of catalog files to be constructed.
3812+ if test -n "$LINGUAS"; then
3813+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
3814+ fi
3815+ fi
3816+
3817+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
3818+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
3819+ dnl Try to locate is.
3820+ MKINSTALLDIRS=
3821+ if test -n "$ac_aux_dir"; then
3822+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
3823+ fi
3824+ if test -z "$MKINSTALLDIRS"; then
3825+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
3826+ fi
3827+ AC_SUBST(MKINSTALLDIRS)
3828+
3829+ dnl Generate list of files to be processed by xgettext which will
3830+ dnl be included in po/Makefile.
3831+ test -d po || mkdir po
3832+ if test "x$srcdir" != "x."; then
3833+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
3834+ posrcprefix="$srcdir/"
3835+ else
3836+ posrcprefix="../$srcdir/"
3837+ fi
3838+ else
3839+ posrcprefix="../"
3840+ fi
3841+ rm -f po/POTFILES
3842+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
3843+ < $srcdir/po/POTFILES.in > po/POTFILES
3844+ ])
3845+
3846+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
3847+# -------------------------------
3848+# Define VARIABLE to the location where catalog files will
3849+# be installed by po/Makefile.
3850+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
3851+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
3852+glib_save_prefix="$prefix"
3853+glib_save_exec_prefix="$exec_prefix"
3854+glib_save_datarootdir="$datarootdir"
3855+test "x$prefix" = xNONE && prefix=$ac_default_prefix
3856+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
3857+datarootdir=`eval echo "${datarootdir}"`
3858+if test "x$CATOBJEXT" = "x.mo" ; then
3859+ localedir=`eval echo "${libdir}/locale"`
3860+else
3861+ localedir=`eval echo "${datadir}/locale"`
3862+fi
3863+prefix="$glib_save_prefix"
3864+exec_prefix="$glib_save_exec_prefix"
3865+datarootdir="$glib_save_datarootdir"
3866+AC_DEFINE_UNQUOTED($1, "$localedir",
3867+ [Define the location where the catalogs will be installed])
3868+])
3869+
3870+dnl
3871+dnl Now the definitions that aclocal will find
3872+dnl
3873+ifdef(glib_configure_ac,[],[
3874+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
3875+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
3876+])dnl
3877+
3878+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
3879+#
3880+# Create a temporary file with TEST-FILE as its contents and pass the
3881+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
3882+# 0 and perform ACTION-IF-FAIL for any other exit status.
3883+AC_DEFUN([GLIB_RUN_PROG],
3884+[cat >conftest.foo <<_ACEOF
3885+$2
3886+_ACEOF
3887+if AC_RUN_LOG([$1 conftest.foo]); then
3888+ m4_ifval([$3], [$3], [:])
3889+m4_ifvaln([$4], [else $4])dnl
3890+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
3891+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
3892+fi])
3893+
3894+
3895+dnl GNOME_COMPILE_WARNINGS
3896+dnl Turn on many useful compiler warnings
3897+dnl For now, only works on GCC
3898+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
3899+ dnl ******************************
3900+ dnl More compiler warnings
3901+ dnl ******************************
3902+
3903+ AC_ARG_ENABLE(compile-warnings,
3904+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
3905+ [Turn on compiler warnings]),,
3906+ [enable_compile_warnings="m4_default([$1],[yes])"])
3907+
3908+ warnCFLAGS=
3909+ if test "x$GCC" != xyes; then
3910+ enable_compile_warnings=no
3911+ fi
3912+
3913+ warning_flags=
3914+ realsave_CFLAGS="$CFLAGS"
3915+
3916+ case "$enable_compile_warnings" in
3917+ no)
3918+ warning_flags=
3919+ ;;
3920+ minimum)
3921+ warning_flags="-Wall"
3922+ ;;
3923+ yes)
3924+ warning_flags="-Wall -Wmissing-prototypes"
3925+ ;;
3926+ maximum|error)
3927+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
3928+ CFLAGS="$warning_flags $CFLAGS"
3929+ for option in -Wno-sign-compare; do
3930+ SAVE_CFLAGS="$CFLAGS"
3931+ CFLAGS="$CFLAGS $option"
3932+ AC_MSG_CHECKING([whether gcc understands $option])
3933+ AC_TRY_COMPILE([], [],
3934+ has_option=yes,
3935+ has_option=no,)
3936+ CFLAGS="$SAVE_CFLAGS"
3937+ AC_MSG_RESULT($has_option)
3938+ if test $has_option = yes; then
3939+ warning_flags="$warning_flags $option"
3940+ fi
3941+ unset has_option
3942+ unset SAVE_CFLAGS
3943+ done
3944+ unset option
3945+ if test "$enable_compile_warnings" = "error" ; then
3946+ warning_flags="$warning_flags -Werror"
3947+ fi
3948+ ;;
3949+ *)
3950+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
3951+ ;;
3952+ esac
3953+ CFLAGS="$realsave_CFLAGS"
3954+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
3955+ AC_MSG_RESULT($warning_flags)
3956+
3957+ AC_ARG_ENABLE(iso-c,
3958+ AC_HELP_STRING([--enable-iso-c],
3959+ [Try to warn if code is not ISO C ]),,
3960+ [enable_iso_c=no])
3961+
3962+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
3963+ complCFLAGS=
3964+ if test "x$enable_iso_c" != "xno"; then
3965+ if test "x$GCC" = "xyes"; then
3966+ case " $CFLAGS " in
3967+ *[\ \ ]-ansi[\ \ ]*) ;;
3968+ *) complCFLAGS="$complCFLAGS -ansi" ;;
3969+ esac
3970+ case " $CFLAGS " in
3971+ *[\ \ ]-pedantic[\ \ ]*) ;;
3972+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
3973+ esac
3974+ fi
3975+ fi
3976+ AC_MSG_RESULT($complCFLAGS)
3977+
3978+ WARN_CFLAGS="$warning_flags $complCFLAGS"
3979+ AC_SUBST(WARN_CFLAGS)
3980+])
3981+
3982+dnl For C++, do basically the same thing.
3983+
3984+AC_DEFUN([GNOME_CXX_WARNINGS],[
3985+ AC_ARG_ENABLE(cxx-warnings,
3986+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
3987+ [Turn on compiler warnings.]),,
3988+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
3989+
3990+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
3991+ warnCXXFLAGS=
3992+ if test "x$GXX" != xyes; then
3993+ enable_cxx_warnings=no
3994+ fi
3995+ if test "x$enable_cxx_warnings" != "xno"; then
3996+ if test "x$GXX" = "xyes"; then
3997+ case " $CXXFLAGS " in
3998+ *[\ \ ]-Wall[\ \ ]*) ;;
3999+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
4000+ esac
4001+
4002+ ## -W is not all that useful. And it cannot be controlled
4003+ ## with individual -Wno-xxx flags, unlike -Wall
4004+ if test "x$enable_cxx_warnings" = "xyes"; then
4005+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
4006+ fi
4007+ fi
4008+ fi
4009+ AC_MSG_RESULT($warnCXXFLAGS)
4010+
4011+ AC_ARG_ENABLE(iso-cxx,
4012+ AC_HELP_STRING([--enable-iso-cxx],
4013+ [Try to warn if code is not ISO C++ ]),,
4014+ [enable_iso_cxx=no])
4015+
4016+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
4017+ complCXXFLAGS=
4018+ if test "x$enable_iso_cxx" != "xno"; then
4019+ if test "x$GXX" = "xyes"; then
4020+ case " $CXXFLAGS " in
4021+ *[\ \ ]-ansi[\ \ ]*) ;;
4022+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
4023+ esac
4024+
4025+ case " $CXXFLAGS " in
4026+ *[\ \ ]-pedantic[\ \ ]*) ;;
4027+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
4028+ esac
4029+ fi
4030+ fi
4031+ AC_MSG_RESULT($complCXXFLAGS)
4032+
4033+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
4034+ AC_SUBST(WARN_CXXFLAGS)
4035+])
4036+
4037+dnl -*- mode: autoconf -*-
4038+
4039+# serial 1
4040+
4041+dnl Usage:
4042+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
4043+AC_DEFUN([GTK_DOC_CHECK],
4044+[
4045+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
4046+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
4047+
4048+ dnl check for tools we added during development
4049+ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
4050+ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
4051+ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
4052+
4053+ dnl for overriding the documentation installation directory
4054+ AC_ARG_WITH([html-dir],
4055+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
4056+ [with_html_dir='${datadir}/gtk-doc/html'])
4057+ HTML_DIR="$with_html_dir"
4058+ AC_SUBST([HTML_DIR])
4059+
4060+ dnl enable/disable documentation building
4061+ AC_ARG_ENABLE([gtk-doc],
4062+ AS_HELP_STRING([--enable-gtk-doc],
4063+ [use gtk-doc to build documentation [[default=no]]]),,
4064+ [enable_gtk_doc=no])
4065+
4066+ if test x$enable_gtk_doc = xyes; then
4067+ ifelse([$1],[],
4068+ [PKG_CHECK_EXISTS([gtk-doc],,
4069+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
4070+ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
4071+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
4072+ fi
4073+
4074+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
4075+ AC_MSG_RESULT($enable_gtk_doc)
4076+
4077+ dnl enable/disable output formats
4078+ AC_ARG_ENABLE([gtk-doc-html],
4079+ AS_HELP_STRING([--enable-gtk-doc-html],
4080+ [build documentation in html format [[default=yes]]]),,
4081+ [enable_gtk_doc_html=yes])
4082+ AC_ARG_ENABLE([gtk-doc-pdf],
4083+ AS_HELP_STRING([--enable-gtk-doc-pdf],
4084+ [build documentation in pdf format [[default=no]]]),,
4085+ [enable_gtk_doc_pdf=no])
4086+
4087+ if test -z "$GTKDOC_MKPDF"; then
4088+ enable_gtk_doc_pdf=no
4089+ fi
4090+
4091+
4092+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
4093+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
4094+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
4095+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
4096+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
4097+])
4098+
4099+
4100+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
4101+# serial 40 IT_PROG_INTLTOOL
4102+AC_DEFUN([IT_PROG_INTLTOOL], [
4103+AC_PREREQ([2.50])dnl
4104+AC_REQUIRE([AM_NLS])dnl
4105+
4106+case "$am__api_version" in
4107+ 1.[01234])
4108+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
4109+ ;;
4110+ *)
4111+ ;;
4112+esac
4113+
4114+if test -n "$1"; then
4115+ AC_MSG_CHECKING([for intltool >= $1])
4116+
4117+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4118+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
4119+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4120+ ]
4121+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
4122+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
4123+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
4124+fi
4125+
4126+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
4127+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
4128+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
4129+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
4130+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
4131+fi
4132+
4133+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4134+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4135+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4136+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4137+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
4138+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4139+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4140+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4141+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4142+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4143+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4144+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
4145+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4146+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4147+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4148+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4149+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4150+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4151+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
4152+
4153+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
4154+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
4155+_IT_SUBST(INTLTOOL_KEYS_RULE)
4156+_IT_SUBST(INTLTOOL_PROP_RULE)
4157+_IT_SUBST(INTLTOOL_OAF_RULE)
4158+_IT_SUBST(INTLTOOL_PONG_RULE)
4159+_IT_SUBST(INTLTOOL_SERVER_RULE)
4160+_IT_SUBST(INTLTOOL_SHEET_RULE)
4161+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
4162+_IT_SUBST(INTLTOOL_UI_RULE)
4163+_IT_SUBST(INTLTOOL_XAM_RULE)
4164+_IT_SUBST(INTLTOOL_KBD_RULE)
4165+_IT_SUBST(INTLTOOL_XML_RULE)
4166+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
4167+_IT_SUBST(INTLTOOL_CAVES_RULE)
4168+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
4169+_IT_SUBST(INTLTOOL_THEME_RULE)
4170+_IT_SUBST(INTLTOOL_SERVICE_RULE)
4171+_IT_SUBST(INTLTOOL_POLICY_RULE)
4172+
4173+# Check the gettext tools to make sure they are GNU
4174+AC_PATH_PROG(XGETTEXT, xgettext)
4175+AC_PATH_PROG(MSGMERGE, msgmerge)
4176+AC_PATH_PROG(MSGFMT, msgfmt)
4177+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
4178+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
4179+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
4180+fi
4181+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
4182+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
4183+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
4184+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
4185+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
4186+fi
4187+
4188+AC_PATH_PROG(INTLTOOL_PERL, perl)
4189+if test -z "$INTLTOOL_PERL"; then
4190+ AC_MSG_ERROR([perl not found])
4191+fi
4192+AC_MSG_CHECKING([for perl >= 5.8.1])
4193+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
4194+if test $? -ne 0; then
4195+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
4196+else
4197+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
4198+ AC_MSG_RESULT([$IT_PERL_VERSION])
4199+fi
4200+if test "x$2" != "xno-xml"; then
4201+ AC_MSG_CHECKING([for XML::Parser])
4202+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
4203+ AC_MSG_RESULT([ok])
4204+ else
4205+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
4206+ fi
4207+fi
4208+
4209+# Substitute ALL_LINGUAS so we can use it in po/Makefile
4210+AC_SUBST(ALL_LINGUAS)
4211+
4212+# Set DATADIRNAME correctly if it is not set yet
4213+# (copied from glib-gettext.m4)
4214+if test -z "$DATADIRNAME"; then
4215+ AC_LINK_IFELSE(
4216+ [AC_LANG_PROGRAM([[]],
4217+ [[extern int _nl_msg_cat_cntr;
4218+ return _nl_msg_cat_cntr]])],
4219+ [DATADIRNAME=share],
4220+ [case $host in
4221+ *-*-solaris*)
4222+ dnl On Solaris, if bind_textdomain_codeset is in libc,
4223+ dnl GNU format message catalog is always supported,
4224+ dnl since both are added to the libc all together.
4225+ dnl Hence, we'd like to go with DATADIRNAME=share
4226+ dnl in this case.
4227+ AC_CHECK_FUNC(bind_textdomain_codeset,
4228+ [DATADIRNAME=share], [DATADIRNAME=lib])
4229+ ;;
4230+ *)
4231+ [DATADIRNAME=lib]
4232+ ;;
4233+ esac])
4234+fi
4235+AC_SUBST(DATADIRNAME)
4236+
4237+IT_PO_SUBDIR([po])
4238+
4239+])
4240+
4241+
4242+# IT_PO_SUBDIR(DIRNAME)
4243+# ---------------------
4244+# All po subdirs have to be declared with this macro; the subdir "po" is
4245+# declared by IT_PROG_INTLTOOL.
4246+#
4247+AC_DEFUN([IT_PO_SUBDIR],
4248+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
4249+dnl
4250+dnl The following CONFIG_COMMANDS should be executed at the very end
4251+dnl of config.status.
4252+AC_CONFIG_COMMANDS_PRE([
4253+ AC_CONFIG_COMMANDS([$1/stamp-it], [
4254+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
4255+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
4256+ fi
4257+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
4258+ >"$1/stamp-it.tmp"
4259+ [sed '/^#/d
4260+ s/^[[].*] *//
4261+ /^[ ]*$/d
4262+ '"s|^| $ac_top_srcdir/|" \
4263+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
4264+ ]
4265+ [sed '/^POTFILES =/,/[^\\]$/ {
4266+ /^POTFILES =/!d
4267+ r $1/POTFILES
4268+ }
4269+ ' "$1/Makefile.in" >"$1/Makefile"]
4270+ rm -f "$1/Makefile.tmp"
4271+ mv "$1/stamp-it.tmp" "$1/stamp-it"
4272+ ])
4273+])dnl
4274+])
4275+
4276+# _IT_SUBST(VARIABLE)
4277+# -------------------
4278+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
4279+#
4280+AC_DEFUN([_IT_SUBST],
4281+[
4282+AC_SUBST([$1])
4283+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
4284+]
4285+)
4286+
4287+# deprecated macros
4288+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
4289+# A hint is needed for aclocal from Automake <= 1.9.4:
4290+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
4291+
4292+
4293
4294=== modified file 'config.guess'
4295--- config.guess 2010-03-30 19:58:47 +0000
4296+++ config.guess 2010-09-27 20:34:40 +0000
4297@@ -1,10 +1,10 @@
4298 #! /bin/sh
4299 # Attempt to guess a canonical system name.
4300 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4301-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4302+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
4303 # Free Software Foundation, Inc.
4304
4305-timestamp='2009-04-27'
4306+timestamp='2009-11-20'
4307
4308 # This file is free software; you can redistribute it and/or modify it
4309 # under the terms of the GNU General Public License as published by
4310@@ -27,16 +27,16 @@
4311 # the same distribution terms that you use for the rest of that program.
4312
4313
4314-# Originally written by Per Bothner <per@bothner.com>.
4315-# Please send patches to <config-patches@gnu.org>. Submit a context
4316-# diff and a properly formatted ChangeLog entry.
4317+# Originally written by Per Bothner. Please send patches (context
4318+# diff format) to <config-patches@gnu.org> and include a ChangeLog
4319+# entry.
4320 #
4321 # This script attempts to guess a canonical system name similar to
4322 # config.sub. If it succeeds, it prints the system name on stdout, and
4323 # exits with 0. Otherwise, it exits with 1.
4324 #
4325-# The plan is that this can be called by configure scripts if you
4326-# don't specify an explicit build system type.
4327+# You can get the latest version of this script from:
4328+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
4329
4330 me=`echo "$0" | sed -e 's,.*/,,'`
4331
4332@@ -170,7 +170,7 @@
4333 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
4334 eval $set_cc_for_build
4335 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
4336- | grep __ELF__ >/dev/null
4337+ | grep -q __ELF__
4338 then
4339 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
4340 # Return netbsd for either. FIX?
4341@@ -333,6 +333,9 @@
4342 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
4343 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
4344 exit ;;
4345+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
4346+ echo i386-pc-auroraux${UNAME_RELEASE}
4347+ exit ;;
4348 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
4349 eval $set_cc_for_build
4350 SUN_ARCH="i386"
4351@@ -656,7 +659,7 @@
4352 # => hppa64-hp-hpux11.23
4353
4354 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
4355- grep __LP64__ >/dev/null
4356+ grep -q __LP64__
4357 then
4358 HP_ARCH="hppa2.0w"
4359 else
4360@@ -807,12 +810,12 @@
4361 i*:PW*:*)
4362 echo ${UNAME_MACHINE}-pc-pw32
4363 exit ;;
4364- *:Interix*:[3456]*)
4365+ *:Interix*:*)
4366 case ${UNAME_MACHINE} in
4367 x86)
4368 echo i586-pc-interix${UNAME_RELEASE}
4369 exit ;;
4370- EM64T | authenticamd | genuineintel)
4371+ authenticamd | genuineintel | EM64T)
4372 echo x86_64-unknown-interix${UNAME_RELEASE}
4373 exit ;;
4374 IA64)
4375@@ -822,6 +825,9 @@
4376 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
4377 echo i${UNAME_MACHINE}-pc-mks
4378 exit ;;
4379+ 8664:Windows_NT:*)
4380+ echo x86_64-pc-mks
4381+ exit ;;
4382 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
4383 # How do we know it's Interix rather than the generic POSIX subsystem?
4384 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
4385@@ -851,6 +857,20 @@
4386 i*86:Minix:*:*)
4387 echo ${UNAME_MACHINE}-pc-minix
4388 exit ;;
4389+ alpha:Linux:*:*)
4390+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
4391+ EV5) UNAME_MACHINE=alphaev5 ;;
4392+ EV56) UNAME_MACHINE=alphaev56 ;;
4393+ PCA56) UNAME_MACHINE=alphapca56 ;;
4394+ PCA57) UNAME_MACHINE=alphapca56 ;;
4395+ EV6) UNAME_MACHINE=alphaev6 ;;
4396+ EV67) UNAME_MACHINE=alphaev67 ;;
4397+ EV68*) UNAME_MACHINE=alphaev68 ;;
4398+ esac
4399+ objdump --private-headers /bin/sh | grep -q ld.so.1
4400+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
4401+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
4402+ exit ;;
4403 arm*:Linux:*:*)
4404 eval $set_cc_for_build
4405 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
4406@@ -873,6 +893,17 @@
4407 frv:Linux:*:*)
4408 echo frv-unknown-linux-gnu
4409 exit ;;
4410+ i*86:Linux:*:*)
4411+ LIBC=gnu
4412+ eval $set_cc_for_build
4413+ sed 's/^ //' << EOF >$dummy.c
4414+ #ifdef __dietlibc__
4415+ LIBC=dietlibc
4416+ #endif
4417+EOF
4418+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
4419+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
4420+ exit ;;
4421 ia64:Linux:*:*)
4422 echo ${UNAME_MACHINE}-unknown-linux-gnu
4423 exit ;;
4424@@ -882,78 +913,34 @@
4425 m68*:Linux:*:*)
4426 echo ${UNAME_MACHINE}-unknown-linux-gnu
4427 exit ;;
4428- mips:Linux:*:*)
4429- eval $set_cc_for_build
4430- sed 's/^ //' << EOF >$dummy.c
4431- #undef CPU
4432- #undef mips
4433- #undef mipsel
4434- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
4435- CPU=mipsel
4436- #else
4437- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
4438- CPU=mips
4439- #else
4440- CPU=
4441- #endif
4442- #endif
4443-EOF
4444- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
4445- /^CPU/{
4446- s: ::g
4447- p
4448- }'`"
4449- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
4450- ;;
4451- mips64:Linux:*:*)
4452- eval $set_cc_for_build
4453- sed 's/^ //' << EOF >$dummy.c
4454- #undef CPU
4455- #undef mips64
4456- #undef mips64el
4457- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
4458- CPU=mips64el
4459- #else
4460- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
4461- CPU=mips64
4462- #else
4463- CPU=
4464- #endif
4465- #endif
4466-EOF
4467- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
4468- /^CPU/{
4469- s: ::g
4470- p
4471- }'`"
4472+ mips:Linux:*:* | mips64:Linux:*:*)
4473+ eval $set_cc_for_build
4474+ sed 's/^ //' << EOF >$dummy.c
4475+ #undef CPU
4476+ #undef ${UNAME_MACHINE}
4477+ #undef ${UNAME_MACHINE}el
4478+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
4479+ CPU=${UNAME_MACHINE}el
4480+ #else
4481+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
4482+ CPU=${UNAME_MACHINE}
4483+ #else
4484+ CPU=
4485+ #endif
4486+ #endif
4487+EOF
4488+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
4489 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
4490 ;;
4491 or32:Linux:*:*)
4492 echo or32-unknown-linux-gnu
4493 exit ;;
4494- ppc:Linux:*:*)
4495- echo powerpc-unknown-linux-gnu
4496- exit ;;
4497- ppc64:Linux:*:*)
4498- echo powerpc64-unknown-linux-gnu
4499- exit ;;
4500- alpha:Linux:*:*)
4501- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
4502- EV5) UNAME_MACHINE=alphaev5 ;;
4503- EV56) UNAME_MACHINE=alphaev56 ;;
4504- PCA56) UNAME_MACHINE=alphapca56 ;;
4505- PCA57) UNAME_MACHINE=alphapca56 ;;
4506- EV6) UNAME_MACHINE=alphaev6 ;;
4507- EV67) UNAME_MACHINE=alphaev67 ;;
4508- EV68*) UNAME_MACHINE=alphaev68 ;;
4509- esac
4510- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
4511- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
4512- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
4513- exit ;;
4514 padre:Linux:*:*)
4515 echo sparc-unknown-linux-gnu
4516 exit ;;
4517+ parisc64:Linux:*:* | hppa64:Linux:*:*)
4518+ echo hppa64-unknown-linux-gnu
4519+ exit ;;
4520 parisc:Linux:*:* | hppa:Linux:*:*)
4521 # Look for CPU level
4522 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
4523@@ -962,8 +949,11 @@
4524 *) echo hppa-unknown-linux-gnu ;;
4525 esac
4526 exit ;;
4527- parisc64:Linux:*:* | hppa64:Linux:*:*)
4528- echo hppa64-unknown-linux-gnu
4529+ ppc64:Linux:*:*)
4530+ echo powerpc64-unknown-linux-gnu
4531+ exit ;;
4532+ ppc:Linux:*:*)
4533+ echo powerpc-unknown-linux-gnu
4534 exit ;;
4535 s390:Linux:*:* | s390x:Linux:*:*)
4536 echo ${UNAME_MACHINE}-ibm-linux
4537@@ -986,66 +976,6 @@
4538 xtensa*:Linux:*:*)
4539 echo ${UNAME_MACHINE}-unknown-linux-gnu
4540 exit ;;
4541- i*86:Linux:*:*)
4542- # The BFD linker knows what the default object file format is, so
4543- # first see if it will tell us. cd to the root directory to prevent
4544- # problems with other programs or directories called `ld' in the path.
4545- # Set LC_ALL=C to ensure ld outputs messages in English.
4546- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
4547- | sed -ne '/supported targets:/!d
4548- s/[ ][ ]*/ /g
4549- s/.*supported targets: *//
4550- s/ .*//
4551- p'`
4552- case "$ld_supported_targets" in
4553- elf32-i386)
4554- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
4555- ;;
4556- a.out-i386-linux)
4557- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
4558- exit ;;
4559- "")
4560- # Either a pre-BFD a.out linker (linux-gnuoldld) or
4561- # one that does not give us useful --help.
4562- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
4563- exit ;;
4564- esac
4565- # Determine whether the default compiler is a.out or elf
4566- eval $set_cc_for_build
4567- sed 's/^ //' << EOF >$dummy.c
4568- #include <features.h>
4569- #ifdef __ELF__
4570- # ifdef __GLIBC__
4571- # if __GLIBC__ >= 2
4572- LIBC=gnu
4573- # else
4574- LIBC=gnulibc1
4575- # endif
4576- # else
4577- LIBC=gnulibc1
4578- # endif
4579- #else
4580- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
4581- LIBC=gnu
4582- #else
4583- LIBC=gnuaout
4584- #endif
4585- #endif
4586- #ifdef __dietlibc__
4587- LIBC=dietlibc
4588- #endif
4589-EOF
4590- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
4591- /^LIBC/{
4592- s: ::g
4593- p
4594- }'`"
4595- test x"${LIBC}" != x && {
4596- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
4597- exit
4598- }
4599- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
4600- ;;
4601 i*86:DYNIX/ptx:4*:*)
4602 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
4603 # earlier versions are messed up and put the nodename in both
4604@@ -1074,7 +1004,7 @@
4605 i*86:syllable:*:*)
4606 echo ${UNAME_MACHINE}-pc-syllable
4607 exit ;;
4608- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
4609+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
4610 echo i386-unknown-lynxos${UNAME_RELEASE}
4611 exit ;;
4612 i*86:*DOS:*:*)
4613@@ -1182,7 +1112,7 @@
4614 rs6000:LynxOS:2.*:*)
4615 echo rs6000-unknown-lynxos${UNAME_RELEASE}
4616 exit ;;
4617- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
4618+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
4619 echo powerpc-unknown-lynxos${UNAME_RELEASE}
4620 exit ;;
4621 SM[BE]S:UNIX_SV:*:*)
4622@@ -1275,6 +1205,16 @@
4623 *:Darwin:*:*)
4624 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
4625 case $UNAME_PROCESSOR in
4626+ i386)
4627+ eval $set_cc_for_build
4628+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
4629+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
4630+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
4631+ grep IS_64BIT_ARCH >/dev/null
4632+ then
4633+ UNAME_PROCESSOR="x86_64"
4634+ fi
4635+ fi ;;
4636 unknown) UNAME_PROCESSOR=powerpc ;;
4637 esac
4638 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
4639
4640=== modified file 'config.h.in'
4641--- config.h.in 2010-03-30 19:58:47 +0000
4642+++ config.h.in 2010-09-27 20:34:40 +0000
4643@@ -73,6 +73,9 @@
4644 /* Define to the one symbol short name of this package. */
4645 #undef PACKAGE_TARNAME
4646
4647+/* Define to the home page for this package. */
4648+#undef PACKAGE_URL
4649+
4650 /* Define to the version of this package. */
4651 #undef PACKAGE_VERSION
4652
4653
4654=== modified file 'config.sub'
4655--- config.sub 2010-03-30 19:58:47 +0000
4656+++ config.sub 2010-09-27 20:34:40 +0000
4657@@ -1,10 +1,10 @@
4658 #! /bin/sh
4659 # Configuration validation subroutine script.
4660 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4661-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4662+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
4663 # Free Software Foundation, Inc.
4664
4665-timestamp='2009-04-17'
4666+timestamp='2009-11-20'
4667
4668 # This file is (in principle) common to ALL GNU software.
4669 # The presence of a machine in this file suggests that SOME GNU software
4670@@ -32,13 +32,16 @@
4671
4672
4673 # Please send patches to <config-patches@gnu.org>. Submit a context
4674-# diff and a properly formatted ChangeLog entry.
4675+# diff and a properly formatted GNU ChangeLog entry.
4676 #
4677 # Configuration subroutine to validate and canonicalize a configuration type.
4678 # Supply the specified configuration type as an argument.
4679 # If it is invalid, we print an error message on stderr and exit with code 1.
4680 # Otherwise, we print the canonical config type on stdout and succeed.
4681
4682+# You can get the latest version of this script from:
4683+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
4684+
4685 # This file is supposed to be the same for all GNU packages
4686 # and recognize all the CPU types, system types and aliases
4687 # that are meaningful with *any* GNU software.
4688@@ -149,10 +152,13 @@
4689 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
4690 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
4691 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
4692- -apple | -axis | -knuth | -cray)
4693+ -apple | -axis | -knuth | -cray | -microblaze)
4694 os=
4695 basic_machine=$1
4696 ;;
4697+ -bluegene*)
4698+ os=-cnk
4699+ ;;
4700 -sim | -cisco | -oki | -wec | -winbond)
4701 os=
4702 basic_machine=$1
4703@@ -281,6 +287,7 @@
4704 | pdp10 | pdp11 | pj | pjl \
4705 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
4706 | pyramid \
4707+ | rx \
4708 | score \
4709 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
4710 | sh64 | sh64le \
4711@@ -288,13 +295,14 @@
4712 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
4713 | spu | strongarm \
4714 | tahoe | thumb | tic4x | tic80 | tron \
4715+ | ubicom32 \
4716 | v850 | v850e \
4717 | we32k \
4718 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
4719 | z8k | z80)
4720 basic_machine=$basic_machine-unknown
4721 ;;
4722- m6811 | m68hc11 | m6812 | m68hc12)
4723+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
4724 # Motorola 68HC11/12.
4725 basic_machine=$basic_machine-unknown
4726 os=-none
4727@@ -337,7 +345,7 @@
4728 | lm32-* \
4729 | m32c-* | m32r-* | m32rle-* \
4730 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
4731- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
4732+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
4733 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
4734 | mips16-* \
4735 | mips64-* | mips64el-* \
4736@@ -365,7 +373,7 @@
4737 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
4738 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
4739 | pyramid-* \
4740- | romp-* | rs6000-* \
4741+ | romp-* | rs6000-* | rx-* \
4742 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
4743 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
4744 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
4745@@ -374,6 +382,7 @@
4746 | tahoe-* | thumb-* \
4747 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
4748 | tron-* \
4749+ | ubicom32-* \
4750 | v850-* | v850e-* | vax-* \
4751 | we32k-* \
4752 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
4753@@ -467,6 +476,10 @@
4754 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
4755 os=-linux
4756 ;;
4757+ bluegene*)
4758+ basic_machine=powerpc-ibm
4759+ os=-cnk
4760+ ;;
4761 c90)
4762 basic_machine=c90-cray
4763 os=-unicos
4764@@ -719,6 +732,9 @@
4765 basic_machine=ns32k-utek
4766 os=-sysv
4767 ;;
4768+ microblaze)
4769+ basic_machine=microblaze-xilinx
4770+ ;;
4771 mingw32)
4772 basic_machine=i386-pc
4773 os=-mingw32
4774@@ -1240,6 +1256,9 @@
4775 # First match some system type aliases
4776 # that might get confused with valid system types.
4777 # -solaris* is a basic system type, with this one exception.
4778+ -auroraux)
4779+ os=-auroraux
4780+ ;;
4781 -solaris1 | -solaris1.*)
4782 os=`echo $os | sed -e 's|solaris1|sunos4|'`
4783 ;;
4784@@ -1260,9 +1279,9 @@
4785 # Each alternative MUST END IN A *, to match a version number.
4786 # -sysv* is not here because it comes later, after sysvr4.
4787 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
4788- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
4789- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
4790- | -kopensolaris* \
4791+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
4792+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
4793+ | -sym* | -kopensolaris* \
4794 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
4795 | -aos* | -aros* \
4796 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
4797@@ -1283,7 +1302,7 @@
4798 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
4799 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
4800 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
4801- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
4802+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
4803 # Remember, each alternative MUST END IN *, to match a version number.
4804 ;;
4805 -qnx*)
4806@@ -1613,7 +1632,7 @@
4807 -sunos*)
4808 vendor=sun
4809 ;;
4810- -aix*)
4811+ -cnk*|-aix*)
4812 vendor=ibm
4813 ;;
4814 -beos*)
4815
4816=== modified file 'configure'
4817--- configure 2010-04-01 21:42:40 +0000
4818+++ configure 2010-09-27 20:34:40 +0000
4819@@ -1,20 +1,24 @@
4820 #! /bin/sh
4821 # Guess values for system-dependent variables and create Makefiles.
4822-# Generated by GNU Autoconf 2.63 for libgnomecanvas 2.30.1.
4823+# Generated by GNU Autoconf 2.66 for libgnomecanvas 2.30.2.
4824 #
4825 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomecanvas>.
4826 #
4827+#
4828 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
4829-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4830+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
4831+# Foundation, Inc.
4832+#
4833+#
4834 # This configure script is free software; the Free Software Foundation
4835 # gives unlimited permission to copy, distribute and modify it.
4836-## --------------------- ##
4837-## M4sh Initialization. ##
4838-## --------------------- ##
4839+## -------------------- ##
4840+## M4sh Initialization. ##
4841+## -------------------- ##
4842
4843 # Be more Bourne compatible
4844 DUALCASE=1; export DUALCASE # for MKS sh
4845-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4846+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
4847 emulate sh
4848 NULLCMD=:
4849 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
4850@@ -22,23 +26,15 @@
4851 alias -g '${1+"$@"}'='"$@"'
4852 setopt NO_GLOB_SUBST
4853 else
4854- case `(set -o) 2>/dev/null` in
4855- *posix*) set -o posix ;;
4856+ case `(set -o) 2>/dev/null` in #(
4857+ *posix*) :
4858+ set -o posix ;; #(
4859+ *) :
4860+ ;;
4861 esac
4862-
4863 fi
4864
4865
4866-
4867-
4868-# PATH needs CR
4869-# Avoid depending upon Character Ranges.
4870-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
4871-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
4872-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
4873-as_cr_digits='0123456789'
4874-as_cr_alnum=$as_cr_Letters$as_cr_digits
4875-
4876 as_nl='
4877 '
4878 export as_nl
4879@@ -46,7 +42,13 @@
4880 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
4881 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
4882 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
4883-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
4884+# Prefer a ksh shell builtin over an external printf program on Solaris,
4885+# but without wasting forks for bash or zsh.
4886+if test -z "$BASH_VERSION$ZSH_VERSION" \
4887+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
4888+ as_echo='print -r --'
4889+ as_echo_n='print -rn --'
4890+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
4891 as_echo='printf %s\n'
4892 as_echo_n='printf %s'
4893 else
4894@@ -57,7 +59,7 @@
4895 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
4896 as_echo_n_body='eval
4897 arg=$1;
4898- case $arg in
4899+ case $arg in #(
4900 *"$as_nl"*)
4901 expr "X$arg" : "X\\(.*\\)$as_nl";
4902 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
4903@@ -80,13 +82,6 @@
4904 }
4905 fi
4906
4907-# Support unset when possible.
4908-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
4909- as_unset=unset
4910-else
4911- as_unset=false
4912-fi
4913-
4914
4915 # IFS
4916 # We need space, tab and new line, in precisely that order. Quoting is
4917@@ -96,15 +91,15 @@
4918 IFS=" "" $as_nl"
4919
4920 # Find who we are. Look in the path if we contain no directory separator.
4921-case $0 in
4922+case $0 in #((
4923 *[\\/]* ) as_myself=$0 ;;
4924 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4925 for as_dir in $PATH
4926 do
4927 IFS=$as_save_IFS
4928 test -z "$as_dir" && as_dir=.
4929- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
4930-done
4931+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
4932+ done
4933 IFS=$as_save_IFS
4934
4935 ;;
4936@@ -116,12 +111,16 @@
4937 fi
4938 if test ! -f "$as_myself"; then
4939 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
4940- { (exit 1); exit 1; }
4941+ exit 1
4942 fi
4943
4944-# Work around bugs in pre-3.0 UWIN ksh.
4945-for as_var in ENV MAIL MAILPATH
4946-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
4947+# Unset variables that we do not need and which cause bugs (e.g. in
4948+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
4949+# suppresses any "Segmentation fault" message there. '((' could
4950+# trigger a bug in pdksh 5.2.14.
4951+for as_var in BASH_ENV ENV MAIL MAILPATH
4952+do eval test x\${$as_var+set} = xset \
4953+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
4954 done
4955 PS1='$ '
4956 PS2='> '
4957@@ -133,330 +132,309 @@
4958 LANGUAGE=C
4959 export LANGUAGE
4960
4961-# Required to use basename.
4962-if expr a : '\(a\)' >/dev/null 2>&1 &&
4963- test "X`expr 00001 : '.*\(...\)'`" = X001; then
4964- as_expr=expr
4965-else
4966- as_expr=false
4967-fi
4968-
4969-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
4970- as_basename=basename
4971-else
4972- as_basename=false
4973-fi
4974-
4975-
4976-# Name of the executable.
4977-as_me=`$as_basename -- "$0" ||
4978-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
4979- X"$0" : 'X\(//\)$' \| \
4980- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
4981-$as_echo X/"$0" |
4982- sed '/^.*\/\([^/][^/]*\)\/*$/{
4983- s//\1/
4984- q
4985- }
4986- /^X\/\(\/\/\)$/{
4987- s//\1/
4988- q
4989- }
4990- /^X\/\(\/\).*/{
4991- s//\1/
4992- q
4993- }
4994- s/.*/./; q'`
4995-
4996 # CDPATH.
4997-$as_unset CDPATH
4998-
4999+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
5000
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: