r1541 - in /unstable/evolution-mapi/debian: changelog control patches/01_link_privlib.patch patches/90_relibtoolize.patch
tao at users.alioth.debian.org
tao at users.alioth.debian.org
Tue Mar 2 22:50:09 UTC 2010
Author: tao
Date: Tue Mar 2 22:50:09 2010
New Revision: 1541
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1541
Log:
Add myself to uploaders, update to latest upstream version and fix a few very minor issues.
Modified:
unstable/evolution-mapi/debian/changelog
unstable/evolution-mapi/debian/control
unstable/evolution-mapi/debian/patches/01_link_privlib.patch
unstable/evolution-mapi/debian/patches/90_relibtoolize.patch
Modified: unstable/evolution-mapi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/changelog?rev=1541&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/changelog (original)
+++ unstable/evolution-mapi/debian/changelog Tue Mar 2 22:50:09 2010
@@ -1,3 +1,14 @@
+evolution-mapi (0.28.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #572099).
+ * Bump standards version to 3.8.4 (No changes needed).
+ * debian/control:
+ - Improved package description for libexchangemapi-1.0-dev
+ * 01_link_privlib.patch: Added patch description.
+ * 90_relibtoolize.patch: Regenerated.
+
+ -- David Weinehall <tao at debian.org> Wed, 03 Mar 2010 00:39:34 +0200
+
evolution-mapi (0.28.1-2) unstable; urgency=low
* Add quilt support.
Modified: unstable/evolution-mapi/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/control?rev=1541&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/control (original)
+++ unstable/evolution-mapi/debian/control Tue Mar 2 22:50:09 2010
@@ -8,8 +8,9 @@
Oystein Gisnas <oystein at gisnas.net>,
Josselin Mouette <joss at debian.org>,
Jelmer Vernooij <jelmer at debian.org>,
- Yves-Alexis Perez <corsac at debian.org>
-Standards-Version: 3.8.3
+ Yves-Alexis Perez <corsac at debian.org>,
+ David Weinehall <tao at debian.org>
+Standards-Version: 3.8.4
Homepage: http://www.go-evolution.org/MAPIProvider
Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution-mapi
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-evolution/unstable/evolution-mapi
@@ -52,7 +53,7 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Description: client library for accessing Exchange servers - runtime
- This library helps accessing to Microsoft Exchange servers using the
+ libexchangemapi helps accessing Microsoft Exchange servers using the
proprietary MAPI protocol. It is based on Openchange, and used by the
Evolution MAPI provider.
@@ -66,9 +67,12 @@
evolution-dev (>= 2.27.2),
libmapi-dev (>= 1:0.8)
Description: client library for accessing Exchange servers - development
- This library helps accessing to Microsoft Exchange servers using the
+ libexchangemapi helps accessing Microsoft Exchange servers using the
proprietary MAPI protocol. It is based on Openchange, and used by the
Evolution MAPI provider.
+ .
+ This package contains headers and static library files
+ for using libexchangemapi.
Package: evolution-mapi-dbg
Section: debug
Modified: unstable/evolution-mapi/debian/patches/01_link_privlib.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/01_link_privlib.patch?rev=1541&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/patches/01_link_privlib.patch (original)
+++ unstable/evolution-mapi/debian/patches/01_link_privlib.patch Tue Mar 2 22:50:09 2010
@@ -1,3 +1,6 @@
+Link the plugin to libevolution-mail-shared.so, since it uses one of its
+symbols.
+
Index: evolution-mapi-0.28.1/src/account-setup-eplugin/Makefile.am
===================================================================
--- evolution-mapi-0.28.1.orig/src/account-setup-eplugin/Makefile.am 2009-12-11 12:02:12.870464189 +0100
Modified: unstable/evolution-mapi/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/90_relibtoolize.patch?rev=1541&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/patches/90_relibtoolize.patch (original)
+++ unstable/evolution-mapi/debian/patches/90_relibtoolize.patch Tue Mar 2 22:50:09 2010
@@ -5,234 +5,14 @@
autoconf
rm -rf autom4te.cache config.h.in~
-Index: evolution-mapi-0.28.1/INSTALL
-===================================================================
---- evolution-mapi-0.28.1.orig/INSTALL 2009-12-11 12:05:17.314460654 +0100
-+++ evolution-mapi-0.28.1/INSTALL 2009-12-11 12:04:39.750454708 +0100
-@@ -2,15 +2,15 @@ Installation Instructions
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006, 2007 Free Software Foundation, Inc.
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
--This file is free documentation; the Free Software Foundation gives
-+ This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-
- Basic Installation
- ==================
-
--Briefly, the shell commands `./configure; make; make install' should
-+ Briefly, the shell commands `./configure; make; make install' should
- configure, build, and install this package. The following
- more-detailed instructions are generic; see the `README' file for
- instructions specific to this package.
-@@ -73,9 +73,9 @@ The simplest way to compile this package
- Compilers and Options
- =====================
-
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about. Run `./configure --help' for
--details on some of the pertinent environment variables.
-+ Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
- by setting variables in the command line or in the environment. Here
-@@ -88,7 +88,7 @@ is an example:
- Compiling For Multiple Architectures
- ====================================
-
--You can compile the package for more than one kind of computer at the
-+ You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
- own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@ architecture at a time in the source cod
- installed the package for one architecture, use `make distclean' before
- reconfiguring for another architecture.
-
-+ On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
-+this:
-+
-+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CPP="gcc -E" CXXCPP="g++ -E"
-+
-+ This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-+
- Installation Names
- ==================
-
--By default, `make install' installs the package's commands under
-+ By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc. You
- can specify an installation prefix other than `/usr/local' by giving
- `configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
- Optional Features
- =================
-
--Some packages pay attention to `--enable-FEATURE' options to
-+ Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
- is something like `gnu-as' or `x' (for the X Window System). The
-@@ -138,14 +152,46 @@ find the X include and library files aut
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+Particular systems
-+==================
-+
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-+a workaround. If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+ ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+ ./configure CC="cc -nodtk"
-+
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-+
-+ ./configure --prefix=/boot/common
-+
- Specifying the System Type
- ==========================
-
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
- `--build=TYPE' option. TYPE can either be a short name for the system
- type, such as `sun4', or a canonical name which has the form:
-
-@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical nam
-
- where SYSTEM can have one of these forms:
-
-- OS KERNEL-OS
-+ OS
-+ KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
- `config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
- Sharing Defaults
- ================
-
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
- `configure' looks for `PREFIX/share/config.site' if it exists, then
- `PREFIX/etc/config.site' if it exists. Or, you can set the
- `CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +229,7 @@ A warning: not all `configure' scripts l
- Defining Variables
- ==================
-
--Variables not defined in a site shell script can be set in the
-+ Variables not defined in a site shell script can be set in the
- environment passed to `configure'. However, some packages may run
- configure again during the build, and the customized values of these
- variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed
- `configure' Invocation
- ======================
-
--`configure' recognizes the following options to control how it operates.
-+ `configure' recognizes the following options to control how it
-+operates.
-
- `--help'
- `-h'
-- Print a summary of the options to `configure', and exit.
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-
- `--version'
- `-V'
-@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *Note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-+
- `configure' also accepts some other, not widely useful, options. Run
- `configure --help' for more details.
-
-Index: evolution-mapi-0.28.1/Makefile.in
-===================================================================
---- evolution-mapi-0.28.1.orig/Makefile.in 2009-12-11 12:05:17.226455754 +0100
-+++ evolution-mapi-0.28.1/Makefile.in 2009-12-11 12:04:39.818457201 +0100
-@@ -151,8 +151,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -206,6 +204,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-Index: evolution-mapi-0.28.1/aclocal.m4
-===================================================================
---- evolution-mapi-0.28.1.orig/aclocal.m4 2009-12-11 12:05:17.586463818 +0100
-+++ evolution-mapi-0.28.1/aclocal.m4 2009-12-11 12:04:13.062458125 +0100
+--- evolution-mapi-0.28.3/aclocal.m4 2010-03-01 15:28:43.000000000 +0200
++++ evolution-mapi-0.28.3-relib/aclocal.m4 2010-03-02 22:18:28.000000000 +0200
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,1124 +13,127 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -1459,55 +1239,16 @@
#
# First check in libc
-@@ -1459,12 +462,6 @@ AC_DEFUN([GTK_DOC_CHECK],
- [
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
--
-- dnl check for tools we added during development
-- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
--
- dnl for overriding the documentation installation directory
- AC_ARG_WITH([html-dir],
- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-@@ -1483,32 +480,16 @@ AC_DEFUN([GTK_DOC_CHECK],
- [PKG_CHECK_EXISTS([gtk-doc],,
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
- fi
-
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
- AC_MSG_RESULT($enable_gtk_doc)
-
-- dnl enable/disable output formats
-- AC_ARG_ENABLE([gtk-doc-html],
-- AS_HELP_STRING([--enable-gtk-doc-html],
-- [build documentation in html format [[default=yes]]]),,
-- [enable_gtk_doc_html=yes])
-- AC_ARG_ENABLE([gtk-doc-pdf],
-- AS_HELP_STRING([--enable-gtk-doc-pdf],
-- [build documentation in pdf format [[default=no]]]),,
-- [enable_gtk_doc_pdf=no])
--
-- if test -z "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
--
-+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
-
- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
- ])
-
-
-@@ -4186,6 +3167,18 @@ linux* | k*bsd*-gnu)
+@@ -4146,7 +3149,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -4186,6 +3189,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1526,7 +1267,12 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -4777,7 +3770,7 @@ linux* | k*bsd*-gnu)
+@@ -4773,11 +3788,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1535,7 +1281,16 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -5458,7 +4451,7 @@ m4_if([$1], [CXX], [
+@@ -5394,7 +4409,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -5458,7 +4473,7 @@
;;
esac
;;
@@ -1544,7 +1299,16 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -5883,6 +4876,9 @@ m4_if([$1], [CXX], [
+@@ -5678,7 +4693,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -5883,6 +4898,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1554,7 +1318,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5947,6 +4943,9 @@ dnl Note also adjust exclude_expsyms for
+@@ -5947,6 +4965,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -1564,7 +1328,24 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -6129,7 +5128,7 @@ _LT_EOF
+@@ -5968,6 +4989,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -6059,7 +5081,7 @@
+ _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'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -6129,7 +5151,7 @@
fi
;;
@@ -1573,7 +1354,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6304,6 +5303,7 @@ _LT_EOF
+@@ -6304,6 +5326,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -1581,7 +1362,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -6542,7 +5542,7 @@ _LT_EOF
+@@ -6542,7 +5565,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1590,20 +1371,15 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6976,383 +5976,1006 @@ if test -n "$compiler"; then
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
-- # On AIX, shared libraries and static libraries use the same namespace, and
-- # are all built from PIC.
-- case $host_os in
-- aix3*)
-- test "$enable_shared" = yes && enable_static=no
-- if test -n "$RANLIB"; then
-- archive_cmds="$archive_cmds~\$RANLIB \$lib"
-- postinstall_cmds='$RANLIB $lib'
-- fi
-- ;;
+@@ -6973,386 +5996,1009 @@
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+- AC_MSG_CHECKING([whether to build shared libraries])
+- test "$can_build_shared" = "no" && enable_shared=no
++ AC_MSG_CHECKING([whether to build shared libraries])
++ test "$can_build_shared" = "no" && enable_shared=no
++
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
@@ -1901,13 +1677,16 @@
+ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-- aix[[4-9]]*)
-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-- test "$enable_shared" = yes && enable_static=no
+- # On AIX, shared libraries and static libraries use the same namespace, and
+- # are all built from PIC.
+- case $host_os in
+- aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-- esac
-- AC_MSG_RESULT([$enable_shared])
+ _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"
+ else
+ if test "$host_cpu" = ia64; then
@@ -1933,10 +1712,13 @@
+ fi
+ ;;
-- AC_MSG_CHECKING([whether to build static libraries])
-- # Make sure either enable_shared or enable_static is yes.
-- test "$enable_shared" = yes || enable_static=yes
-- AC_MSG_RESULT([$enable_static])
+- aix[[4-9]]*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+- fi
+- ;;
+- esac
+- AC_MSG_RESULT([$enable_shared])
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1948,11 +1730,10 @@
+ fi
+ ;;
-- _LT_CONFIG($1)
--fi
--AC_LANG_POP
--CC="$lt_save_CC"
--])# _LT_LANG_C_CONFIG
+- AC_MSG_CHECKING([whether to build static libraries])
+- # Make sure either enable_shared or enable_static is yes.
+- test "$enable_shared" = yes || enable_static=yes
+- AC_MSG_RESULT([$enable_static])
+ chorus*)
+ case $cc_basename in
+ *)
@@ -1962,6 +1743,11 @@
+ esac
+ ;;
+- _LT_CONFIG($1)
+-fi
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# _LT_LANG_C_CONFIG
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
@@ -1970,23 +1756,6 @@
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--# _LT_PROG_CXX
--# ------------
--# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
--# compiler, we have our own version here.
--m4_defun([_LT_PROG_CXX],
--[
--pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
--AC_PROG_CXX
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-- (test "X$CXX" != "Xg++"))) ; then
-- AC_PROG_CXXCPP
--else
-- _lt_caught_CXX_error=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_CXX
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
@@ -2006,8 +1775,23 @@
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_CXX], [])
+-# _LT_PROG_CXX
+-# ------------
+-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+-# compiler, we have our own version here.
+-m4_defun([_LT_PROG_CXX],
+-[
+-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+-AC_PROG_CXX
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- AC_PROG_CXXCPP
+-else
+- _lt_caught_CXX_error=yes
+-fi
+-popdef([AC_MSG_ERROR])
+-])# _LT_PROG_CXX
+ dgux*)
+ case $cc_basename in
+ ec++*)
@@ -2026,10 +1810,16 @@
+ esac
+ ;;
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_CXX], [])
+ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
+ _LT_TAGVAR(ld_shlibs, $1)=no
++ ;;
+
++ freebsd-elf*)
++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
-# _LT_LANG_CXX_CONFIG([TAG])
@@ -2041,8 +1831,10 @@
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-+ freebsd-elf*)
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++ freebsd* | dragonfly*)
++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++ # conventions
++ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
-AC_LANG_PUSH(C++)
@@ -2068,20 +1860,11 @@
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+ freebsd* | dragonfly*)
-+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+ # conventions
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
++ gnu*)
+ ;;
-# Source file extension for C++ test sources.
-ac_ext=cpp
-+ gnu*)
-+ ;;
-
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
+ hpux9*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -2091,13 +1874,9 @@
+ # but as the default
+ # location of the library.
--# No sense in running all these tests if we already determined that
--# the CXX compiler isn't working. Some variables (like enable_shared)
--# are currently assumed to apply to all compilers on this platform,
--# and will be corrupted by setting them based on a non-working compiler.
--if test "$_lt_caught_CXX_error" != yes; then
-- # Code to be used in simple compile tests
-- lt_simple_compile_test_code="int some_variable = 0;"
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
@@ -2126,15 +1905,20 @@
+ esac
+ ;;
-- # Code to be used in simple link tests
-- lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+-# No sense in running all these tests if we already determined that
+-# the CXX compiler isn't working. Some variables (like enable_shared)
+-# are currently assumed to apply to all compilers on this platform,
+-# and will be corrupted by setting them based on a non-working compiler.
+-if test "$_lt_caught_CXX_error" != yes; then
+- # Code to be used in simple compile tests
+- lt_simple_compile_test_code="int some_variable = 0;"
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-- _LT_TAG_COMPILER
+- # Code to be used in simple link tests
+- lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
@@ -2157,9 +1941,8 @@
+ ;;
+ esac
-- # save warnings/boilerplate of simple test code
-- _LT_COMPILER_BOILERPLATE
-- _LT_LINKER_BOILERPLATE
+- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+- _LT_TAG_COMPILER
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
@@ -2210,6 +1993,29 @@
+ esac
+ ;;
+- # save warnings/boilerplate of simple test code
+- _LT_COMPILER_BOILERPLATE
+- _LT_LINKER_BOILERPLATE
++ interix[[3-9]]*)
++ _LT_TAGVAR(hardcode_direct, $1)=no
++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _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'
++ ;;
++ irix5* | irix6*)
++ case $cc_basename in
++ CC*)
++ # SGI C++
++ _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'
+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
@@ -2232,34 +2038,6 @@
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-+ interix[[3-9]]*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+ # Instead, shared libraries are loaded at an image base (0x10000000 by
-+ # default) and relocated if they conflict, which is a slow very memory
-+ # consuming and fragmenting process. To avoid this, we pick a random,
-+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ _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'
-+ ;;
-+ irix5* | irix6*)
-+ case $cc_basename in
-+ CC*)
-+ # SGI C++
-+ _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'
-
-- if test -n "$compiler"; then
-- # We don't want -fno-exception when compiling C++ code, so set the
-- # no_builtin_flag separately
-- if test "$GXX" = yes; then
-- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-- else
-- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-- fi
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -2282,14 +2060,21 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+- if test -n "$compiler"; then
+- # We don't want -fno-exception when compiling C++ code, so set the
+- # no_builtin_flag separately
- if test "$GXX" = yes; then
-- # Set up default GNU C++ configuration
-+ linux* | k*bsd*-gnu)
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+- else
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+- fi
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-- LT_PATH_LD
+- if test "$GXX" = yes; then
+- # Set up default GNU C++ configuration
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
@@ -2305,16 +2090,15 @@
+ # dependencies.
+ 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'
+- LT_PATH_LD
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
@@ -2372,10 +2156,8 @@
+ ;;
+ esac
-- # If archive_cmds runs LD, not CC, wlarc should be empty
-- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-- # investigate it a little bit more. (MM)
-- wlarc='${wl}'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _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'
@@ -2384,6 +2166,14 @@
+ # Compaq C++
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+- # If archive_cmds runs LD, not CC, wlarc should be empty
+- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+- # investigate it a little bit more. (MM)
+- wlarc='${wl}'
++ runpath_var=LD_RUN_PATH
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" |
@@ -2395,17 +2185,6 @@
- else
- with_gnu_ld=no
- wlarc=
-+ runpath_var=LD_RUN_PATH
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-- # A generic and very simple default shared library creation
-- # command for GNU C++ for the case where it uses the native
-- # linker, instead of GNU ld. If possible, this setting should
-- # overridden to take advantage of the native linker features on
-- # the platform it is being used on.
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- fi
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -2439,20 +2218,22 @@
+ _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'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+- # A generic and very simple default shared library creation
+- # command for GNU C++ for the case where it uses the native
+- # linker, instead of GNU ld. If possible, this setting should
+- # overridden to take advantage of the native linker features on
+- # the platform it is being used on.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- fi
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
+
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-
-- else
-- GXX=no
-- with_gnu_ld=no
-- wlarc=
-- fi
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -2464,16 +2245,21 @@
+ esac
+ ;;
+- else
+- GXX=no
+- with_gnu_ld=no
+- wlarc=
+- fi
++ lynxos*)
++ # FIXME: insert proper C++ library support
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ ;;
+
- # PORTME: fill in a description of your system's C++ link characteristics
- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- _LT_TAGVAR(ld_shlibs, $1)=yes
- case $host_os in
- aix3*)
-+ lynxos*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
+ m88k*)
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -2508,28 +2294,46 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
;;
- esac
--
++ *)
++ # FIXME: insert proper C++ library support
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ ;;
+
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
--
++ netbsd*)
++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++ wlarc=
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_TAGVAR(hardcode_direct, $1)=yes
++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++ fi
++ # Workaround some broken pre-1.5 toolchains
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++ ;;
+
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--
++ *nto* | *qnx*)
++ _LT_TAGVAR(ld_shlibs, $1)=yes
++ ;;
+
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
- if test "$GXX" = yes; then
@@ -2556,7 +2360,18 @@
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
-- fi
++ openbsd*)
++ if test -f /usr/libexec/ld.so; then
++ _LT_TAGVAR(hardcode_direct, $1)=yes
++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
@@ -2571,18 +2386,7 @@
- fi
- fi
- fi
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+ wlarc=
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ fi
-+ # Workaround some broken pre-1.5 toolchains
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+ ;;
-
+-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to
@@ -2596,10 +2400,7 @@
- # executable.
- _LT_SYS_MODULE_PATH_AIX
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ *nto* | *qnx*)
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ ;;
-
+-
- _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"
- else
- if test "$host_cpu" = ia64; then
@@ -2624,29 +2425,13 @@
- fi
- fi
- ;;
-+ openbsd2*)
-+ # C++ shared libraries are fairly broken
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-
+-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ openbsd*)
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
+ output_verbose_link_cmd=echo
else
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -2777,20 +2562,19 @@
- ec++*)
+ CC*)
+ # Sun C++ 4.x
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx*)
+ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-- ghcx*)
-- # Green Hills C++ Compiler
++ # FIXME: insert proper C++ library support
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ ;;
+ esac
+ ;;
+
@@ -2826,7 +2610,7 @@
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ gcx*)
-+ # Green Hills C++ Compiler
+ # Green Hills C++ Compiler
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
@@ -2924,7 +2708,7 @@
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -7363,644 +6986,538 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -7363,644 +7009,538 @@
esac
;;
@@ -3454,11 +3238,7 @@
+ ;;
+esac
+])
-
-- # Not sure whether something based on
-- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-- # would be better.
-- output_verbose_link_cmd='echo'
++
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
@@ -3479,6 +3259,11 @@
+ a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+- # Not sure whether something based on
+- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+- # would be better.
+- output_verbose_link_cmd='echo'
+
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
@@ -3488,11 +3273,6 @@
- esac
- ;;
- esac
-- ;;
-
-- lynxos*)
-- # FIXME: insert proper C++ library support
-- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
+# _LT_PROG_F77
+# ------------
@@ -3508,12 +3288,17 @@
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+- lynxos*)
+- # FIXME: insert proper C++ library support
+- _LT_TAGVAR(ld_shlibs, $1)=no
+- ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_F77], [])
+
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_F77], [])
- mvs*)
- case $cc_basename in
@@ -3527,6 +3312,14 @@
- ;;
- esac
- ;;
++# _LT_LANG_F77_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for a Fortran 77 compiler are
++# suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_F77_CONFIG],
++[AC_REQUIRE([_LT_PROG_F77])dnl
++AC_LANG_PUSH(Fortran 77)
- netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
@@ -3538,18 +3331,6 @@
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-- ;;
-+# _LT_LANG_F77_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a Fortran 77 compiler are
-+# suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_F77_CONFIG],
-+[AC_REQUIRE([_LT_PROG_F77])dnl
-+AC_LANG_PUSH(Fortran 77)
-
-- *nto* | *qnx*)
-- _LT_TAGVAR(ld_shlibs, $1)=yes
- ;;
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -3572,12 +3353,19 @@
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+- *nto* | *qnx*)
+- _LT_TAGVAR(ld_shlibs, $1)=yes
+- ;;
++# Source file extension for f77 test sources.
++ac_ext=f
+
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-+# Source file extension for f77 test sources.
-+ac_ext=f
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
- openbsd*)
- if test -f /usr/libexec/ld.so; then
@@ -3596,14 +3384,6 @@
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-
-- osf3* | osf4* | osf5*)
-- case $cc_basename in
-- KCC*)
-- # Kuck and Associates, Inc. (KAI) C++ Compiler
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
@@ -3616,20 +3396,28 @@
+ end
+"
-- # KCC will only create a shared library if the output file
-- # ends with ".so" (or ".sl" for HP-UX), so rename the library
-- # to its proper name (with version) after linking.
-- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+- osf3* | osf4* | osf5*)
+- case $cc_basename in
+- KCC*)
+- # Kuck and Associates, Inc. (KAI) C++ Compiler
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
+ program t
+ end
+"
+- # KCC will only create a shared library if the output file
+- # ends with ".so" (or ".sl" for HP-UX), so rename the library
+- # to its proper name (with version) after linking.
+- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++ _LT_TAG_COMPILER
+
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_COMPILER
++ # save warnings/boilerplate of simple test code
++ _LT_COMPILER_BOILERPLATE
++ _LT_LINKER_BOILERPLATE
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
@@ -3660,11 +3448,6 @@
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- ;;
- esac
-+ # save warnings/boilerplate of simple test code
-+ _LT_COMPILER_BOILERPLATE
-+ _LT_LINKER_BOILERPLATE
-
-- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
@@ -3676,6 +3459,10 @@
+ if test -n "$compiler"; then
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++ AC_MSG_CHECKING([whether to build shared libraries])
++ test "$can_build_shared" = "no" && enable_shared=no
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
@@ -3698,9 +3485,6 @@
- _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'
- ;;
- esac
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
@@ -3723,16 +3507,10 @@
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
-
-- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
+ _LT_TAGVAR(GCC, $1)="$G77"
+ _LT_TAGVAR(LD, $1)="$LD"
-
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
@@ -3744,6 +3522,19 @@
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++ _LT_CONFIG($1)
++ fi # test -n "$compiler"
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ GCC=$lt_save_GCC
++ CC="$lt_save_CC"
++fi # test "$_lt_disable_F77" != yes
+
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
@@ -3751,16 +3542,13 @@
- ;;
- esac
- ;;
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
++AC_LANG_POP
++])# _LT_LANG_F77_CONFIG
- psos*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-+ GCC=$lt_save_GCC
-+ CC="$lt_save_CC"
-+fi # test "$_lt_disable_F77" != yes
- sunos4*)
- case $cc_basename in
@@ -3780,31 +3568,6 @@
- ;;
- esac
- ;;
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
-
-- solaris*)
-- case $cc_basename in
-- CC*)
-- # Sun C++ 4.2, 5.x and Centerline C++
-- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-- case $host_os in
-- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-- *)
-- # The compiler driver will combine and reorder linker options,
-- # but understands `-z linker_flag'.
-- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-- ;;
-- esac
-- _LT_TAGVAR(link_all_deplibs, $1)=yes
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
@@ -3819,9 +3582,40 @@
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
-- output_verbose_link_cmd='echo'
+- solaris*)
+- case $cc_basename in
+- CC*)
+- # Sun C++ 4.2, 5.x and Centerline C++
+- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- case $host_os in
+- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *)
+- # The compiler driver will combine and reorder linker options,
+- # but understands `-z linker_flag'.
+- # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+- ;;
+- esac
+- _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+- output_verbose_link_cmd='echo'
++# _LT_LANG_FC_CONFIG([TAG])
++# -------------------------
++# Ensure that the configuration variables for a Fortran compiler are
++# suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_FC_CONFIG],
++[AC_REQUIRE([_LT_PROG_FC])dnl
++AC_LANG_PUSH(Fortran)
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -3832,37 +3626,6 @@
- gcx*)
- # Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-- # The C++ compiler must be used to create the archive.
-- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-- ;;
-- *)
-- # GNU C++ compiler with Solaris linker
-- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-- if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+# _LT_LANG_FC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for a Fortran compiler are
-+# suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_FC_CONFIG],
-+[AC_REQUIRE([_LT_PROG_FC])dnl
-+AC_LANG_PUSH(Fortran)
-
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-- else
-- # g++ 2.7 appears to require `-G' NOT `-shared' on this
-- # platform.
-- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
@@ -3884,13 +3647,50 @@
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+- # The C++ compiler must be used to create the archive.
+- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+- ;;
+- *)
+- # GNU C++ compiler with Solaris linker
+- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+- if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++# Source file extension for fc test sources.
++ac_ext=${ac_fc_srcext-f}
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+- else
+- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+- # platform.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++# Object file extension for compiled fc test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- fi
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
++# No sense in running all these tests if we already determined that
++# the FC compiler isn't working. Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_disable_FC" != yes; then
++ # Code to be used in simple compile tests
++ lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- case $host_os in
@@ -3903,26 +3703,19 @@
- ;;
- esac
- ;;
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
++ # Code to be used in simple link tests
++ lt_simple_link_test_code="\
++ program t
++ end
++"
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-+# No sense in running all these tests if we already determined that
-+# the FC compiler isn't working. Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
-+ # Code to be used in simple compile tests
-+ lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
++ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++ _LT_TAG_COMPILER
- case $cc_basename in
- CC*)
@@ -3935,11 +3728,9 @@
- ;;
- esac
- ;;
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code="\
-+ program t
-+ end
-+"
++ # save warnings/boilerplate of simple test code
++ _LT_COMPILER_BOILERPLATE
++ _LT_LINKER_BOILERPLATE
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
@@ -3957,8 +3748,12 @@
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_COMPILER
++ # Allow CC to be a program name with arguments.
++ lt_save_CC="$CC"
++ lt_save_GCC=$GCC
++ CC=${FC-"f95"}
++ compiler=$CC
++ GCC=$ac_cv_fc_compiler_gnu
- case $cc_basename in
- CC*)
@@ -3971,9 +3766,8 @@
- ;;
- esac
- ;;
-+ # save warnings/boilerplate of simple test code
-+ _LT_COMPILER_BOILERPLATE
-+ _LT_LINKER_BOILERPLATE
++ _LT_TAGVAR(compiler, $1)=$CC
++ _LT_CC_BASENAME([$compiler])
- tandem*)
- case $cc_basename in
@@ -3988,30 +3782,20 @@
- ;;
- esac
- ;;
-+ # Allow CC to be a program name with arguments.
-+ lt_save_CC="$CC"
-+ lt_save_GCC=$GCC
-+ CC=${FC-"f95"}
-+ compiler=$CC
-+ GCC=$ac_cv_fc_compiler_gnu
-+
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
++ if test -n "$compiler"; then
++ AC_MSG_CHECKING([if libtool supports shared libraries])
++ AC_MSG_RESULT([$can_build_shared])
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-+ if test -n "$compiler"; then
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
++ AC_MSG_CHECKING([whether to build shared libraries])
++ test "$can_build_shared" = "no" && enable_shared=no
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
@@ -4042,7 +3826,7 @@
_LT_TAGVAR(LD, $1)="$LD"
## CAVEAT EMPTOR:
-@@ -8018,1825 +7535,2307 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -8018,1825 +7558,2307 @@
_LT_CONFIG($1)
fi # test -n "$compiler"
@@ -4058,26 +3842,11 @@
-fi # test "$_lt_caught_CXX_error" != yes
+ CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
-
- AC_LANG_POP
--])# _LT_LANG_CXX_CONFIG
++
++AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
-
-
--# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
--# ---------------------------------
--# Figure out "hidden" library dependencies from verbose
--# compiler output when linking a shared library.
--# Parse the compiler output and extract the necessary
--# objects, libraries and library flags.
--m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--# Dependencies to place before and after the object being linked:
--_LT_TAGVAR(predep_objects, $1)=
--_LT_TAGVAR(postdep_objects, $1)=
--_LT_TAGVAR(predeps, $1)=
--_LT_TAGVAR(postdeps, $1)=
--_LT_TAGVAR(compiler_lib_search_path, $1)=
++
++
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
@@ -4086,49 +3855,7 @@
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
-
--dnl we can't use the lt_simple_compile_test_code here,
--dnl because it contains code intended for an executable,
--dnl not a library. It's possible we should let each
--dnl tag define a new lt_????_link_test_code variable,
--dnl but it's only used here...
--m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
--int a;
--void foo (void) { a = 0; }
--_LT_EOF
--], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
--class Foo
--{
--public:
-- Foo (void) { a = 0; }
--private:
-- int a;
--};
--_LT_EOF
--], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-- subroutine foo
-- implicit none
-- integer*4 a
-- a=0
-- return
-- end
--_LT_EOF
--], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-- subroutine foo
-- implicit none
-- integer a
-- a=0
-- return
-- end
--_LT_EOF
--], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
--public class foo {
-- private int a;
-- public void bar (void) {
-- a = 0;
-- }
--};
--_LT_EOF
++
+# Source file extension for Java test sources.
+ac_ext=java
+
@@ -4273,54 +4000,9 @@
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
- ])
--dnl Parse the compiler output and extract the necessary
--dnl objects, libraries and library flags.
--if AC_TRY_EVAL(ac_compile); then
-- # Parse the compiler output and extract the necessary
-- # objects, libraries and library flags.
--
-- # Sentinel used to keep track of whether or not we are before
-- # the conftest object file.
-- pre_test_object_deps_done=no
--
-- for p in `eval "$output_verbose_link_cmd"`; do
-- case $p in
-
-- -L* | -R* | -l*)
-- # Some compilers place space between "-{L,R}" and the path.
-- # Remove the space.
-- if test $p = "-L" ||
-- test $p = "-R"; then
-- prev=$p
-- continue
-- else
-- prev=
-- fi
-
-- if test "$pre_test_object_deps_done" = no; then
-- case $p in
-- -L* | -R*)
-- # Internal compiler library paths should come after those
-- # provided the user. The postdeps already come after the
-- # user supplied libs so there is no need to process them.
-- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-- else
-- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-- fi
-- ;;
-- # The "-l" case would never come before the object being
-- # linked, so don't bother handling this case.
-- esac
-- else
-- if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-- else
-- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-- fi
-- fi
-- ;;
++])
++
++
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
@@ -4331,29 +4013,8 @@
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
-
-- *.$objext)
-- # This assumes that the test object file only shows up
-- # once in the compiler output.
-- if test "$p" = "conftest.$objext"; then
-- pre_test_object_deps_done=yes
-- continue
-- fi
-
-- if test "$pre_test_object_deps_done" = no; then
-- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-- _LT_TAGVAR(predep_objects, $1)="$p"
-- else
-- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-- fi
-- else
-- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-- _LT_TAGVAR(postdep_objects, $1)="$p"
-- else
-- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-- fi
-- fi
-- ;;
++
++
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
@@ -4366,15 +4027,13 @@
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+ [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
-
-- *) ;; # Ignore the rest.
++
+m4_ifndef([AC_PROG_SED], [
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
-
-- esac
++
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
@@ -4422,7 +4081,7 @@
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
- done
++ done
+done
+])
+SED=$lt_cv_path_SED
@@ -4431,28 +4090,28 @@
+])#AC_PROG_SED
+])#m4_ifndef
-- # Clean up.
-- rm -f a.out a.exe
--else
-- echo "libtool.m4: error: problem compiling $1 test program"
--fi
+-AC_LANG_POP
+-])# _LT_LANG_CXX_CONFIG
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
--$RM -f confest.$objext
-
--# PORTME: override above test on systems where it is broken
--m4_if([$1], [CXX],
--[case $host_os in
--interix[[3-9]]*)
-- # Interix 3.5 installs completely hosed .la files for C++, so rather than
-- # hack all around it, let's just trust "g++" to DTRT.
-- _LT_TAGVAR(predep_objects,$1)=
-- _LT_TAGVAR(postdep_objects,$1)=
-- _LT_TAGVAR(postdeps,$1)=
-- ;;
+
+-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+-# ---------------------------------
+-# Figure out "hidden" library dependencies from verbose
+-# compiler output when linking a shared library.
+-# Parse the compiler output and extract the necessary
+-# objects, libraries and library flags.
+-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-# Dependencies to place before and after the object being linked:
+-_LT_TAGVAR(predep_objects, $1)=
+-_LT_TAGVAR(postdep_objects, $1)=
+-_LT_TAGVAR(predeps, $1)=
+-_LT_TAGVAR(postdeps, $1)=
+-_LT_TAGVAR(compiler_lib_search_path, $1)=
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
@@ -4470,10 +4129,54 @@
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
--linux*)
-- case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*)
-- # Sun C++ 5.9
+-dnl we can't use the lt_simple_compile_test_code here,
+-dnl because it contains code intended for an executable,
+-dnl not a library. It's possible we should let each
+-dnl tag define a new lt_????_link_test_code variable,
+-dnl but it's only used here...
+-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+-int a;
+-void foo (void) { a = 0; }
+-_LT_EOF
+-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+-class Foo
+-{
+-public:
+- Foo (void) { a = 0; }
+-private:
+- int a;
+-};
+-_LT_EOF
+-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+- subroutine foo
+- implicit none
+- integer*4 a
+- a=0
+- return
+- end
+-_LT_EOF
+-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+- subroutine foo
+- implicit none
+- integer a
+- a=0
+- return
+- end
+-_LT_EOF
+-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+-public class foo {
+- private int a;
+- public void bar (void) {
+- a = 0;
+- }
+-};
+-_LT_EOF
+-])
+-dnl Parse the compiler output and extract the necessary
+-dnl objects, libraries and library flags.
+-if AC_TRY_EVAL(ac_compile); then
+- # Parse the compiler output and extract the necessary
+- # objects, libraries and library flags.
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
@@ -4482,15 +4185,9 @@
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-- # The more standards-conforming stlport4 library is
-- # incompatible with the Cstd library. Avoid specifying
-- # it if it's in CXXFLAGS. Ignore libCrun as
-- # -library=stlport4 depends on it.
-- case " $CXX $CXXFLAGS " in
-- *" -library=stlport4 "*)
-- solaris_use_stlport4=yes
-- ;;
-- esac
+- # Sentinel used to keep track of whether or not we are before
+- # the conftest object file.
+- pre_test_object_deps_done=no
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+else
@@ -4498,18 +4195,15 @@
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-- if test "$solaris_use_stlport4" != yes; then
-- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-- fi
-- ;;
-- esac
+- for p in `eval "$output_verbose_link_cmd"`; do
+- case $p in
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ lt_SP2NL='tr \040 \012'
+ lt_NL2SP='tr \015\012 \040\040'
- ;;
++ ;;
+ *) # EBCDIC based system
+ lt_SP2NL='tr \100 \n'
+ lt_NL2SP='tr \r\n \100\100'
@@ -4519,26 +4213,40 @@
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
--solaris*)
-- case $cc_basename in
-- CC*)
-- # The more standards-conforming stlport4 library is
-- # incompatible with the Cstd library. Avoid specifying
-- # it if it's in CXXFLAGS. Ignore libCrun as
-- # -library=stlport4 depends on it.
-- case " $CXX $CXXFLAGS " in
-- *" -library=stlport4 "*)
-- solaris_use_stlport4=yes
-- ;;
-- esac
-
-- # Adding this requires a known-good setup of shared libraries for
-- # Sun compiler versions before 5.6, else PIC objects from an old
-- # archive will be linked into the output, leading to subtle bugs.
-- if test "$solaris_use_stlport4" != yes; then
-- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-- fi
-- ;;
+- -L* | -R* | -l*)
+- # Some compilers place space between "-{L,R}" and the path.
+- # Remove the space.
+- if test $p = "-L" ||
+- test $p = "-R"; then
+- prev=$p
+- continue
+- else
+- prev=
+- fi
+
+- if test "$pre_test_object_deps_done" = no; then
+- case $p in
+- -L* | -R*)
+- # Internal compiler library paths should come after those
+- # provided the user. The postdeps already come after the
+- # user supplied libs so there is no need to process them.
+- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+- else
+- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+- fi
+- ;;
+- # The "-l" case would never come before the object being
+- # linked, so don't bother handling this case.
+- esac
+- else
+- if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+- else
+- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+- fi
+- fi
+- ;;
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
@@ -4546,7 +4254,14 @@
+[case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
-+
+
+- *.$objext)
+- # This assumes that the test object file only shows up
+- # once in the compiler output.
+- if test "$p" = "conftest.$objext"; then
+- pre_test_object_deps_done=yes
+- continue
+- fi
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
@@ -4555,37 +4270,30 @@
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
- esac
-- ;;
--esac
--])
++ esac
+}
--case " $_LT_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
--esac
-- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
--if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
--fi
--_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-- [The directories searched by this compiler when creating a shared library])
--_LT_TAGDECL([], [predep_objects], [1],
-- [Dependencies to place before and after the objects being linked to
-- create a shared library])
--_LT_TAGDECL([], [postdep_objects], [1])
--_LT_TAGDECL([], [predeps], [1])
--_LT_TAGDECL([], [postdeps], [1])
--_LT_TAGDECL([], [compiler_lib_search_path], [1],
-- [The library search path used internally by the compiler when linking
-- a shared library])
--])# _LT_SYS_HIDDEN_LIBDEPS
+- if test "$pre_test_object_deps_done" = no; then
+- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+- _LT_TAGVAR(predep_objects, $1)="$p"
+- else
+- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+- fi
+- else
+- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+- _LT_TAGVAR(postdep_objects, $1)="$p"
+- else
+- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+- fi
+- fi
+- ;;
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
+- *) ;; # Ignore the rest.
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
@@ -4607,6 +4315,188 @@
+ func_basename_result="${1##*/}"
+}
+- esac
+- done
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++func_stripname ()
++{
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++ # positional parameters, so assign one to ordinary parameter first.
++ func_stripname_result=${3}
++ func_stripname_result=${func_stripname_result#"${1}"}
++ func_stripname_result=${func_stripname_result%"${2}"}
++}
+
+- # Clean up.
+- rm -f a.out a.exe
+-else
+- echo "libtool.m4: error: problem compiling $1 test program"
+-fi
++# func_opt_split
++func_opt_split ()
++{
++ func_opt_split_opt=${1%%=*}
++ func_opt_split_arg=${1#*=}
++}
+
+-$RM -f confest.$objext
++# func_lo2o object
++func_lo2o ()
++{
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac
++}
+
+-# PORTME: override above test on systems where it is broken
+-m4_if([$1], [CXX],
+-[case $host_os in
+-interix[[3-9]]*)
+- # Interix 3.5 installs completely hosed .la files for C++, so rather than
+- # hack all around it, let's just trust "g++" to DTRT.
+- _LT_TAGVAR(predep_objects,$1)=
+- _LT_TAGVAR(postdep_objects,$1)=
+- _LT_TAGVAR(postdeps,$1)=
+- ;;
++# func_xform libobj-or-source
++func_xform ()
++{
++ func_xform_result=${1%.*}.lo
++}
+
+-linux*)
+- case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ C*)
+- # Sun C++ 5.9
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=$(( $[*] ))
++}
+
+- # The more standards-conforming stlport4 library is
+- # incompatible with the Cstd library. Avoid specifying
+- # it if it's in CXXFLAGS. Ignore libCrun as
+- # -library=stlport4 depends on it.
+- case " $CXX $CXXFLAGS " in
+- *" -library=stlport4 "*)
+- solaris_use_stlport4=yes
+- ;;
+- esac
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=${#1}
++}
+
+- if test "$solaris_use_stlport4" != yes; then
+- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+- fi
++_LT_EOF
+ ;;
+- esac
+- ;;
++ *) # Bourne compatible functions.
++ cat << \_LT_EOF >> "$cfgfile"
+
+-solaris*)
+- case $cc_basename in
+- CC*)
+- # The more standards-conforming stlport4 library is
+- # incompatible with the Cstd library. Avoid specifying
+- # it if it's in CXXFLAGS. Ignore libCrun as
+- # -library=stlport4 depends on it.
+- case " $CXX $CXXFLAGS " in
+- *" -library=stlport4 "*)
+- solaris_use_stlport4=yes
+- ;;
+- esac
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ # Extract subdirectory from the argument.
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++}
+
+- # Adding this requires a known-good setup of shared libraries for
+- # Sun compiler versions before 5.6, else PIC objects from an old
+- # archive will be linked into the output, leading to subtle bugs.
+- if test "$solaris_use_stlport4" != yes; then
+- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+- fi
+- ;;
++# func_basename file
++func_basename ()
++{
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++}
++
++dnl func_dirname_and_basename
++dnl A portable version of this function is already defined in general.m4sh
++dnl so there is no need for it here.
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++ case ${2} in
++ .*) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+- ;;
+-esac
+-])
++}
+
+-case " $_LT_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+-fi
+-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+- [The directories searched by this compiler when creating a shared library])
+-_LT_TAGDECL([], [predep_objects], [1],
+- [Dependencies to place before and after the objects being linked to
+- create a shared library])
+-_LT_TAGDECL([], [postdep_objects], [1])
+-_LT_TAGDECL([], [predeps], [1])
+-_LT_TAGDECL([], [postdeps], [1])
+-_LT_TAGDECL([], [compiler_lib_search_path], [1],
+- [The library search path used internally by the compiler when linking
+- a shared library])
+-])# _LT_SYS_HIDDEN_LIBDEPS
++# sed scripts:
++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[[^=]]*=//'
+
++# func_opt_split
++func_opt_split ()
++{
++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
++}
+
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
@@ -4620,36 +4510,24 @@
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+ # positional parameters, so assign one to ordinary parameter first.
-+ func_stripname_result=${3}
-+ func_stripname_result=${func_stripname_result#"${1}"}
-+ func_stripname_result=${func_stripname_result%"${2}"}
-+}
-
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_F77], [])
-+# func_opt_split
-+func_opt_split ()
-+{
-+ func_opt_split_opt=${1%%=*}
-+ func_opt_split_arg=${1#*=}
-+}
-
+# func_lo2o object
+func_lo2o ()
+{
-+ case ${1} in
-+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+ *) func_lo2o_result=${1} ;;
-+ esac
++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
++}
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_F77], [])
++# func_xform libobj-or-source
++func_xform ()
++{
++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
++}
+
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=`expr "$[@]"`
+}
-# _LT_LANG_F77_CONFIG([TAG])
@@ -4660,10 +4538,11 @@
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
-+# func_xform libobj-or-source
-+func_xform ()
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
+{
-+ func_xform_result=${1%.*}.lo
++ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -4686,27 +4565,27 @@
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+ func_arith_result=$(( $[*] ))
-+}
++_LT_EOF
++esac
-# Source file extension for f77 test sources.
-ac_ext=f
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+ func_len_result=${#1}
-+}
++case $lt_shell_append in
++ yes)
++ cat << \_LT_EOF >> "$cfgfile"
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "$[1]+=\$[2]"
++}
+_LT_EOF
+ ;;
-+ *) # Bourne compatible functions.
++ *)
+ cat << \_LT_EOF >> "$cfgfile"
-# No sense in running all these tests if we already determined that
@@ -4720,18 +4599,11 @@
- return
- end
-"
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
+{
-+ # Extract subdirectory from the argument.
-+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-+ if test "X$func_dirname_result" = "X${1}"; then
-+ func_dirname_result="${3}"
-+ else
-+ func_dirname_result="$func_dirname_result${2}"
-+ fi
++ eval "$[1]=\$$[1]\$[2]"
+}
- # Code to be used in simple link tests
@@ -4739,36 +4611,26 @@
- program t
- end
-"
-+# func_basename file
-+func_basename ()
-+{
-+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
++_LT_EOF
++ ;;
++ esac
++])
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-+dnl func_dirname_and_basename
-+dnl A portable version of this function is already defined in general.m4sh
-+dnl so there is no need for it here.
++# Helper functions for option handling. -*- Autoconf -*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+ case ${2} in
-+ .*) func_stripname_result=`$ECHO "X${3}" \
-+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+ *) func_stripname_result=`$ECHO "X${3}" \
-+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-+ esac
-+}
++# serial 6 ltoptions.m4
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
@@ -4781,18 +4643,11 @@
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[[^=]]*=//'
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-+# func_opt_split
-+func_opt_split ()
-+{
-+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-+}
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
@@ -4811,36 +4666,29 @@
- ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-+# func_lo2o object
-+func_lo2o ()
-+{
-+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-+}
++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
++# ------------------------------------------
++m4_define([_LT_MANGLE_OPTION],
++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
- AC_MSG_CHECKING([whether to build static libraries])
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT([$enable_static])
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+ func_arith_result=`expr "$[@]"`
-+}
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
++# ---------------------------------------
++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
++# matching handler defined, dispatch to it. Other OPTION-NAMEs are
++# saved as a flag.
++m4_define([_LT_SET_OPTION],
++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
++ _LT_MANGLE_DEFUN([$1], [$2]),
++ [m4_warning([Unknown $1 option `$2'])])[]dnl
++])
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
@@ -4852,42 +4700,33 @@
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-+_LT_EOF
-+esac
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-+case $lt_shell_append in
-+ yes)
-+ cat << \_LT_EOF >> "$cfgfile"
++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
++# ------------------------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++m4_define([_LT_IF_OPTION],
++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+ eval "$[1]+=\$[2]"
-+}
-+_LT_EOF
-+ ;;
-+ *)
-+ cat << \_LT_EOF >> "$cfgfile"
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+ eval "$[1]=\$$[1]\$[2]"
-+}
-
-+_LT_EOF
-+ ;;
-+ esac
++# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
++# -------------------------------------------------------
++# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
++# are set.
++m4_define([_LT_UNLESS_OPTIONS],
++[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
++ [m4_define([$0_found])])])[]dnl
++m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
++])[]dnl
+])
+
-# _LT_PROG_FC
-# -----------
@@ -4902,21 +4741,40 @@
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-+# Helper functions for option handling. -*- Autoconf -*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
++# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
++# ----------------------------------------
++# OPTION-LIST is a space-separated list of Libtool options associated
++# with MACRO-NAME. If any OPTION has a matching handler declared with
++# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
++# the unknown option and exit.
++m4_defun([_LT_SET_OPTIONS],
++[# Set options
++m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [_LT_SET_OPTION([$1], _LT_Option)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-+# serial 6 ltoptions.m4
-
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++m4_if([$1],[LT_INIT],[
++ dnl
++ dnl Simply set some default values (i.e off) if boolean options were not
++ dnl specified:
++ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
++ ])
++ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
++ ])
++ dnl
++ dnl If no reference was made to various pairs of opposing options, then
++ dnl we run the default mode handler for the pair. For example, if neither
++ dnl `shared' nor `disable-shared' was passed, we enable building of shared
++ dnl archives by default:
++ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
++ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
++ [_LT_ENABLE_FAST_INSTALL])
++ ])
++])# _LT_SET_OPTIONS
+
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
@@ -4947,10 +4805,10 @@
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
++# -----------------------------------------
++m4_define([_LT_MANGLE_DEFUN],
++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
@@ -4958,17 +4816,11 @@
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+ _LT_MANGLE_DEFUN([$1], [$2]),
-+ [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
++# -----------------------------------------------
++m4_define([LT_OPTION_DEFINE],
++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
++])# LT_OPTION_DEFINE
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working. Some variables (like enable_shared)
@@ -4987,29 +4839,25 @@
- program t
- end
-"
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
++# dlopen
++# ------
++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
++])
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
++AU_DEFUN([AC_LIBTOOL_DLOPEN],
++[_LT_SET_OPTION([LT_INIT], [dlopen])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `dlopen' option into LT_INIT's first parameter.])
++])
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+ [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
@@ -5020,43 +4868,27 @@
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME. If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [_LT_SET_OPTION([$1], _LT_Option)])
++# win32-dll
++# ---------
++# Declare package support for building win32 dll's.
++LT_OPTION_DEFINE([LT_INIT], [win32-dll],
++[enable_win32_dll=yes
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-+m4_if([$1],[LT_INIT],[
-+ dnl
-+ dnl Simply set some default values (i.e off) if boolean options were not
-+ dnl specified:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+ ])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+ ])
-+ dnl
-+ dnl If no reference was made to various pairs of opposing options, then
-+ dnl we run the default mode handler for the pair. For example, if neither
-+ dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+ dnl archives by default:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+ [_LT_ENABLE_FAST_INSTALL])
-+ ])
-+])# _LT_SET_OPTIONS
++case $host in
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++ AC_CHECK_TOOL(AS, as, false)
++ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++ AC_CHECK_TOOL(OBJDUMP, objdump, false)
++ ;;
++esac
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
++test -z "$AS" && AS=as
++_LT_DECL([], [AS], [0], [Assembler program])dnl
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
@@ -5075,18 +4907,26 @@
- ;;
- esac
- AC_MSG_RESULT([$enable_shared])
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
- AC_MSG_CHECKING([whether to build static libraries])
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT([$enable_static])
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
++test -z "$OBJDUMP" && OBJDUMP=objdump
++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
++])# win32-dll
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
++AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++_LT_SET_OPTION([LT_INIT], [win32-dll])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `win32-dll' option into LT_INIT's first parameter.])
++])
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
@@ -5099,11 +4939,8 @@
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
- _LT_CONFIG($1)
- fi # test -n "$compiler"
@@ -5111,94 +4948,6 @@
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
-
--AC_LANG_POP
--])# _LT_LANG_FC_CONFIG
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
-
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
--# _LT_LANG_GCJ_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for the GNU Java Compiler compiler
--# are suitably defined. These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_GCJ_CONFIG],
--[AC_REQUIRE([LT_PROG_GCJ])dnl
--AC_LANG_SAVE
-
--# Source file extension for Java test sources.
--ac_ext=java
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
-
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+ AC_CHECK_TOOL(AS, as, false)
-+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+ ;;
-+esac
-
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}"
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS], [0], [Assembler program])dnl
-
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
-
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
-
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=yes
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_TAGVAR(LD, $1)="$LD"
--_LT_CC_BASENAME([$compiler])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
@@ -5228,59 +4977,55 @@
+ esac],
+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
--if test -n "$compiler"; then
-- _LT_COMPILER_NO_RTTI($1)
-- _LT_COMPILER_PIC($1)
-- _LT_COMPILER_C_O($1)
-- _LT_COMPILER_FILE_LOCKS($1)
-- _LT_LINKER_SHLIBS($1)
-- _LT_LINKER_HARDCODE_LIBPATH($1)
+-AC_LANG_POP
+-])# _LT_LANG_FC_CONFIG
+ _LT_DECL([build_libtool_libs], [enable_shared], [0],
+ [Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
-- _LT_CONFIG($1)
--fi
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
--AC_LANG_RESTORE
+-# _LT_LANG_GCJ_CONFIG([TAG])
+-# --------------------------
+-# Ensure that the configuration variables for the GNU Java Compiler compiler
+-# are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to `libtool'.
+-m4_defun([_LT_LANG_GCJ_CONFIG],
+-[AC_REQUIRE([LT_PROG_GCJ])dnl
+-AC_LANG_SAVE
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
--GCC=$lt_save_GCC
--CC="$lt_save_CC"
--])# _LT_LANG_GCJ_CONFIG
+-# Source file extension for Java test sources.
+-ac_ext=java
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
--# _LT_LANG_RC_CONFIG([TAG])
--# -------------------------
--# Ensure that the configuration variables for the Windows resource compiler
--# are suitably defined. These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_RC_CONFIG],
--[AC_REQUIRE([LT_PROG_RC])dnl
--AC_LANG_SAVE
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}"
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
--# Source file extension for RC test sources.
--ac_ext=rc
-
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_TAG_COMPILER
+
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
@@ -5310,68 +5055,64 @@
+ esac],
+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-lt_save_GCC=$GCC
+-GCC=yes
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_TAGVAR(compiler, $1)=$CC
+-_LT_TAGVAR(LD, $1)="$LD"
+-_LT_CC_BASENAME([$compiler])
+ _LT_DECL([build_old_libs], [enable_static], [0],
+ [Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=
--CC=${RC-"windres"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-if test -n "$compiler"; then
+- _LT_COMPILER_NO_RTTI($1)
+- _LT_COMPILER_PIC($1)
+- _LT_COMPILER_C_O($1)
+- _LT_COMPILER_FILE_LOCKS($1)
+- _LT_LINKER_SHLIBS($1)
+- _LT_LINKER_HARDCODE_LIBPATH($1)
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
--if test -n "$compiler"; then
-- :
- _LT_CONFIG($1)
-fi
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
--GCC=$lt_save_GCC
-AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# _LT_LANG_RC_CONFIG
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
--# LT_PROG_GCJ
--# -----------
--AC_DEFUN([LT_PROG_GCJ],
--[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-- [AC_CHECK_TOOL(GCJ, gcj,)
-- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-- AC_SUBST(GCJFLAGS)])])[]dnl
--])
-
--# Old name:
--AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+-GCC=$lt_save_GCC
+-CC="$lt_save_CC"
+-])# _LT_LANG_GCJ_CONFIG
+
+
+-# _LT_LANG_RC_CONFIG([TAG])
+-# -------------------------
+-# Ensure that the configuration variables for the Windows resource compiler
+-# are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to `libtool'.
+-m4_defun([_LT_LANG_RC_CONFIG],
+-[AC_REQUIRE([LT_PROG_RC])dnl
+-AC_LANG_SAVE
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
@@ -5400,14 +5141,21 @@
+ ;;
+ esac],
+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-+
+
+-# Source file extension for RC test sources.
+-ac_ext=rc
+_LT_DECL([fast_install], [enable_fast_install], [0],
+ [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
-+
+
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
@@ -5416,23 +5164,117 @@
+the `fast-install' option into LT_INIT's first parameter.])
+])
--# LT_PROG_RC
--# ----------
--AC_DEFUN([LT_PROG_RC],
--[AC_CHECK_TOOL(RC, windres,)
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
++])
+
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_TAG_COMPILER
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-lt_save_GCC=$GCC
+-GCC=
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++# _LT_WITH_PIC([MODE])
++# --------------------
++# implement the --with-pic flag, and support the `pic-only' and `no-pic'
++# LT_INIT options.
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
++m4_define([_LT_WITH_PIC],
++[AC_ARG_WITH([pic],
++ [AS_HELP_STRING([--with-pic],
++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++ [pic_mode="$withval"],
++ [pic_mode=default])
+
+-if test -n "$compiler"; then
+- :
+- _LT_CONFIG($1)
+-fi
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+-GCC=$lt_save_GCC
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# _LT_LANG_RC_CONFIG
++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
++])# _LT_WITH_PIC
+
++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+-# LT_PROG_GCJ
+-# -----------
+-AC_DEFUN([LT_PROG_GCJ],
+-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+- [AC_CHECK_TOOL(GCJ, gcj,)
+- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+- AC_SUBST(GCJFLAGS)])])[]dnl
++# Old name:
++AU_DEFUN([AC_LIBTOOL_PICMODE],
++[_LT_SET_OPTION([LT_INIT], [pic-only])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `pic-only' option into LT_INIT's first parameter.])
])
+
+-# Old name:
+-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+ dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+
+-# LT_PROG_RC
+-# ----------
+-AC_DEFUN([LT_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres,)
+-])
++m4_define([_LTDL_MODE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
++ [m4_define([_LTDL_MODE], [nonrecursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [recursive],
++ [m4_define([_LTDL_MODE], [recursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [subproject],
++ [m4_define([_LTDL_MODE], [subproject])])
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
- dnl aclocal-1.4 backwards compatibility:
+-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
--
--
++m4_define([_LTDL_TYPE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [installable],
++ [m4_define([_LTDL_TYPE], [installable])])
++LT_OPTION_DEFINE([LTDL_INIT], [convenience],
++ [m4_define([_LTDL_TYPE], [convenience])])
+
++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
+
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
@@ -5447,9 +5289,10 @@
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
++# serial 6 ltsugar.m4
+
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-# _LT_DECL_OBJDUMP
-# --------------
@@ -5461,22 +5304,26 @@
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+ [AS_HELP_STRING([--with-pic],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [pic_mode="$withval"],
-+ [pic_mode=default])
-
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++
++# lt_join(SEP, ARG1, [ARG2...])
++# -----------------------------
++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
++# associated separator.
++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
++# versions in m4sugar had bugs.
++m4_define([lt_join],
++[m4_if([$#], [1], [],
++ [$#], [2], [[$2]],
++ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
++m4_define([_lt_join],
++[m4_if([$#$2], [2], [],
++ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
-# _LT_DECL_SED
--# ------------
++# lt_car(LIST)
++# lt_cdr(LIST)
+ # ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
@@ -5487,16 +5334,21 @@
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
- [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
++# Manipulate m4 lists.
++# These macros are necessary as long as will still need to support
++# Autoconf-2.59 which quotes differently.
++m4_define([lt_car], [[$1]])
++m4_define([lt_cdr],
++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
++ [$#], 1, [],
++ [m4_dquote(m4_shift($@))])])
++m4_define([lt_unquote], $1)
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
@@ -5547,25 +5399,32 @@
- fi
- done
-done
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
- ])
+-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
++# lt_append(MACRO-NAME, STRING, [SEPARATOR])
++# ------------------------------------------
++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
++# Note that neither SEPARATOR nor STRING are expanded; they are appended
++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
++# No SEPARATOR is output if MACRO-NAME was previously undefined (different
++# than defined and empty).
++#
++# This macro is needed until we can rely on Autoconf 2.62, since earlier
++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
++m4_define([lt_append],
++[m4_define([$1],
++ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
- dnl aclocal-1.4 backwards compatibility:
+-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
--
--
+
+
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
@@ -5582,7 +5441,20 @@
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
--
++# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
++# ----------------------------------------------------------
++# Produce a SEP delimited list of all paired combinations of elements of
++# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
++# has the form PREFIXmINFIXSUFFIXn.
++# Needed until we can rely on m4_combine added in Autoconf 2.62.
++m4_define([lt_combine],
++[m4_if(m4_eval([$# > 3]), [1],
++ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
++[[m4_foreach([_Lt_prefix], [$2],
++ [m4_foreach([_Lt_suffix],
++ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
++ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
@@ -5590,7 +5462,6 @@
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- lt_unset=unset
@@ -5598,6 +5469,16 @@
- lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
++# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
++# -----------------------------------------------------------------------
++# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
++# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
++m4_define([lt_if_append_uniq],
++[m4_ifdef([$1],
++ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
++ [lt_append([$1], [$2], [$3])$4],
++ [$5])],
++ [lt_append([$1], [$2], [$3])$4])])
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
@@ -5614,19 +5495,11 @@
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+ [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+ [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+ [m4_define([_LTDL_MODE], [subproject])])
-
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+ [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+ [m4_define([_LTDL_TYPE], [convenience])])
+
++# lt_dict_add(DICT, KEY, VALUE)
++# -----------------------------
++m4_define([lt_dict_add],
++[m4_define([$1($2)], [$3])])
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
@@ -5635,14 +5508,6 @@
-[case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
@@ -5654,15 +5519,16 @@
- * ) func_dirname_result="${3}" ;;
- esac
-}
-+# serial 6 ltsugar.m4
++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
++# --------------------------------------------
++m4_define([lt_dict_add_subkey],
++[m4_define([$1($2:$3)], [$4])])
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
@@ -5684,6 +5550,12 @@
- esac
- func_basename_result="${1##*/}"
-}
++# lt_dict_fetch(DICT, KEY, [SUBKEY])
++# ----------------------------------
++m4_define([lt_dict_fetch],
++[m4_ifval([$3],
++ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
++ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
@@ -5698,19 +5570,6 @@
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+ [$#], [2], [[$2]],
-+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-# func_opt_split
-func_opt_split ()
@@ -5718,6 +5577,12 @@
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
++# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
++# -----------------------------------------------------------------
++m4_define([lt_if_dict_fetch],
++[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
++ [$5],
++ [$6])])
-# func_lo2o object
-func_lo2o ()
@@ -5727,43 +5592,34 @@
- *) func_lo2o_result=${1} ;;
- esac
-}
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+ [$#], 1, [],
-+ [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
++# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
++# --------------------------------------------------------------
++m4_define([lt_dict_filter],
++[m4_if([$5], [], [],
++ [lt_join(m4_quote(m4_default([$4], [[, ]])),
++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
++ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
++])
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $[*] ))
-}
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
++# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
++# Copyright (C) 2004 Free Software Foundation, Inc.
++# Written by Scott James Remnant, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
-# func_len string
-# STRING may not start with a hyphen.
@@ -5771,11 +5627,14 @@
-{
- func_len_result=${#1}
-}
++# Generated from ltversion.in.
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
++# serial 3017 ltversion.m4
++# This file is part of GNU Libtool
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
@@ -5790,39 +5649,32 @@
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+ [m4_foreach([_Lt_suffix],
-+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
++AC_DEFUN([LTVERSION_VERSION],
++[macro_version='2.2.6b'
++macro_revision='1.3017'
++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
++_LT_DECL(, macro_revision, 0)
++])
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+ [lt_append([$1], [$2], [$3])$4],
-+ [$5])],
-+ [lt_append([$1], [$2], [$3])$4])])
++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
++#
++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
++# Written by Scott James Remnant, 2004.
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
@@ -5839,135 +5691,6 @@
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-
--# sed scripts:
--my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
--my_sed_long_arg='1s/^-[[^=]]*=//'
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-
--# func_opt_split
--func_opt_split ()
--{
-- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
--}
-
--# func_lo2o object
--func_lo2o ()
--{
-- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
--}
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-
--# func_xform libobj-or-source
--func_xform ()
--{
-- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
--}
-
--# func_arith arithmetic-term...
--func_arith ()
--{
-- func_arith_result=`expr "$[@]"`
--}
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
-- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
--}
-
--_LT_EOF
--esac
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+ [$5],
-+ [$6])])
-
--case $lt_shell_append in
-- yes)
-- cat << \_LT_EOF >> "$cfgfile"
-
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
-- eval "$[1]+=\$[2]"
--}
--_LT_EOF
-- ;;
-- *)
-- cat << \_LT_EOF >> "$cfgfile"
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+ [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
-
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
-- eval "$[1]=\$$[1]\$[2]"
--}
-+# ltversion.m4 -- version numbers -*- Autoconf -*-
-+#
-+# Copyright (C) 2004 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# Generated from ltversion.in.
-+
-+# serial 3012 ltversion.m4
-+# This file is part of GNU Libtool
-
--_LT_EOF
-- ;;
-- esac
-+m4_define([LT_PACKAGE_VERSION], [2.2.6])
-+m4_define([LT_PACKAGE_REVISION], [1.3012])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6'
-+macro_revision='1.3012'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
- ])
-
--# Helper functions for option handling. -*- Autoconf -*-
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
- #
--# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
--# Written by Gary V. Vaughan, 2004
-+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004.
- #
- # This file is free software; the Free Software Foundation gives
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
-
--# serial 6 ltoptions.m4
+# serial 4 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
@@ -5992,11 +5715,10 @@
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
-
- # This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++
++# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
++
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
@@ -6053,10 +5775,9 @@
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
--# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
--# ------------------------------------------
--m4_define([_LT_MANGLE_OPTION],
--[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+-# sed scripts:
+-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+-my_sed_long_arg='1s/^-[[^=]]*=//'
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
@@ -6072,22 +5793,28 @@
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+-# func_opt_split
+-func_opt_split ()
+-{
+- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+-}
+dnl Authors:
+dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
--# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
--# ---------------------------------------
--# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
--# matching handler defined, dispatch to it. Other OPTION-NAMEs are
--# saved as a flag.
--m4_define([_LT_SET_OPTION],
--[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
--m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-- _LT_MANGLE_DEFUN([$1], [$2]),
-- [m4_warning([Unknown $1 option `$2'])])[]dnl
+-# func_lo2o object
+-func_lo2o ()
+-{
+- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+-}
+AC_PREREQ(2.50)
-+
+
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+-}
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
@@ -6097,8 +5824,13 @@
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
- ])
-
++])
+
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=`expr "$[@]"`
+-}
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
@@ -6121,7 +5853,13 @@
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
-+
+
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+-}
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
@@ -6144,11 +5882,8 @@
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
--# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
--# ------------------------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--m4_define([_LT_IF_OPTION],
--[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+-_LT_EOF
+-esac
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
@@ -6168,18 +5903,20 @@
+ $3])dnl
+fi])
-
--# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
--# -------------------------------------------------------
--# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
--# are set.
--m4_define([_LT_UNLESS_OPTIONS],
--[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-- [m4_define([$0_found])])])[]dnl
--m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
--])[]dnl
--])
+-case $lt_shell_append in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
+
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$[1]+=\$[2]"
+-}
+-_LT_EOF
+- ;;
+- *)
+- cat << \_LT_EOF >> "$cfgfile"
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
@@ -6196,6 +5933,12 @@
+fi[]dnl
+])# _PKG_CONFIG
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$[1]=\$$[1]\$[2]"
+-}
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
@@ -6207,6 +5950,108 @@
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+-_LT_EOF
+- ;;
+- esac
+-])
+
+-# Helper functions for option handling. -*- Autoconf -*-
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
+ #
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+-# Written by Gary V. Vaughan, 2004
+ #
+-# This file is free software; the Free Software Foundation gives
+-# unlimited permission to copy and/or distribute it, with or without
+-# modifications, as long as this notice is preserved.
+-
+-# serial 6 ltoptions.m4
+-
+-# This is to help aclocal find these macros, as it can't see m4_define.
+-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
+
+-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+-# ------------------------------------------
+-m4_define([_LT_MANGLE_OPTION],
+-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
+
+-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+-# ---------------------------------------
+-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+-# matching handler defined, dispatch to it. Other OPTION-NAMEs are
+-# saved as a flag.
+-m4_define([_LT_SET_OPTION],
+-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+- _LT_MANGLE_DEFUN([$1], [$2]),
+- [m4_warning([Unknown $1 option `$2'])])[]dnl
+-])
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
+
+-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+-# ------------------------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-m4_define([_LT_IF_OPTION],
+-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
++$$1_PKG_ERRORS
+
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+-# -------------------------------------------------------
+-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+-# are set.
+-m4_define([_LT_UNLESS_OPTIONS],
+-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+- [m4_define([$0_found])])])[]dnl
+-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+-])[]dnl
+-])
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++_PKG_TEXT
+
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
@@ -6217,6 +6062,15 @@
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
- [_LT_SET_OPTION([$1], _LT_Option)])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
-m4_if([$1],[LT_INIT],[
- dnl
@@ -6238,103 +6092,12 @@
- [_LT_ENABLE_FAST_INSTALL])
- ])
-])# _LT_SET_OPTIONS
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-
--# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
--# -----------------------------------------
--m4_define([_LT_MANGLE_DEFUN],
--[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
-
--# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
--# -----------------------------------------------
--m4_define([LT_OPTION_DEFINE],
--[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
--])# LT_OPTION_DEFINE
-+$$1_PKG_ERRORS
-
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
--# dlopen
--# ------
--LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
--])
-+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
--AU_DEFUN([AC_LIBTOOL_DLOPEN],
--[_LT_SET_OPTION([LT_INIT], [dlopen])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `dlopen' option into LT_INIT's first parameter.])
--])
-+_PKG_TEXT
-
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+ [$4])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--# win32-dll
--# ---------
--# Declare package support for building win32 dll's.
--LT_OPTION_DEFINE([LT_INIT], [win32-dll],
--[enable_win32_dll=yes
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -6344,17 +6107,10 @@
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
--case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-- AC_CHECK_TOOL(AS, as, false)
-- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-- AC_CHECK_TOOL(OBJDUMP, objdump, false)
-- ;;
--esac
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
@@ -6362,37 +6118,33 @@
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
--test -z "$AS" && AS=as
--_LT_DECL([], [AS], [0], [Assembler program])dnl
+-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+-# -----------------------------------------
+-m4_define([_LT_MANGLE_DEFUN],
+-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
--test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
--])# win32-dll
+-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+-# -----------------------------------------------
+-m4_define([LT_OPTION_DEFINE],
+-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+-])# LT_OPTION_DEFINE
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--_LT_SET_OPTION([LT_INIT], [win32-dll])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `win32-dll' option into LT_INIT's first parameter.])
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -6430,7 +6182,10 @@
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
-+
+
+-# dlopen
+-# ------
+-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
@@ -6438,16 +6193,137 @@
+am_aux_dir=`cd $ac_aux_dir && pwd`
])
+-AU_DEFUN([AC_LIBTOOL_DLOPEN],
+-[_LT_SET_OPTION([LT_INIT], [dlopen])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the `dlopen' option into LT_INIT's first parameter.])
+-])
++# AM_CONDITIONAL -*- Autoconf -*-
+
-dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+# AM_CONDITIONAL -*- Autoconf -*-
-
+-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
++# serial 9
+
+-# win32-dll
+-# ---------
+-# Declare package support for building win32 dll's.
+-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+-[enable_win32_dll=yes
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++m4_define([_AM_COND_VALUE_$1], [$2])dnl
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
++else
++ $1_TRUE='#'
++ $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
+
+-case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+- AC_CHECK_TOOL(AS, as, false)
+- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+- AC_CHECK_TOOL(OBJDUMP, objdump, false)
+- ;;
+-esac
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-test -z "$AS" && AS=as
+-_LT_DECL([], [AS], [0], [Assembler program])dnl
++# serial 10
+
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery. Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+-])# win32-dll
+
+-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-_LT_SET_OPTION([LT_INIT], [win32-dll])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the `win32-dll' option into LT_INIT's first parameter.])
+-])
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
++ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
++ [$1], CXX, [depcc="$CXX" am_compiler_list=],
++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], UPC, [depcc="$UPC" am_compiler_list=],
++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
++ [depcc="$$1" am_compiler_list=])
+
++AC_CACHE_CHECK([dependency style of $depcc],
++ [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
@@ -6477,138 +6353,6 @@
- ;;
- esac],
- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+# serial 9
-
-- _LT_DECL([build_libtool_libs], [enable_shared], [0],
-- [Whether or not to build shared libraries])
--])# _LT_ENABLE_SHARED
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-
--LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# Old names:
--AC_DEFUN([AC_ENABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
--])
-+# serial 10
-
--AC_DEFUN([AC_DISABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], [disable-shared])
--])
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
--AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
--AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_SHARED], [])
--dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-
-+AC_CACHE_CHECK([dependency style of $depcc],
-+ [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
--# _LT_ENABLE_STATIC([DEFAULT])
--# ----------------------------
--# implement the --enable-static flag, and support the `static' and
--# `disable-static' LT_INIT options.
--# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_STATIC],
--[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([static],
-- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-- [p=${PACKAGE-default}
-- case $enableval in
-- yes) enable_static=yes ;;
-- no) enable_static=no ;;
-- *)
-- enable_static=no
-- # Look at the argument we got. We use all the common list separators.
-- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-- for pkg in $enableval; do
-- IFS="$lt_save_ifs"
-- if test "X$pkg" = "X$p"; then
-- enable_static=yes
-- fi
-- done
-- IFS="$lt_save_ifs"
-- ;;
-- esac],
-- [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
@@ -6623,9 +6367,9 @@
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
-- _LT_DECL([build_old_libs], [enable_static], [0],
-- [Whether or not to build static libraries])
--])# _LT_ENABLE_STATIC
+- _LT_DECL([build_libtool_libs], [enable_shared], [0],
+- [Whether or not to build shared libraries])
+-])# _LT_ENABLE_SHARED
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
@@ -6643,8 +6387,8 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
@@ -6699,8 +6443,8 @@
+ done
-# Old names:
--AC_DEFUN([AC_ENABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+ cd ..
+ rm -rf conftest.dir
+else
@@ -6708,20 +6452,20 @@
+fi
])
-
--AC_DEFUN([AC_DISABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], [disable-static])
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[_LT_SET_OPTION([LT_INIT], [disable-shared])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
--AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
--AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_STATIC], [])
--dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
@@ -6747,36 +6491,39 @@
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
--# _LT_ENABLE_FAST_INSTALL([DEFAULT])
--# ----------------------------------
--# implement the --enable-fast-install flag, and support the `fast-install'
--# and `disable-fast-install' LT_INIT options.
+-# _LT_ENABLE_STATIC([DEFAULT])
+-# ----------------------------
+-# implement the --enable-static flag, and support the `static' and
+-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_FAST_INSTALL],
--[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([fast-install],
-- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+-m4_define([_LT_ENABLE_STATIC],
+-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+-AC_ARG_ENABLE([static],
+- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
-- yes) enable_fast_install=yes ;;
-- no) enable_fast_install=no ;;
+- yes) enable_static=yes ;;
+- no) enable_static=no ;;
- *)
-- enable_fast_install=no
+- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
-- enable_fast_install=yes
+- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
-- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+- [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-+
+
+- _LT_DECL([build_old_libs], [enable_static], [0],
+- [Whether or not to build static libraries])
+-])# _LT_ENABLE_STATIC
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
@@ -6784,13 +6531,10 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--_LT_DECL([fast_install], [enable_fast_install], [0],
-- [Whether or not to optimize for fast installation])dnl
--])# _LT_ENABLE_FAST_INSTALL
+-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+#serial 5
-
--LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
++
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -6847,18 +6591,12 @@
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# Old names:
--AU_DEFUN([AC_ENABLE_FAST_INSTALL],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you put
--the `fast-install' option into LT_INIT's first parameter.])
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
--AU_DEFUN([AC_DISABLE_FAST_INSTALL],
--[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you put
--the `disable-fast-install' option into LT_INIT's first parameter.])
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[_LT_SET_OPTION([LT_INIT], [disable-static])
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -6872,11 +6610,13 @@
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
+-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++# Do all the work for Automake. -*- Autoconf -*-
+
-dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
--dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+# Do all the work for Automake. -*- Autoconf -*-
-
+-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
@@ -6884,25 +6624,39 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--# _LT_WITH_PIC([MODE])
--# --------------------
--# implement the --with-pic flag, and support the `pic-only' and `no-pic'
--# LT_INIT options.
--# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
--m4_define([_LT_WITH_PIC],
--[AC_ARG_WITH([pic],
-- [AS_HELP_STRING([--with-pic],
-- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-- [pic_mode="$withval"],
-- [pic_mode=default])
+# serial 16
--test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
--_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
--])# _LT_WITH_PIC
+-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+-# ----------------------------------
+-# implement the --enable-fast-install flag, and support the `fast-install'
+-# and `disable-fast-install' LT_INIT options.
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-m4_define([_LT_ENABLE_FAST_INSTALL],
+-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+-AC_ARG_ENABLE([fast-install],
+- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_fast_install=yes ;;
+- no) enable_fast_install=no ;;
+- *)
+- enable_fast_install=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_fast_install=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
@@ -6931,8 +6685,9 @@
+ fi
+fi
--LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+-_LT_DECL([fast_install], [enable_fast_install], [0],
+- [Whether or not to optimize for fast installation])dnl
+-])# _LT_ENABLE_FAST_INSTALL
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
@@ -6943,13 +6698,8 @@
+fi
+AC_SUBST([CYGPATH_W])
--# Old name:
--AU_DEFUN([AC_LIBTOOL_PICMODE],
--[_LT_SET_OPTION([LT_INIT], [pic-only])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `pic-only' option into LT_INIT's first parameter.])
--])
+-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
@@ -6963,12 +6713,22 @@
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+-# Old names:
+-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the `fast-install' option into LT_INIT's first parameter.])
+-])
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the `disable-fast-install' option into LT_INIT's first parameter.])
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -7001,7 +6761,39 @@
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
+ ])
+-
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+-
+-
+-# _LT_WITH_PIC([MODE])
+-# --------------------
+-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+-# LT_INIT options.
+-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+-m4_define([_LT_WITH_PIC],
+-[AC_ARG_WITH([pic],
+- [AS_HELP_STRING([--with-pic],
+- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+- [pic_mode="$withval"],
+- [pic_mode=default])
+-
+-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+-
+-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+-])# _LT_WITH_PIC
+-
+-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+-
+-# Old name:
+-AU_DEFUN([AC_LIBTOOL_PICMODE],
+-[_LT_SET_OPTION([LT_INIT], [pic-only])
+-AC_DIAGNOSE([obsolete],
+-[$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the `pic-only' option into LT_INIT's first parameter.])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
@@ -7009,7 +6801,16 @@
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+])
+ ])
+
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
++dnl mangled by Autoconf and run in a shell conditional statement.
++m4_define([_AC_COMPILER_EXEEXT],
++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
@@ -7018,31 +6819,15 @@
- [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
- [m4_define([_LTDL_MODE], [subproject])])
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. The stamp files are numbered to have different names.
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
- [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
- [m4_define([_LTDL_TYPE], [convenience])])
-
--# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
--#
--# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
--# Written by Gary V. Vaughan, 2004
--#
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
-
--# serial 6 ltsugar.m4
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
@@ -7060,10 +6845,20 @@
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+-#
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+-# Written by Gary V. Vaughan, 2004
++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+ #
+-# This file is free software; the Free Software Foundation gives
+-# unlimited permission to copy and/or distribute it, with or without
+-# modifications, as long as this notice is preserved.
+-
+-# serial 6 ltsugar.m4
+-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
@@ -7892,10 +7687,9 @@
+]) # _AM_PROG_TAR
m4_include([acinclude.m4])
-Index: evolution-mapi-0.28.1/config.guess
-===================================================================
---- evolution-mapi-0.28.1.orig/config.guess 2009-12-11 12:05:17.502464376 +0100
-+++ evolution-mapi-0.28.1/config.guess 2009-12-11 12:04:38.854455700 +0100
+
+--- evolution-mapi-0.28.3/config.guess 2010-03-01 15:28:45.000000000 +0200
++++ evolution-mapi-0.28.3-relib/config.guess 2010-03-02 22:18:30.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -7909,7 +7703,7 @@
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -170,7 +170,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -7918,7 +7712,7 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@ EOF
+@@ -656,7 +656,7 @@
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -7927,7 +7721,7 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -822,6 +822,9 @@ EOF
+@@ -822,6 +822,9 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -7937,7 +7731,7 @@
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@ EOF
+@@ -882,40 +885,17 @@
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -7983,7 +7777,7 @@
#else
CPU=
#endif
-@@ -947,7 +927,7 @@ EOF
+@@ -947,7 +927,7 @@
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
@@ -7992,7 +7786,7 @@
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
-@@ -1001,14 +981,6 @@ EOF
+@@ -1001,14 +981,6 @@
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
@@ -8007,7 +7801,7 @@
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@ EOF
+@@ -1074,7 +1046,7 @@
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -8016,7 +7810,7 @@
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@ EOF
+@@ -1182,7 +1154,7 @@
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -8025,10 +7819,9 @@
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
-Index: evolution-mapi-0.28.1/config.h.in
-===================================================================
---- evolution-mapi-0.28.1.orig/config.h.in 2009-12-11 12:05:17.142462673 +0100
-+++ evolution-mapi-0.28.1/config.h.in 2009-12-11 12:04:57.390459287 +0100
+
+--- evolution-mapi-0.28.3/config.h.in 2010-03-01 15:28:44.000000000 +0200
++++ evolution-mapi-0.28.3-relib/config.h.in 2010-03-02 22:18:31.000000000 +0200
@@ -70,6 +70,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -8039,10 +7832,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: evolution-mapi-0.28.1/config.sub
-===================================================================
---- evolution-mapi-0.28.1.orig/config.sub 2009-12-11 12:05:17.410466715 +0100
-+++ evolution-mapi-0.28.1/config.sub 2009-12-11 12:04:38.857954679 +0100
+
+--- evolution-mapi-0.28.3/config.sub 2010-03-01 15:28:45.000000000 +0200
++++ evolution-mapi-0.28.3-relib/config.sub 2010-03-02 22:18:30.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -8056,7 +7848,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@ case $os in
+@@ -153,6 +153,9 @@
os=
basic_machine=$1
;;
@@ -8066,7 +7858,7 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -467,6 +470,10 @@ case $basic_machine in
+@@ -467,6 +470,10 @@
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -8077,7 +7869,7 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -1260,7 +1267,7 @@ case $os in
+@@ -1260,7 +1267,7 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -8086,7 +7878,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@ case $basic_machine in
+@@ -1613,7 +1620,7 @@
-sunos*)
vendor=sun
;;
@@ -8095,15 +7887,14 @@
vendor=ibm
;;
-beos*)
-Index: evolution-mapi-0.28.1/configure
-===================================================================
---- evolution-mapi-0.28.1.orig/configure 2009-12-11 12:05:17.054454828 +0100
-+++ evolution-mapi-0.28.1/configure 2009-12-11 12:04:59.678452747 +0100
+
+--- evolution-mapi-0.28.3/configure 2010-03-01 15:28:44.000000000 +0200
++++ evolution-mapi-0.28.3-relib/configure 2010-03-02 22:18:31.000000000 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for evolution-mapi 0.28.1.
-+# Generated by GNU Autoconf 2.65 for evolution-mapi 0.28.1.
+-# Generated by GNU Autoconf 2.63 for evolution-mapi 0.28.3.
++# Generated by GNU Autoconf 2.65 for evolution-mapi 0.28.3.
#
# Report bugs to <http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi>.
#
@@ -8130,7 +7921,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -22,23 +26,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -8159,7 +7950,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +42,13 @@ export as_nl
+@@ -46,7 +42,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -8174,7 +7965,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +59,7 @@ else
+@@ -57,7 +59,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -8183,7 +7974,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -80,13 +82,6 @@
}
fi
@@ -8197,7 +7988,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +91,15 @@ fi
+@@ -96,15 +91,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -8216,7 +8007,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +111,16 @@ if test "x$as_myself" = x; then
+@@ -116,12 +111,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -8237,7 +8028,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +132,301 @@ export LC_ALL
+@@ -133,330 +132,301 @@
LANGUAGE=C
export LANGUAGE
@@ -8339,6 +8130,18 @@
-
-if as_func_ret_success; then
- :
+-else
+- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
@@ -8358,23 +8161,11 @@
+ as_have_required=yes
else
- exitcode=1
-- echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
+- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-- :
- else
-- exitcode=1
-- echo positional parameters were not saved.
--fi
--
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
@@ -8384,7 +8175,7 @@
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
--else
+ else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8573,7 +8364,7 @@
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-
++
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -8609,7 +8400,7 @@
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-+
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
@@ -8815,7 +8606,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +443,7 @@ test \$exitcode = 0") || {
+@@ -473,8 +443,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -8825,7 +8616,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +453,18 @@ test \$exitcode = 0") || {
+@@ -484,29 +453,18 @@
exit
}
@@ -8860,7 +8651,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +494,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+@@ -536,7 +494,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -8869,7 +8660,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +513,10 @@ else
+@@ -555,10 +513,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -8882,7 +8673,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +531,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -573,7 +531,6 @@
@@ -8890,7 +8681,7 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -722,7 +679,8 @@ fi
+@@ -722,7 +679,8 @@
@@ -8900,7 +8691,7 @@
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -740,7 +698,6 @@ cross_compiling=no
+@@ -740,7 +698,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -8908,37 +8699,15 @@
# Identity of this package.
PACKAGE_NAME='evolution-mapi'
-@@ -748,6 +705,7 @@ PACKAGE_TARNAME='evolution-mapi'
- PACKAGE_VERSION='0.28.1'
- PACKAGE_STRING='evolution-mapi 0.28.1'
+@@ -748,6 +705,7 @@
+ PACKAGE_VERSION='0.28.3'
+ PACKAGE_STRING='evolution-mapi 0.28.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi'
+PACKAGE_URL=''
ac_unique_file="README"
# Factoring default headers for most tests.
-@@ -790,20 +748,12 @@ ac_subst_vars='am__EXEEXT_FALSE
- am__EXEEXT_TRUE
- LTLIBOBJS
- LIBOBJS
--GTK_DOC_USE_REBASE_FALSE
--GTK_DOC_USE_REBASE_TRUE
- GTK_DOC_USE_LIBTOOL_FALSE
- GTK_DOC_USE_LIBTOOL_TRUE
--GTK_DOC_BUILD_PDF_FALSE
--GTK_DOC_BUILD_PDF_TRUE
--GTK_DOC_BUILD_HTML_FALSE
--GTK_DOC_BUILD_HTML_TRUE
- ENABLE_GTK_DOC_FALSE
- ENABLE_GTK_DOC_TRUE
--HTML_DIR
--GTKDOC_MKPDF
--GTKDOC_REBASE
- GTKDOC_CHECK
-+HTML_DIR
- mapidatadir
- libmapi_ldif_dir
- edataserver_privincludedir
-@@ -981,6 +931,7 @@ bindir
+@@ -981,6 +939,7 @@
program_transform_name
prefix
exec_prefix
@@ -8946,16 +8715,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1003,8 +954,6 @@ with_gnu_ld
- enable_libtool_lock
- with_html_dir
- enable_gtk_doc
--enable_gtk_doc_html
--enable_gtk_doc_pdf
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1144,8 +1093,7 @@ do
+@@ -1144,8 +1103,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8965,7 +8725,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1171,8 +1119,7 @@ do
+@@ -1171,8 +1129,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8975,7 +8735,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1376,8 +1323,7 @@ do
+@@ -1376,8 +1333,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8985,7 +8745,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1393,8 +1339,7 @@ do
+@@ -1393,8 +1349,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8995,7 +8755,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1424,17 +1369,17 @@ do
+@@ -1424,17 +1379,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -9019,7 +8779,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1451,15 +1396,13 @@ done
+@@ -1451,15 +1406,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -9037,7 +8797,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1482,8 +1425,7 @@ do
+@@ -1482,8 +1435,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -9047,7 +8807,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1513,11 +1455,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1513,11 +1465,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -9061,7 +8821,7 @@
# Find the source files, if location was not specified.
-@@ -1556,13 +1496,11 @@ else
+@@ -1556,13 +1506,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -9077,7 +8837,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1678,9 +1616,7 @@ Optional Features:
+@@ -1678,9 +1626,9 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
@@ -9085,10 +8845,12 @@
- --enable-gtk-doc-html build documentation in html format [default=yes]
- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
++ --enable-gtk-doc-html build documentation in html format [[default=yes]]
++ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1696,7 +1632,7 @@ Some influential environment variables:
+@@ -1696,7 +1644,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -9097,81 +8859,21 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1746,83 +1682,440 @@ it to find libraries and programs with n
-
- Report bugs to <http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi>.
+@@ -1808,21 +1756,378 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ evolution-mapi configure 0.28.3
+-generated by GNU Autoconf 2.63
++generated by GNU Autoconf 2.65
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
_ACEOF
--ac_status=$?
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+ # If there are subdirs, report their specific --help.
-+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+ test -d "$ac_dir" ||
-+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+ continue
-+ ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+ .) # We are building in place.
-+ ac_srcdir=.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested configure.
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+ elif test -f "$ac_srcdir/configure"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure" --help=recursive
-+ else
-+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
-+ done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+ cat <<\_ACEOF
-+evolution-mapi configure 0.28.1
-+generated by GNU Autoconf 2.65
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+ exit
-+fi
+ exit
+ fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -9437,34 +9139,11 @@
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-
--if test "$ac_init_help" = "recursive"; then
-- # If there are subdirs, report their specific --help.
-- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d "$ac_dir" ||
-- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-- continue
-- ac_builddir=.
--
--case "$ac_dir" in
--.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
--*)
-- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-- case $ac_top_builddir_sub in
-- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-- esac ;;
--esac
--ac_abs_top_builddir=$ac_pwd
--ac_abs_builddir=$ac_pwd$ac_dir_suffix
--# for backward compatibility:
--ac_top_builddir=$ac_top_build_prefix
++
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
@@ -9480,20 +9159,7 @@
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-
--case $srcdir in
-- .) # We are building in place.
-- ac_srcdir=.
-- ac_top_srcdir=$ac_top_builddir_sub
-- ac_abs_top_srcdir=$ac_pwd ;;
-- [\\/]* | ?:[\\/]* ) # Absolute name.
-- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir
-- ac_abs_top_srcdir=$srcdir ;;
-- *) # Relative name.
-- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_build_prefix$srcdir
-- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
@@ -9520,22 +9186,7 @@
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
- esac
--ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
--
-- cd "$ac_dir" || { ac_status=$?; continue; }
-- # Check for guested configure.
-- if test -f "$ac_srcdir/configure.gnu"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-- elif test -f "$ac_srcdir/configure"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure" --help=recursive
-- else
-- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi || ac_status=$?
-- cd "$ac_pwd" || { ac_status=$?; break; }
-- done
++esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -9546,20 +9197,11 @@
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
- fi
++fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
-- cat <<\_ACEOF
--evolution-mapi configure 0.28.1
--generated by GNU Autoconf 2.63
++
+} # ac_fn_c_check_header_mongrel
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
++
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
@@ -9576,15 +9218,14 @@
+/* end confdefs.h. */
+$4
+#include <$2>
- _ACEOF
-- exit
++_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -9595,13 +9236,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by evolution-mapi $as_me 0.28.1, which was
+ It was created by evolution-mapi $as_me 0.28.3, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1858,8 +2151,8 @@ for as_dir in $PATH
+@@ -1858,8 +2163,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9612,7 +9253,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1896,9 +2189,9 @@ do
+@@ -1896,9 +2201,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -9624,7 +9265,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1914,13 +2207,13 @@ do
+@@ -1914,13 +2219,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -9641,7 +9282,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1945,13 +2238,13 @@ _ASBOX
+@@ -1945,13 +2250,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -9657,7 +9298,7 @@
esac ;;
esac
done
-@@ -2023,39 +2316,41 @@ _ASBOX
+@@ -2023,39 +2328,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -9704,7 +9345,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2073,8 +2368,8 @@ fi
+@@ -2073,8 +2380,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -9715,7 +9356,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2082,10 +2377,10 @@ $as_echo "$as_me: loading site script $a
+@@ -2082,10 +2389,10 @@
done
if test -r "$cache_file"; then
@@ -9730,7 +9371,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2093,7 +2388,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2093,7 +2400,7 @@
esac
fi
else
@@ -9739,7 +9380,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2108,11 +2403,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2108,11 +2415,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -9753,7 +9394,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2122,17 +2417,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2122,17 +2429,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -9775,7 +9416,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2144,43 +2439,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2144,43 +2451,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -9826,7 +9467,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2193,24 +2465,16 @@ am__api_version='1.11'
+@@ -2193,24 +2477,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -9859,7 +9500,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2236,10 +2500,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2236,10 +2512,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -9872,7 +9513,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2247,11 +2511,11 @@ for as_dir in $PATH
+@@ -2247,11 +2523,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9888,7 +9529,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2288,7 +2552,7 @@ case $as_dir/ in
+@@ -2288,7 +2564,7 @@
;;
esac
@@ -9897,7 +9538,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2304,7 +2568,7 @@ fi
+@@ -2304,7 +2580,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -9906,7 +9547,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2315,7 +2579,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2315,7 +2591,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -9915,7 +9556,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2326,15 +2590,11 @@ am_lf='
+@@ -2326,15 +2602,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -9933,7 +9574,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2356,11 +2616,8 @@ if (
+@@ -2356,11 +2628,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -9947,7 +9588,7 @@
fi
test "$2" = conftest.file
-@@ -2369,13 +2626,10 @@ then
+@@ -2369,13 +2638,10 @@
# Ok.
:
else
@@ -9964,7 +9605,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2403,7 +2657,7 @@ if eval "$MISSING --run true"; then
+@@ -2403,7 +2669,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -9973,7 +9614,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2424,9 +2678,9 @@ if test "$cross_compiling" != no; then
+@@ -2424,9 +2690,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9985,7 +9626,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2437,24 +2691,24 @@ for as_dir in $PATH
+@@ -2437,24 +2703,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10015,7 +9656,7 @@
$as_echo "no" >&6; }
fi
-@@ -2464,9 +2718,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2464,9 +2730,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -10027,7 +9668,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2477,24 +2731,24 @@ for as_dir in $PATH
+@@ -2477,24 +2743,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10057,7 +9698,7 @@
$as_echo "no" >&6; }
fi
-@@ -2503,7 +2757,7 @@ fi
+@@ -2503,7 +2769,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10066,7 +9707,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2516,10 +2770,10 @@ fi
+@@ -2516,10 +2782,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -10079,7 +9720,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2527,7 +2781,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2527,7 +2793,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10088,7 +9729,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2539,11 +2793,12 @@ do
+@@ -2539,11 +2805,12 @@
esac
done
done
@@ -10102,7 +9743,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2551,11 +2806,10 @@ fi
+@@ -2551,11 +2818,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -10115,7 +9756,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2568,9 +2822,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2568,9 +2834,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -10127,7 +9768,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2581,24 +2835,24 @@ for as_dir in $PATH
+@@ -2581,24 +2847,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10157,7 +9798,7 @@
$as_echo "no" >&6; }
fi
-@@ -2606,11 +2860,11 @@ fi
+@@ -2606,11 +2872,11 @@
test -n "$AWK" && break
done
@@ -10171,7 +9812,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2628,11 +2882,11 @@ esac
+@@ -2628,11 +2894,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -10185,7 +9826,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2652,9 +2906,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2652,9 +2918,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -10196,7 +9837,7 @@
fi
fi
-@@ -2725,7 +2977,7 @@ EDS_PACKAGE=1.2
+@@ -2725,7 +2989,7 @@
# Check whether --enable-silent-rules was given.
@@ -10205,7 +9846,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2738,16 +2990,16 @@ AM_BACKSLASH='\'
+@@ -2738,16 +3002,16 @@
@@ -10225,7 +9866,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2769,9 +3021,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2769,9 +3033,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -10237,7 +9878,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2782,24 +3034,24 @@ for as_dir in $PATH
+@@ -2782,24 +3046,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10267,7 +9908,7 @@
$as_echo "no" >&6; }
fi
-@@ -2809,9 +3061,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2809,9 +3073,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -10279,7 +9920,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2822,24 +3074,24 @@ for as_dir in $PATH
+@@ -2822,24 +3086,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10309,7 +9950,7 @@
$as_echo "no" >&6; }
fi
-@@ -2848,7 +3100,7 @@ fi
+@@ -2848,7 +3112,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10318,7 +9959,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2862,9 +3114,9 @@ if test -z "$CC"; then
+@@ -2862,9 +3126,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -10330,7 +9971,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2875,24 +3127,24 @@ for as_dir in $PATH
+@@ -2875,24 +3139,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10360,7 +10001,7 @@
$as_echo "no" >&6; }
fi
-@@ -2902,9 +3154,9 @@ fi
+@@ -2902,9 +3166,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -10372,7 +10013,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2916,18 +3168,18 @@ for as_dir in $PATH
+@@ -2916,18 +3180,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10394,7 +10035,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -2946,10 +3198,10 @@ fi
+@@ -2946,10 +3210,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -10407,7 +10048,7 @@
$as_echo "no" >&6; }
fi
-@@ -2961,9 +3213,9 @@ if test -z "$CC"; then
+@@ -2961,9 +3225,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -10419,7 +10060,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2974,24 +3226,24 @@ for as_dir in $PATH
+@@ -2974,24 +3238,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10449,7 +10090,7 @@
$as_echo "no" >&6; }
fi
-@@ -3005,9 +3257,9 @@ if test -z "$CC"; then
+@@ -3005,9 +3269,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -10461,7 +10102,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3018,24 +3270,24 @@ for as_dir in $PATH
+@@ -3018,24 +3282,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10491,7 +10132,7 @@
$as_echo "no" >&6; }
fi
-@@ -3048,7 +3300,7 @@ done
+@@ -3048,7 +3312,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10500,7 +10141,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3059,57 +3311,37 @@ fi
+@@ -3059,57 +3323,37 @@
fi
@@ -10521,14 +10162,19 @@
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
@@ -10543,19 +10189,14 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
@@ -10578,7 +10219,7 @@
/* end confdefs.h. */
int
-@@ -3125,8 +3357,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -3125,8 +3369,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -10589,7 +10230,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3142,17 +3374,17 @@ do
+@@ -3142,17 +3386,17 @@
done
rm -f $ac_rmfiles
@@ -10612,7 +10253,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3169,7 +3401,7 @@ do
+@@ -3169,7 +3413,7 @@
# certainly right.
break;;
*.* )
@@ -10621,7 +10262,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3188,84 +3420,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3188,84 +3432,42 @@
else
ac_file=''
fi
@@ -10727,23 +10368,32 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3280,32 +3470,83 @@ for ac_file in conftest.exe conftest con
+@@ -3280,32 +3482,83 @@
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
-+fi
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
@@ -10791,29 +10441,16 @@
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-
--rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--$as_echo "$ac_cv_exeext" >&6; }
--
--rm -f conftest.$ac_ext
--EXEEXT=$ac_cv_exeext
--ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
@@ -10831,7 +10468,7 @@
/* end confdefs.h. */
int
-@@ -3317,17 +3558,17 @@ main ()
+@@ -3317,17 +3570,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -10854,7 +10491,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3340,31 +3581,23 @@ else
+@@ -3340,31 +3593,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10893,7 +10530,7 @@
/* end confdefs.h. */
int
-@@ -3378,37 +3611,16 @@ main ()
+@@ -3378,37 +3623,16 @@
return 0;
}
_ACEOF
@@ -10934,7 +10571,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3417,20 +3629,16 @@ else
+@@ -3417,20 +3641,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -10958,7 +10595,7 @@
/* end confdefs.h. */
int
-@@ -3441,35 +3649,11 @@ main ()
+@@ -3441,35 +3661,11 @@
return 0;
}
_ACEOF
@@ -10997,7 +10634,7 @@
/* end confdefs.h. */
int
-@@ -3480,36 +3664,12 @@ main ()
+@@ -3480,36 +3676,12 @@
return 0;
}
_ACEOF
@@ -11038,7 +10675,7 @@
/* end confdefs.h. */
int
-@@ -3520,42 +3680,17 @@ main ()
+@@ -3520,42 +3692,17 @@
return 0;
}
_ACEOF
@@ -11083,7 +10720,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3572,18 +3707,14 @@ else
+@@ -3572,18 +3719,14 @@
CFLAGS=
fi
fi
@@ -11105,7 +10742,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3640,32 +3771,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3640,32 +3783,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -11139,7 +10776,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3676,17 +3784,19 @@ fi
+@@ -3676,17 +3796,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -11162,7 +10799,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3705,7 +3815,7 @@ am__doit:
+@@ -3705,7 +3827,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -11171,7 +10808,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3733,12 +3843,12 @@ if test "$am__include" = "#"; then
+@@ -3733,12 +3855,12 @@
fi
@@ -11186,7 +10823,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3758,9 +3868,9 @@ fi
+@@ -3758,9 +3880,9 @@
depcc="$CC" am_compiler_list=
@@ -11198,7 +10835,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3868,7 +3978,7 @@ else
+@@ -3868,7 +3990,7 @@
fi
fi
@@ -11207,7 +10844,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3888,14 +3998,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -3888,14 +4010,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -11224,7 +10861,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -3910,11 +4020,7 @@ do
+@@ -3910,11 +4032,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -11237,7 +10874,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -3923,78 +4029,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -3923,78 +4041,34 @@
#endif
Syntax error
_ACEOF
@@ -11321,7 +10958,7 @@
break
fi
-@@ -4006,7 +4068,7 @@ fi
+@@ -4006,7 +4080,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -11330,7 +10967,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4017,11 +4079,7 @@ do
+@@ -4017,11 +4091,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -11343,7 +10980,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4030,87 +4088,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4030,87 +4100,40 @@
#endif
Syntax error
_ACEOF
@@ -11440,7 +11077,7 @@
fi
ac_ext=c
-@@ -4120,18 +4131,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4120,18 +4143,14 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -11462,7 +11099,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -4140,41 +4147,17 @@ $ac_kw foo_t foo () {return 0; }
+@@ -4140,41 +4159,17 @@
#endif
_ACEOF
@@ -11506,18 +11143,10 @@
case $ac_cv_c_inline in
inline | yes) ;;
*)
-@@ -4182,123 +4165,31 @@ case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
-- cat >>confdefs.h <<_ACEOF
--#ifndef __cplusplus
--#define inline $ac_val
--#endif
--_ACEOF
-- ;;
--esac
--
+@@ -4190,115 +4185,23 @@
+ ;;
+ esac
+
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
@@ -11606,18 +11235,11 @@
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
--
+
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+ cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+ ;;
-+esac
-
+-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
+-
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
@@ -11642,7 +11264,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -4316,11 +4207,11 @@ esac
+@@ -4316,11 +4219,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -11656,7 +11278,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -4345,17 +4236,13 @@ fi
+@@ -4345,17 +4248,13 @@
-Wredundant-decls -Wundef -Wwrite-strings"
flags_supported=""
flags_unsupported=""
@@ -11676,7 +11298,7 @@
/* end confdefs.h. */
int
-@@ -4366,32 +4253,11 @@ main ()
+@@ -4366,32 +4265,11 @@
return 0;
}
_ACEOF
@@ -11711,7 +11333,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
-@@ -4401,10 +4267,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -4401,10 +4279,10 @@
flags_unsupported="$flags_unsupported $each"
fi
done
@@ -11724,7 +11346,7 @@
$as_echo "$as_me: WARNING: unsupported compiler flags: $flags_unsupported" >&2;}
fi
WARNING_FLAGS="$WARNING_FLAGS $flags_supported"
-@@ -4415,16 +4281,16 @@ $as_echo "$as_me: WARNING: unsupported c
+@@ -4415,16 +4293,16 @@
CFLAGS="$CFLAGS $WARNING_FLAGS"
@@ -11744,7 +11366,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -4432,35 +4298,31 @@ $as_echo "$USE_NLS" >&6; }
+@@ -4432,35 +4310,31 @@
case "$am__api_version" in
1.01234)
@@ -11786,7 +11408,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -4473,14 +4335,14 @@ for as_dir in $PATH
+@@ -4473,14 +4347,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11804,7 +11426,7 @@
IFS=$as_save_IFS
;;
-@@ -4488,19 +4350,19 @@ esac
+@@ -4488,19 +4362,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -11828,7 +11450,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -4513,14 +4375,14 @@ for as_dir in $PATH
+@@ -4513,14 +4387,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11846,7 +11468,7 @@
IFS=$as_save_IFS
;;
-@@ -4528,19 +4390,19 @@ esac
+@@ -4528,19 +4402,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -11870,7 +11492,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -4553,14 +4415,14 @@ for as_dir in $PATH
+@@ -4553,14 +4427,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11888,7 +11510,7 @@
IFS=$as_save_IFS
;;
-@@ -4568,18 +4430,16 @@ esac
+@@ -4568,18 +4442,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -11910,7 +11532,7 @@
fi
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 $< $@'
-@@ -4701,9 +4561,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -4701,9 +4573,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -11922,7 +11544,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -4716,14 +4576,14 @@ for as_dir in $PATH
+@@ -4716,14 +4588,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11940,7 +11562,7 @@
IFS=$as_save_IFS
;;
-@@ -4731,19 +4591,19 @@ esac
+@@ -4731,19 +4603,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -11964,7 +11586,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -4756,14 +4616,14 @@ for as_dir in $PATH
+@@ -4756,14 +4628,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11982,7 +11604,7 @@
IFS=$as_save_IFS
;;
-@@ -4771,19 +4631,19 @@ esac
+@@ -4771,19 +4643,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -12006,7 +11628,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -4796,14 +4656,14 @@ for as_dir in $PATH
+@@ -4796,14 +4668,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12024,7 +11646,7 @@
IFS=$as_save_IFS
;;
-@@ -4811,19 +4671,19 @@ esac
+@@ -4811,19 +4683,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -12048,7 +11670,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -4836,14 +4696,14 @@ for as_dir in $PATH
+@@ -4836,14 +4708,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12066,7 +11688,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4852,33 +4712,29 @@ esac
+@@ -4852,33 +4724,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -12106,7 +11728,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -4891,14 +4747,14 @@ for as_dir in $PATH
+@@ -4891,14 +4759,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12124,7 +11746,7 @@
IFS=$as_save_IFS
;;
-@@ -4906,41 +4762,35 @@ esac
+@@ -4906,41 +4774,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -12175,7 +11797,7 @@
fi
fi
-@@ -4950,11 +4800,7 @@ fi
+@@ -4950,11 +4812,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -12188,7 +11810,7 @@
/* end confdefs.h. */
int
-@@ -4966,120 +4812,13 @@ extern int _nl_msg_cat_cntr;
+@@ -4966,120 +4824,13 @@
return 0;
}
_ACEOF
@@ -12313,7 +11935,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -5091,10 +4830,8 @@ fi
+@@ -5091,10 +4842,8 @@
;;
esac
fi
@@ -12326,7 +11948,7 @@
fi
-@@ -5102,9 +4839,9 @@ fi
+@@ -5102,9 +4851,9 @@
@@ -12338,7 +11960,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5115,7 +4852,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5115,7 +4864,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12347,7 +11969,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -5135,7 +4872,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5135,7 +4884,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12356,7 +11978,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -5150,26 +4887,24 @@ esac
+@@ -5150,26 +4899,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -12388,7 +12010,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5183,7 +4918,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5183,7 +4930,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12397,7 +12019,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -5203,7 +4938,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -5203,7 +4950,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12406,7 +12028,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -5218,12 +4953,10 @@ esac
+@@ -5218,12 +4965,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -12421,7 +12043,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5231,21 +4964,17 @@ fi
+@@ -5231,21 +4976,17 @@
fi
fi
@@ -12447,7 +12069,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -5260,48 +4989,23 @@ main ()
+@@ -5260,48 +5001,23 @@
return 0;
}
_ACEOF
@@ -12501,7 +12123,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5311,18 +5015,14 @@ fi
+@@ -5311,18 +5027,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -12523,7 +12145,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5332,14 +5032,10 @@ fi
+@@ -5332,14 +5044,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -12540,7 +12162,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5366,273 +5062,50 @@ main ()
+@@ -5366,118 +5074,34 @@
return 0;
}
_ACEOF
@@ -12595,21 +12217,22 @@
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+ fi
+
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -12662,16 +12285,19 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5488,151 +5112,12 @@
+
+
+
-
-for ac_header in locale.h
-do
@@ -12763,26 +12389,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-+
- fi
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -12819,20 +12431,16 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+
-+
+ for ac_header in locale.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
@@ -12843,7 +12451,7 @@
_ACEOF
fi
-@@ -5640,16 +5113,12 @@ fi
+@@ -5640,16 +5125,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12863,7 +12471,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -5660,46 +5129,19 @@ return LC_MESSAGES
+@@ -5660,46 +5141,19 @@
return 0;
}
_ACEOF
@@ -12916,7 +12524,7 @@
fi
fi
-@@ -5712,155 +5154,20 @@ _ACEOF
+@@ -5712,155 +5166,20 @@
XGETTEXT=:
INTLLIBS=
@@ -13077,7 +12685,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -5873,54 +5180,25 @@ return !ngettext ("","", 1)
+@@ -5873,54 +5192,25 @@
return 0;
}
_ACEOF
@@ -13140,7 +12748,194 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -5933,141 +5211,26 @@ return !dgettext ("","")
+@@ -5929,145 +5219,30 @@
+ main ()
+ {
+ return !dgettext ("","")
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- gt_cv_func_dgettext_libc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- gt_cv_func_dgettext_libc=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+- fi
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-
+-for ac_func in bind_textdomain_codeset
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ gt_cv_func_dgettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ gt_cv_func_dgettext_libc=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
++$as_echo "$gt_cv_func_dgettext_libc" >&6; }
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ for ac_func in bind_textdomain_codeset
++do :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+
+ fi
+@@ -6082,18 +5257,14 @@
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+ $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -6111,55 +5282,26 @@
return 0;
}
_ACEOF
@@ -13166,13 +12961,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_dgettext_libc=yes
+ ac_cv_lib_intl_bindtextdomain=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- gt_cv_func_dgettext_libc=no
-+ gt_cv_func_dgettext_libc=no
+- ac_cv_lib_intl_bindtextdomain=no
++ ac_cv_lib_intl_bindtextdomain=no
fi
-
-rm -rf conftest.dSYM
@@ -13180,14 +12975,293 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
- $as_echo "$gt_cv_func_dgettext_libc" >&6; }
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -6177,55 +5319,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -6243,43 +5356,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dgettext=no
++ ac_cv_lib_intl_dgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ fi
+
+@@ -6289,22 +5377,18 @@
+
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
+ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -6322,55 +5406,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -6388,43 +5443,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dcgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dcgettext=no
++ ac_cv_lib_intl_dcgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -6446,102 +5476,12 @@
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
-
-for ac_func in bind_textdomain_codeset
-do
@@ -13282,7 +13356,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
++ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
@@ -13292,375 +13366,72 @@
_ACEOF
fi
-@@ -6082,18 +5245,14 @@ done
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
- $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+@@ -6553,169 +5493,77 @@
+ gt_cv_func_dgettext_libc=no
+ else
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+- && test "$gt_cv_func_ngettext_libc" = "yes"; then
+- gt_cv_func_dgettext_libintl=no
+- fi
+- fi
+- fi
+- fi
+-
+- if test "$gt_cv_func_dgettext_libc" = "yes" \
+- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- gt_cv_have_gettext=yes
+- fi
+-
+- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS="-lintl $libintl_extra_libs"
+- fi
+-
+- if test "$gt_cv_have_gettext" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
-_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -6111,55 +5270,26 @@ return bindtextdomain ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
+-
+- # Extract the first word of "msgfmt", so it can be a program name with args.
+-set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case "$MSGFMT" in
+- /*)
+- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+- ;;
+- *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+- break
+- fi
+- fi
+- done
+- IFS="$ac_save_ifs"
+- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+- ;;
-esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_bindtextdomain=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_bindtextdomain=no
-+ ac_cv_lib_intl_bindtextdomain=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
- $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
--if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -6177,55 +5307,26 @@ return ngettext ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
- $as_echo_n "checking for dgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -6234,52 +5335,27 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char dgettext ();
--int
--main ()
--{
--return dgettext ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+char dgettext ();
-+int
-+main ()
-+{
-+return dgettext ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dgettext=no
-+ ac_cv_lib_intl_dgettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
- $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
--if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- fi
-
-@@ -6289,22 +5365,18 @@ fi
-
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
- $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: " >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -6322,55 +5394,26 @@ return ngettext ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
- $as_echo_n "checking for dcgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -6388,43 +5431,18 @@ return dcgettext ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dcgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dcgettext=no
-+ ac_cv_lib_intl_dcgettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
- $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
- else
-@@ -6446,102 +5464,12 @@ fi
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
--
--for ac_func in bind_textdomain_codeset
+-fi
+-MSGFMT="$ac_cv_path_MSGFMT"
+-if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-$as_echo "$MSGFMT" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+- if test "$MSGFMT" != "no"; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -13738,14 +13509,58 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
+
- eval "$as_ac_var=no"
-fi
--
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ gt_cv_have_gettext=yes
++ fi
++
++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ INTLLIBS="-lintl $libintl_extra_libs"
++ fi
++
++ if test "$gt_cv_have_gettext" = "yes"; then
++
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++ # Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case "$MSGFMT" in
++ /*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
++ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
++ ;;
++esac
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -13753,144 +13568,17 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
-+do :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
-
- fi
-@@ -6571,15 +5499,13 @@ done
-
- if test "$gt_cv_have_gettext" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
--_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case "$MSGFMT" in
-@@ -6604,118 +5530,28 @@ esac
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++MSGFMT="$ac_cv_path_MSGFMT"
++if test "$MSGFMT" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "$MSGFMT" >&6; }
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
++$as_echo "no" >&6; }
++fi
++ if test "$MSGFMT" != "no"; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
+ for ac_func in dcgettext
+do :
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
@@ -13909,7 +13597,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -6730,14 +5566,14 @@ msgstr ""
+@@ -6730,14 +5578,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -13929,7 +13617,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -6745,9 +5581,9 @@ fi
+@@ -6745,9 +5593,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -13941,7 +13629,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -6760,14 +5596,14 @@ for as_dir in $PATH
+@@ -6760,14 +5608,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13959,7 +13647,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6776,19 +5612,19 @@ esac
+@@ -6776,19 +5624,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13983,7 +13671,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -6813,18 +5649,14 @@ esac
+@@ -6813,18 +5661,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -14005,7 +13693,7 @@
/* end confdefs.h. */
int
-@@ -6836,121 +5668,14 @@ extern int _nl_msg_cat_cntr;
+@@ -6836,121 +5680,14 @@
return 0;
}
_ACEOF
@@ -14131,7 +13819,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -6965,10 +5690,8 @@ fi
+@@ -6965,10 +5702,8 @@
;;
esac
fi
@@ -14144,7 +13832,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -6982,9 +5705,7 @@ fi
+@@ -6982,9 +5717,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -14155,7 +13843,7 @@
fi
-@@ -6992,7 +5713,7 @@ _ACEOF
+@@ -6992,7 +5725,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -14164,7 +13852,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -7025,7 +5746,7 @@ $as_echo "found xgettext program is not
+@@ -7025,7 +5758,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -14173,7 +13861,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -7050,7 +5771,7 @@ $as_echo_n "checking for catalogs to be
+@@ -7050,7 +5783,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -14182,7 +13870,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -7095,7 +5816,7 @@ localedir='$(prefix)/$(DATADIRNAME)/loca
+@@ -7095,7 +5828,7 @@
# Check whether --enable-static was given.
@@ -14191,7 +13879,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -7127,7 +5848,7 @@ fi
+@@ -7127,14 +5860,14 @@
case `pwd` in
*\ * | *\ *)
@@ -14200,7 +13888,16 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -7152,35 +5873,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+
+
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -7152,35 +5885,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -14243,7 +13940,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -7196,28 +5909,24 @@ IFS=$ac_save_IFS
+@@ -7196,28 +5921,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -14277,7 +13974,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -7233,9 +5942,9 @@ IFS=$ac_save_IFS
+@@ -7233,9 +5954,9 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -14289,7 +13986,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -7243,7 +5952,7 @@ else
+@@ -7243,7 +5964,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -14298,7 +13995,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -7252,7 +5961,7 @@ for as_dir in $PATH
+@@ -7252,7 +5973,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14307,7 +14004,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -7272,7 +5981,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -7272,7 +5993,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -14316,7 +14013,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -7287,19 +5996,17 @@ esac
+@@ -7287,19 +6008,17 @@
$ac_path_SED_found && break 3
done
done
@@ -14339,7 +14036,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -7317,9 +6024,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -7317,9 +6036,9 @@
@@ -14351,7 +14048,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -7333,7 +6040,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -7333,7 +6052,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14360,7 +14057,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -7353,7 +6060,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -7353,7 +6072,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -14369,7 +14066,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -7368,12 +6075,10 @@ esac
+@@ -7368,12 +6087,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -14384,7 +14081,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -7381,7 +6086,7 @@ fi
+@@ -7381,7 +6098,7 @@
fi
fi
@@ -14393,7 +14090,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -7407,7 +6112,7 @@ test -z "$GREP" && GREP=grep
+@@ -7407,7 +6124,7 @@
# Check whether --with-gnu-ld was given.
@@ -14402,7 +14099,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -7416,7 +6121,7 @@ fi
+@@ -7416,7 +6133,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -14411,7 +14108,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -7446,13 +6151,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -7446,13 +6163,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -14428,7 +14125,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -7483,18 +6188,16 @@ fi
+@@ -7483,18 +6200,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -14452,7 +14149,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -7507,7 +6210,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -7507,7 +6222,7 @@
;;
esac
fi
@@ -14461,7 +14158,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -7519,9 +6222,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -7519,9 +6234,9 @@
@@ -14473,7 +14170,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -7568,7 +6271,7 @@ else
+@@ -7568,7 +6283,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -14482,7 +14179,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -7579,9 +6282,9 @@ else
+@@ -7579,9 +6294,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -14494,7 +14191,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -7592,24 +6295,24 @@ for as_dir in $PATH
+@@ -7592,24 +6307,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14524,7 +14221,7 @@
$as_echo "no" >&6; }
fi
-@@ -7623,9 +6326,9 @@ if test -z "$DUMPBIN"; then
+@@ -7623,9 +6338,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -14536,7 +14233,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -7636,24 +6339,24 @@ for as_dir in $PATH
+@@ -7636,24 +6351,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14566,7 +14263,7 @@
$as_echo "no" >&6; }
fi
-@@ -7666,7 +6369,7 @@ done
+@@ -7666,7 +6381,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14575,7 +14272,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7686,33 +6389,33 @@ test -z "$NM" && NM=nm
+@@ -7686,33 +6401,33 @@
@@ -14589,15 +14286,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7696: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6399: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6411: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7699: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6402: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6414: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7702: output\"" >&5)
-+ (eval echo "\"\$as_me:6405: output\"" >&5)
++ (eval echo "\"\$as_me:6417: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -14617,7 +14314,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7830,10 +6533,10 @@ else
+@@ -7830,10 +6545,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -14630,7 +14327,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7847,7 +6550,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -7847,7 +6562,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -14639,7 +14336,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7857,17 +6560,17 @@ xsi_shell=no
+@@ -7857,17 +6572,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -14660,7 +14357,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7902,14 +6605,14 @@ esac
+@@ -7902,14 +6617,14 @@
@@ -14678,7 +14375,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7938,9 +6641,9 @@ esac
+@@ -7938,9 +6653,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -14690,7 +14387,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7951,24 +6654,24 @@ for as_dir in $PATH
+@@ -7951,24 +6666,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14720,7 +14417,7 @@
$as_echo "no" >&6; }
fi
-@@ -7978,9 +6681,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -7978,9 +6693,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -14732,7 +14429,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7991,24 +6694,24 @@ for as_dir in $PATH
+@@ -7991,24 +6706,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14762,7 +14459,7 @@
$as_echo "no" >&6; }
fi
-@@ -8017,7 +6720,7 @@ fi
+@@ -8017,7 +6732,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14771,7 +14468,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8037,9 +6740,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -8037,9 +6752,9 @@
@@ -14783,7 +14480,12 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -8158,7 +6861,7 @@ linux* | k*bsd*-gnu)
+@@ -8154,11 +6869,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -14792,7 +14494,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -8233,7 +6936,7 @@ tpf*)
+@@ -8233,7 +6948,7 @@
esac
fi
@@ -14801,7 +14503,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -8253,9 +6956,9 @@ test -z "$deplibs_check_method" && depli
+@@ -8253,9 +6968,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -14813,7 +14515,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -8266,24 +6969,24 @@ for as_dir in $PATH
+@@ -8266,24 +6981,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14843,7 +14545,7 @@
$as_echo "no" >&6; }
fi
-@@ -8293,9 +6996,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -8293,9 +7008,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -14855,7 +14557,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -8306,24 +7009,24 @@ for as_dir in $PATH
+@@ -8306,24 +7021,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14885,7 +14587,7 @@
$as_echo "no" >&6; }
fi
-@@ -8332,7 +7035,7 @@ fi
+@@ -8332,7 +7047,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14894,7 +14596,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8358,9 +7061,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -8358,9 +7073,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -14906,7 +14608,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -8371,24 +7074,24 @@ for as_dir in $PATH
+@@ -8371,24 +7086,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14936,7 +14638,7 @@
$as_echo "no" >&6; }
fi
-@@ -8398,9 +7101,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -8398,9 +7113,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -14948,7 +14650,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -8411,24 +7114,24 @@ for as_dir in $PATH
+@@ -8411,24 +7126,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14978,7 +14680,7 @@
$as_echo "no" >&6; }
fi
-@@ -8437,7 +7140,7 @@ fi
+@@ -8437,7 +7152,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14987,7 +14689,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8457,9 +7160,9 @@ test -z "$STRIP" && STRIP=:
+@@ -8457,9 +7172,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -14999,7 +14701,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -8470,24 +7173,24 @@ for as_dir in $PATH
+@@ -8470,24 +7185,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15029,7 +14731,7 @@
$as_echo "no" >&6; }
fi
-@@ -8497,9 +7200,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -8497,9 +7212,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -15041,7 +14743,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -8510,24 +7213,24 @@ for as_dir in $PATH
+@@ -8510,24 +7225,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15071,7 +14773,7 @@
$as_echo "no" >&6; }
fi
-@@ -8536,7 +7239,7 @@ fi
+@@ -8536,7 +7251,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15080,7 +14782,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8614,9 +7317,9 @@ compiler=$CC
+@@ -8614,9 +7329,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -15092,7 +14794,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -8732,18 +7435,18 @@ void nm_test_func(void){}
+@@ -8732,18 +7447,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -15117,7 +14819,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8796,11 +7499,11 @@ _LT_EOF
+@@ -8796,11 +7511,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -15132,7 +14834,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8834,10 +7537,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -8834,10 +7549,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -15145,7 +14847,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8863,7 +7566,7 @@ fi
+@@ -8863,7 +7578,7 @@
# Check whether --enable-libtool-lock was given.
@@ -15154,7 +14856,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8875,11 +7578,11 @@ case $host in
+@@ -8875,11 +7590,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -15169,13 +14871,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8893,12 +7596,12 @@ ia64-*-hpux*)
+@@ -8893,12 +7608,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8896 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7599 "configure"' > conftest.$ac_ext
++ echo '#line 7611 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15186,7 +14888,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8932,11 +7635,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -8932,11 +7647,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -15201,7 +14903,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8985,9 +7688,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -8985,9 +7700,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -15213,7 +14915,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8996,11 +7699,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -8996,11 +7711,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -15226,7 +14928,7 @@
/* end confdefs.h. */
int
-@@ -9011,38 +7710,13 @@ main ()
+@@ -9011,38 +7722,13 @@
return 0;
}
_ACEOF
@@ -15269,7 +14971,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -9050,7 +7724,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -9050,7 +7736,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -15278,7 +14980,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -9060,11 +7734,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -9060,11 +7746,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -15293,7 +14995,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -9090,9 +7764,9 @@ need_locks="$enable_libtool_lock"
+@@ -9090,9 +7776,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -15305,7 +15007,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -9103,24 +7777,24 @@ for as_dir in $PATH
+@@ -9103,24 +7789,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15335,7 +15037,7 @@
$as_echo "no" >&6; }
fi
-@@ -9130,9 +7804,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -9130,9 +7816,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -15347,7 +15049,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -9143,24 +7817,24 @@ for as_dir in $PATH
+@@ -9143,24 +7829,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15377,7 +15079,7 @@
$as_echo "no" >&6; }
fi
-@@ -9169,7 +7843,7 @@ fi
+@@ -9169,7 +7855,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15386,7 +15088,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9182,9 +7856,9 @@ fi
+@@ -9182,9 +7868,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -15398,7 +15100,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -9195,24 +7869,24 @@ for as_dir in $PATH
+@@ -9195,24 +7881,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15428,7 +15130,7 @@
$as_echo "no" >&6; }
fi
-@@ -9222,9 +7896,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -9222,9 +7908,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -15440,7 +15142,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -9235,24 +7909,24 @@ for as_dir in $PATH
+@@ -9235,24 +7921,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15470,7 +15172,7 @@
$as_echo "no" >&6; }
fi
-@@ -9261,7 +7935,7 @@ fi
+@@ -9261,7 +7947,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15479,7 +15181,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9274,9 +7948,9 @@ fi
+@@ -9274,9 +7960,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -15491,7 +15193,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -9287,24 +7961,24 @@ for as_dir in $PATH
+@@ -9287,24 +7973,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15521,7 +15223,7 @@
$as_echo "no" >&6; }
fi
-@@ -9314,9 +7988,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -9314,9 +8000,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -15533,7 +15235,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -9327,24 +8001,24 @@ for as_dir in $PATH
+@@ -9327,24 +8013,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15563,7 +15265,7 @@
$as_echo "no" >&6; }
fi
-@@ -9353,7 +8027,7 @@ fi
+@@ -9353,7 +8039,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15572,7 +15274,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9366,9 +8040,9 @@ fi
+@@ -9366,9 +8052,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -15584,7 +15286,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -9379,24 +8053,24 @@ for as_dir in $PATH
+@@ -9379,24 +8065,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15614,7 +15316,7 @@
$as_echo "no" >&6; }
fi
-@@ -9406,9 +8080,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -9406,9 +8092,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -15626,7 +15328,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -9419,24 +8093,24 @@ for as_dir in $PATH
+@@ -9419,24 +8105,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15656,7 +15358,7 @@
$as_echo "no" >&6; }
fi
-@@ -9445,7 +8119,7 @@ fi
+@@ -9445,7 +8131,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15665,7 +15367,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9458,9 +8132,9 @@ fi
+@@ -9458,9 +8144,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -15677,7 +15379,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -9471,24 +8145,24 @@ for as_dir in $PATH
+@@ -9471,24 +8157,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15707,7 +15409,7 @@
$as_echo "no" >&6; }
fi
-@@ -9498,9 +8172,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -9498,9 +8184,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -15719,7 +15421,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -9511,24 +8185,24 @@ for as_dir in $PATH
+@@ -9511,24 +8197,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15749,7 +15451,7 @@
$as_echo "no" >&6; }
fi
-@@ -9537,7 +8211,7 @@ fi
+@@ -9537,7 +8223,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15758,7 +15460,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9573,9 +8247,9 @@ fi
+@@ -9573,9 +8259,9 @@
@@ -15770,7 +15472,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -9600,22 +8274,18 @@ else
+@@ -9600,22 +8286,18 @@
rm -f conftest.*
fi
fi
@@ -15797,7 +15499,7 @@
/* end confdefs.h. */
int
-@@ -9626,42 +8296,17 @@ main ()
+@@ -9626,42 +8308,17 @@
return 0;
}
_ACEOF
@@ -15845,12 +15547,20 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -9698,62 +8343,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
- ;;
- esac
-
--
- for ac_header in dlfcn.h
+@@ -9690,70 +8347,21 @@
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test "$DSYMUTIL" != ":"; then
+- _lt_dsymutil='~$DSYMUTIL $lib || :'
+- else
+- _lt_dsymutil=
+- fi
+- ;;
+- esac
+-
+-
+-for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -15893,7 +15603,14 @@
-
- eval "$as_ac_Header=no"
-fi
--
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil='~$DSYMUTIL $lib || :'
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -15903,6 +15620,7 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++for ac_header in dlfcn.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
@@ -15913,7 +15631,7 @@
_ACEOF
fi
-@@ -9773,7 +8369,7 @@ done
+@@ -9773,7 +8381,7 @@
# Check whether --enable-shared was given.
@@ -15922,7 +15640,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9806,7 +8402,7 @@ fi
+@@ -9806,7 +8414,7 @@
# Check whether --with-pic was given.
@@ -15931,7 +15649,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9822,7 +8418,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -9822,7 +8430,7 @@
# Check whether --enable-fast-install was given.
@@ -15940,7 +15658,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9903,9 +8499,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -9903,9 +8511,9 @@
setopt NO_GLOB_SUBST
fi
@@ -15952,7 +15670,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9918,7 +8514,7 @@ else
+@@ -9918,7 +8526,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -15961,7 +15679,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -10011,9 +8607,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -10011,9 +8619,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -15973,7 +15691,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -10064,10 +8660,10 @@ fi
+@@ -10064,10 +8672,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -15986,7 +15704,7 @@
$as_echo "no" >&6; }
fi
-@@ -10077,9 +8673,9 @@ fi
+@@ -10077,9 +8685,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -15998,7 +15716,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -10130,10 +8726,10 @@ fi
+@@ -10130,10 +8738,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -16011,7 +15729,7 @@
$as_echo "no" >&6; }
fi
-@@ -10210,9 +8806,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -10210,9 +8818,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -16023,21 +15741,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -10228,11 +8824,11 @@ else
+@@ -10228,11 +8836,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10231: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8827: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8839: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10235: \$? = $ac_status" >&5
-+ echo "$as_me:8831: \$? = $ac_status" >&5
++ echo "$as_me:8843: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -10245,7 +8841,7 @@ else
+@@ -10245,7 +8853,7 @@
$RM conftest*
fi
@@ -16046,7 +15764,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -10265,7 +8861,7 @@ fi
+@@ -10265,7 +8873,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -16055,7 +15773,16 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -10537,7 +9133,7 @@ case $host_os in
+@@ -10397,7 +9005,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -10537,7 +9145,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -16064,7 +15791,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10549,9 +9145,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -10549,9 +9157,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -16076,21 +15803,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10567,11 +9163,11 @@ else
+@@ -10567,11 +9175,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10570: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9166: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9178: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10574: \$? = $ac_status" >&5
-+ echo "$as_me:9170: \$? = $ac_status" >&5
++ echo "$as_me:9182: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -10584,7 +9180,7 @@ else
+@@ -10584,7 +9192,7 @@
$RM conftest*
fi
@@ -16099,7 +15826,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10608,9 +9204,9 @@ fi
+@@ -10608,9 +9216,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -16111,7 +15838,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10636,7 +9232,7 @@ else
+@@ -10636,7 +9244,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -16120,7 +15847,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10651,9 +9247,9 @@ fi
+@@ -10651,9 +9259,9 @@
@@ -16132,21 +15859,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10672,11 +9268,11 @@ else
+@@ -10672,11 +9280,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10675: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9271: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9283: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10679: \$? = $ac_status" >&5
-+ echo "$as_me:9275: \$? = $ac_status" >&5
++ echo "$as_me:9287: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10698,7 +9294,7 @@ else
+@@ -10698,7 +9306,7 @@
$RM conftest*
fi
@@ -16155,7 +15882,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10706,9 +9302,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10706,9 +9314,9 @@
@@ -16167,21 +15894,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10727,11 +9323,11 @@ else
+@@ -10727,11 +9335,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10730: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9326: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9338: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10734: \$? = $ac_status" >&5
-+ echo "$as_me:9330: \$? = $ac_status" >&5
++ echo "$as_me:9342: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10753,7 +9349,7 @@ else
+@@ -10753,7 +9361,7 @@
$RM conftest*
fi
@@ -16190,7 +15917,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10762,7 +9358,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10762,7 +9370,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -16199,7 +15926,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10770,10 +9366,10 @@ $as_echo_n "checking if we can lock with
+@@ -10770,10 +9378,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -16212,7 +15939,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10786,7 +9382,7 @@ fi
+@@ -10786,7 +9394,7 @@
@@ -16221,7 +15948,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10846,6 +9442,9 @@ $as_echo_n "checking whether the $compil
+@@ -10846,6 +9454,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -16231,7 +15958,24 @@
esac
ld_shlibs=yes
-@@ -11028,7 +9627,7 @@ _LT_EOF
+@@ -10867,6 +9478,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -10958,7 +9570,7 @@
+ archive_expsym_cmds='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'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -11028,7 +9640,7 @@
fi
;;
@@ -16240,7 +15984,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -11203,6 +9802,7 @@ _LT_EOF
+@@ -11203,6 +9815,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -16248,7 +15992,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11228,11 +9828,7 @@ _LT_EOF
+@@ -11228,11 +9841,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -16261,7 +16005,7 @@
/* end confdefs.h. */
int
-@@ -11243,27 +9839,7 @@ main ()
+@@ -11243,27 +9852,7 @@
return 0;
}
_ACEOF
@@ -16290,7 +16034,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -11277,16 +9853,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -11277,16 +9866,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -16309,7 +16053,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11299,11 +9868,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11299,11 +9881,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -16322,7 +16066,7 @@
/* end confdefs.h. */
int
-@@ -11314,27 +9879,7 @@ main ()
+@@ -11314,27 +9892,7 @@
return 0;
}
_ACEOF
@@ -16351,7 +16095,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -11348,16 +9893,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -11348,16 +9906,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -16370,7 +16114,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11569,42 +10107,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11569,42 +10120,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -16418,7 +16162,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11617,7 +10129,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11617,7 +10142,7 @@
link_all_deplibs=yes
;;
@@ -16427,7 +16171,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11860,7 +10372,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11860,7 +10385,7 @@
fi
fi
@@ -16436,7 +16180,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11897,16 +10409,16 @@ x|xyes)
+@@ -11897,16 +10422,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -16457,7 +16201,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11920,11 +10432,11 @@ $as_echo_n "checking whether -lc should
+@@ -11920,11 +10445,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -16472,7 +16216,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11935,7 +10447,7 @@ $as_echo_n "checking whether -lc should
+@@ -11935,7 +10460,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -16481,7 +16225,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -12099,7 +10611,7 @@ esac
+@@ -12099,7 +10624,7 @@
@@ -16490,7 +16234,16 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -12521,11 +11033,7 @@ linux* | k*bsd*-gnu)
+@@ -12507,7 +11032,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -12521,11 +11046,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -16503,7 +16256,7 @@
/* end confdefs.h. */
int
-@@ -12536,41 +11044,13 @@ main ()
+@@ -12536,41 +11057,13 @@
return 0;
}
_ACEOF
@@ -16549,7 +16302,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12594,6 +11074,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12594,6 +11087,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16568,7 +16321,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12782,7 +11274,7 @@ uts4*)
+@@ -12782,7 +11287,7 @@
dynamic_linker=no
;;
esac
@@ -16577,7 +16330,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12884,7 +11376,7 @@ fi
+@@ -12884,7 +11389,7 @@
@@ -16586,7 +16339,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12909,7 +11401,7 @@ else
+@@ -12909,7 +11414,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -16595,7 +16348,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12954,111 +11446,15 @@ else
+@@ -12954,18 +11459,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16613,7 +16366,91 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12983,43 +11484,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -13032,106 +11508,18 @@
+ ;;
+
+ *)
+- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+-$as_echo_n "checking for shl_load... " >&6; }
+-if test "${ac_cv_func_shl_load+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shl_load (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -16621,11 +16458,18 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char dlopen ();
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
-int
-main ()
-{
--return dlopen ();
+-return shl_load ();
- ;
- return 0;
-}
@@ -16651,144 +16495,21 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dl_dlopen=yes
+- ac_cv_func_shl_load=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_dl_dlopen=no
+- ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
--
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
--
--fi
--
-- ;;
--
-- *)
-- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
--if test "${ac_cv_func_shl_load+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shl_load (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shl_load
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -13066,72 +11462,51 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_shl_load || defined __stub___shl_load
--choke me
--#endif
--
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-+
-+ ;;
-+
-+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load"
@@ -16811,7 +16532,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13149,145 +11524,32 @@ return shl_load ();
+@@ -13149,145 +11537,32 @@
return 0;
}
_ACEOF
@@ -16968,7 +16689,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13305,57 +11567,28 @@ return dlopen ();
+@@ -13305,57 +11580,28 @@
return 0;
}
_ACEOF
@@ -17035,7 +16756,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13373,57 +11606,28 @@ return dlopen ();
+@@ -13373,57 +11619,28 @@
return 0;
}
_ACEOF
@@ -17102,7 +16823,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13441,43 +11645,18 @@ return dld_link ();
+@@ -13441,43 +11658,18 @@
return 0;
}
_ACEOF
@@ -17152,7 +16873,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -13516,9 +11695,9 @@ fi
+@@ -13516,9 +11708,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -17164,16 +16885,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13527,7 +11706,7 @@ else
+@@ -13527,7 +11719,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13530 "configure"
-+#line 11709 "configure"
++#line 11722 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13586,11 +11765,11 @@ int main ()
+@@ -13586,11 +11778,11 @@
return status;
}
_LT_EOF
@@ -17188,7 +16909,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13607,14 +11786,14 @@ rm -fr conftest*
+@@ -13607,14 +11799,14 @@
fi
@@ -17206,16 +16927,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13623,7 +11802,7 @@ else
+@@ -13623,7 +11815,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13626 "configure"
-+#line 11805 "configure"
++#line 11818 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13682,11 +11861,11 @@ int main ()
+@@ -13682,11 +11874,11 @@
return status;
}
_LT_EOF
@@ -17230,7 +16951,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13703,7 +11882,7 @@ rm -fr conftest*
+@@ -13703,7 +11895,7 @@
fi
@@ -17239,7 +16960,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13742,12 +11921,12 @@ fi
+@@ -13742,12 +11934,12 @@
striplib=
old_striplib=
@@ -17254,7 +16975,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13756,15 +11935,15 @@ else
+@@ -13756,15 +11948,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -17273,7 +16994,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13782,12 +11961,12 @@ fi
+@@ -13782,12 +11974,12 @@
# Report which library types will actually be built
@@ -17289,7 +17010,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13808,14 +11987,14 @@ $as_echo_n "checking whether to build sh
+@@ -13808,14 +12000,14 @@
fi
;;
esac
@@ -17307,7 +17028,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13857,9 +12036,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -13857,9 +12049,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -17319,7 +17040,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13872,14 +12051,14 @@ for as_dir in $PATH
+@@ -13872,14 +12064,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -17337,7 +17058,7 @@
IFS=$as_save_IFS
;;
-@@ -13887,10 +12066,10 @@ esac
+@@ -13887,10 +12079,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -17350,7 +17071,7 @@
$as_echo "no" >&6; }
fi
-@@ -13900,9 +12079,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -13900,9 +12092,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -17362,7 +17083,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13915,14 +12094,14 @@ for as_dir in $PATH
+@@ -13915,14 +12107,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -17380,7 +17101,7 @@
IFS=$as_save_IFS
;;
-@@ -13930,10 +12109,10 @@ esac
+@@ -13930,10 +12122,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -17393,7 +17114,7 @@
$as_echo "no" >&6; }
fi
-@@ -13942,7 +12121,7 @@ fi
+@@ -13942,7 +12134,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -17402,7 +17123,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13955,13 +12134,13 @@ fi
+@@ -13955,13 +12147,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -17419,7 +17140,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13970,40 +12149,44 @@ fi
+@@ -13970,40 +12162,44 @@
pkg_failed=no
@@ -17483,7 +17204,7 @@
fi
-@@ -14016,25 +12199,14 @@ else
+@@ -14016,25 +12212,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17512,7 +17233,7 @@
$EVOLUTION_DATA_SERVER_PKG_ERRORS
-@@ -14044,22 +12216,11 @@ installed software in a non-standard pre
+@@ -14044,22 +12229,11 @@
Alternatively, you may set the environment variables EVOLUTION_DATA_SERVER_CFLAGS
and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17538,7 +17259,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14068,51 +12229,54 @@ and EVOLUTION_DATA_SERVER_LIBS to avoid
+@@ -14068,51 +12242,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -17615,7 +17336,7 @@
fi
-@@ -14125,25 +12289,14 @@ else
+@@ -14125,25 +12302,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17644,7 +17365,7 @@
$LIBEDATASERVER_PKG_ERRORS
-@@ -14153,22 +12306,11 @@ installed software in a non-standard pre
+@@ -14153,22 +12319,11 @@
Alternatively, you may set the environment variables LIBEDATASERVER_CFLAGS
and LIBEDATASERVER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17670,7 +17391,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14177,51 +12319,54 @@ and LIBEDATASERVER_LIBS to avoid the nee
+@@ -14177,51 +12332,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -17747,7 +17468,7 @@
fi
-@@ -14234,25 +12379,14 @@ else
+@@ -14234,25 +12392,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17776,7 +17497,7 @@
$LIBEBACKEND_PKG_ERRORS
-@@ -14262,22 +12396,11 @@ installed software in a non-standard pre
+@@ -14262,12 +12409,11 @@
Alternatively, you may set the environment variables LIBEBACKEND_CFLAGS
and LIBEBACKEND_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17788,6 +17509,16 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -14276,61 +12422,54 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
@@ -17796,16 +17527,6 @@
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -14286,51 +12409,54 @@ and LIBEBACKEND_LIBS to avoid the need t
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -17879,7 +17600,7 @@
fi
-@@ -14343,14 +12469,14 @@ else
+@@ -14343,25 +12482,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -17893,25 +17614,25 @@
echo "$LIBECAL_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libecal-$EDS_PACKAGE >= 2.27.2) were not met:
+-
+-$LIBECAL_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables LIBECAL_CFLAGS
+-and LIBECAL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libecal-$EDS_PACKAGE >= 2.27.2) were not met:
+ as_fn_error "Package requirements (libecal-$EDS_PACKAGE >= 2.27.2) were not met:
$LIBECAL_PKG_ERRORS
-@@ -14360,33 +12486,11 @@ installed software in a non-standard pre
+@@ -14371,22 +12499,11 @@
Alternatively, you may set the environment variables LIBECAL_CFLAGS
and LIBECAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (libecal-$EDS_PACKAGE >= 2.27.2) were not met:
--
--$LIBECAL_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables LIBECAL_CFLAGS
--and LIBECAL_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -17934,7 +17655,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14395,51 +12499,54 @@ and LIBECAL_LIBS to avoid the need to ca
+@@ -14395,51 +12512,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18011,7 +17732,7 @@
fi
-@@ -14452,25 +12559,14 @@ else
+@@ -14452,25 +12572,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18040,7 +17761,7 @@
$LIBEDATACAL_PKG_ERRORS
-@@ -14480,22 +12576,11 @@ installed software in a non-standard pre
+@@ -14480,22 +12589,11 @@
Alternatively, you may set the environment variables LIBEDATACAL_CFLAGS
and LIBEDATACAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18066,7 +17787,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14504,51 +12589,54 @@ and LIBEDATACAL_LIBS to avoid the need t
+@@ -14504,51 +12602,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18143,7 +17864,7 @@
fi
-@@ -14561,25 +12649,14 @@ else
+@@ -14561,25 +12662,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18172,7 +17893,7 @@
$LIBBOOK_PKG_ERRORS
-@@ -14589,22 +12666,11 @@ installed software in a non-standard pre
+@@ -14589,22 +12679,11 @@
Alternatively, you may set the environment variables LIBBOOK_CFLAGS
and LIBBOOK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18198,7 +17919,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14613,51 +12679,54 @@ and LIBBOOK_LIBS to avoid the need to ca
+@@ -14613,51 +12692,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18275,7 +17996,7 @@
fi
-@@ -14670,25 +12739,14 @@ else
+@@ -14670,25 +12752,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18304,7 +18025,7 @@
$LIBEDATABOOK_PKG_ERRORS
-@@ -14698,22 +12756,11 @@ installed software in a non-standard pre
+@@ -14698,22 +12769,11 @@
Alternatively, you may set the environment variables LIBEDATABOOK_CFLAGS
and LIBEDATABOOK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18330,7 +18051,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14722,51 +12769,54 @@ and LIBEDATABOOK_LIBS to avoid the need
+@@ -14722,51 +12782,54 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18407,7 +18128,7 @@
fi
-@@ -14779,25 +12829,14 @@ else
+@@ -14779,25 +12842,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18436,7 +18157,7 @@
$CAMEL_PKG_ERRORS
-@@ -14807,22 +12846,11 @@ installed software in a non-standard pre
+@@ -14807,22 +12859,11 @@
Alternatively, you may set the environment variables CAMEL_CFLAGS
and CAMEL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18462,7 +18183,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14831,52 +12859,55 @@ and CAMEL_LIBS to avoid the need to call
+@@ -14831,52 +12872,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -18540,7 +18261,7 @@
fi
-@@ -14889,25 +12920,14 @@ else
+@@ -14889,25 +12933,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18569,7 +18290,7 @@
$EVOLUTION_PLUGIN_PKG_ERRORS
-@@ -14917,12 +12937,11 @@ installed software in a non-standard pre
+@@ -14917,22 +12950,11 @@
Alternatively, you may set the environment variables EVOLUTION_PLUGIN_CFLAGS
and EVOLUTION_PLUGIN_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -18581,24 +18302,24 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_PLUGIN_CFLAGS
+-and EVOLUTION_PLUGIN_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14931,22 +12950,11 @@ and EVOLUTION_PLUGIN_LIBS to avoid the n
+@@ -14941,12 +12963,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables EVOLUTION_PLUGIN_CFLAGS
--and EVOLUTION_PLUGIN_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -18610,7 +18331,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14954,40 +12962,44 @@ fi
+@@ -14954,40 +12975,44 @@
pkg_failed=no
@@ -18674,7 +18395,7 @@
fi
-@@ -15000,26 +13012,22 @@ else
+@@ -15000,26 +13025,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -18707,144 +18428,136 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15056,141 +13064,13 @@ edataserver_privincludedir=`$PKG_CONFIG
- libmapi_ldif_dir=`$PKG_CONFIG --variable=datadir libmapi`/setup
-
-
--mapidatadir=`$PKG_CONFIG --variable=privdatadir evolution-data-server-$EDS_PACKAGE`/mapi
--
--
--
--
-- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
--set dummy gtkdoc-check; ac_word=$2
+@@ -15063,9 +13084,9 @@
+
+ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+ set dummy gtkdoc-check; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_CHECK in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_CHECK in
+@@ -15078,14 +13099,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15093,10 +13114,10 @@
+ fi
+ GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+ if test -n "$GTKDOC_CHECK"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+ $as_echo "$GTKDOC_CHECK" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -15105,9 +13126,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_REBASE in
+@@ -15120,14 +13141,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
-done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
--if test -n "$GTKDOC_CHECK"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
--$as_echo "$GTKDOC_CHECK" >&6; }
--else
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15135,10 +13156,10 @@
+ fi
+ GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
+ if test -n "$GTKDOC_REBASE"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
+ $as_echo "$GTKDOC_REBASE" >&6; }
+ else
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- for ac_prog in gtkdoc-rebase
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -15149,9 +13170,9 @@
+
+ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+ set dummy gtkdoc-mkpdf; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_REBASE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_MKPDF in
+@@ -15164,14 +13185,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
-done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
--if test -n "$GTKDOC_REBASE"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
--$as_echo "$GTKDOC_REBASE" >&6; }
--else
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -15179,10 +13200,10 @@
+ fi
+ GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+ if test -n "$GTKDOC_MKPDF"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
+ $as_echo "$GTKDOC_MKPDF" >&6; }
+ else
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- test -n "$GTKDOC_REBASE" && break
--done
--test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
--
-- # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
--set dummy gtkdoc-mkpdf; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_MKPDF in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
--if test -n "$GTKDOC_MKPDF"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
--$as_echo "$GTKDOC_MKPDF" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-+mapidatadir=`$PKG_CONFIG --variable=privdatadir evolution-data-server-$EDS_PACKAGE`/mapi
-+
-+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -15190,7 +13211,7 @@
# Check whether --with-html-dir was given.
@@ -18853,7 +18566,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -15200,7 +13080,7 @@ fi
+@@ -15200,7 +13221,7 @@
# Check whether --enable-gtk-doc was given.
@@ -18862,7 +18575,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -15209,42 +13089,66 @@ fi
+@@ -15209,33 +13230,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -18879,7 +18592,7 @@
- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" >&5
-$as_echo "$as_me: error: You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "You need to have gtk-doc >= 1.9 installed to build gtk-doc" "$LINENO" 5
++ as_fn_error "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5
fi
fi
@@ -18890,104 +18603,21 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
$as_echo "$enable_gtk_doc" >&6; }
-- # Check whether --enable-gtk-doc-html was given.
+ # Check whether --enable-gtk-doc-html was given.
-if test "${enable_gtk_doc_html+set}" = set; then
-- enableval=$enable_gtk_doc_html;
-+ for ac_prog in gtkdoc-check
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
-- enable_gtk_doc_html=yes
--fi
-+ case $GTKDOC_CHECK in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
-- # Check whether --enable-gtk-doc-pdf was given.
++if test "${enable_gtk_doc_html+set}" = set; then :
+ enableval=$enable_gtk_doc_html;
+ else
+ enable_gtk_doc_html=yes
+ fi
+
+ # Check whether --enable-gtk-doc-pdf was given.
-if test "${enable_gtk_doc_pdf+set}" = set; then
-- enableval=$enable_gtk_doc_pdf;
-+ ;;
-+esac
-+fi
-+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-+if test -n "$GTKDOC_CHECK"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-+$as_echo "$GTKDOC_CHECK" >&6; }
- else
-- enable_gtk_doc_pdf=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
-
-- if test -z "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
-+ test -n "$GTKDOC_CHECK" && break
-+done
-
-
- if test x$enable_gtk_doc = xyes; then
-@@ -15255,22 +13159,6 @@ else
- ENABLE_GTK_DOC_FALSE=
- fi
-
-- if test x$enable_gtk_doc_html = xyes; then
-- GTK_DOC_BUILD_HTML_TRUE=
-- GTK_DOC_BUILD_HTML_FALSE='#'
--else
-- GTK_DOC_BUILD_HTML_TRUE='#'
-- GTK_DOC_BUILD_HTML_FALSE=
--fi
--
-- if test x$enable_gtk_doc_pdf = xyes; then
-- GTK_DOC_BUILD_PDF_TRUE=
-- GTK_DOC_BUILD_PDF_FALSE='#'
--else
-- GTK_DOC_BUILD_PDF_TRUE='#'
-- GTK_DOC_BUILD_PDF_FALSE=
--fi
--
- if test -n "$LIBTOOL"; then
- GTK_DOC_USE_LIBTOOL_TRUE=
- GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -15279,14 +13167,6 @@ else
- GTK_DOC_USE_LIBTOOL_FALSE=
- fi
-
-- if test -n "$GTKDOC_REBASE"; then
-- GTK_DOC_USE_REBASE_TRUE=
-- GTK_DOC_USE_REBASE_FALSE='#'
--else
-- GTK_DOC_USE_REBASE_TRUE='#'
-- GTK_DOC_USE_REBASE_FALSE=
--fi
--
-
-
- ac_config_files="$ac_config_files Makefile src/Makefile src/account-setup-eplugin/Makefile src/addressbook/Makefile src/calendar/Makefile src/camel/Makefile src/libexchangemapi/Makefile src/libexchangemapi/libexchangemapi-1.0.pc:src/libexchangemapi/libexchangemapi.pc.in po/Makefile.in"
-@@ -15318,13 +13198,13 @@ _ACEOF
++if test "${enable_gtk_doc_pdf+set}" = set; then :
+ enableval=$enable_gtk_doc_pdf;
+ else
+ enable_gtk_doc_pdf=no
+@@ -15318,13 +13337,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -19003,7 +18633,7 @@
esac ;;
esac
done
-@@ -15332,8 +13212,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -15332,8 +13351,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -19014,7 +18644,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -15356,11 +13236,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -15356,11 +13375,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -19028,7 +18658,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -15380,8 +13260,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -15380,8 +13399,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -19039,7 +18669,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -15397,73 +13277,38 @@ else
+@@ -15397,73 +13416,50 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -19079,21 +18709,25 @@
-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
@@ -19102,14 +18736,16 @@
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -19126,7 +18762,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -15473,17 +13318,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -15473,17 +13469,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -19152,7 +18788,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -15491,23 +13337,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -15491,23 +13488,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -19181,7 +18817,7 @@
as_nl='
'
export as_nl
-@@ -15515,7 +13353,13 @@ export as_nl
+@@ -15515,7 +13504,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -19196,7 +18832,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -15526,7 +13370,7 @@ else
+@@ -15526,7 +13521,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -19205,7 +18841,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -15549,13 +13393,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -15549,13 +13544,6 @@
}
fi
@@ -19219,7 +18855,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -15565,15 +13402,15 @@ fi
+@@ -15565,15 +13553,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -19238,7 +18874,7 @@
IFS=$as_save_IFS
;;
-@@ -15585,12 +13422,16 @@ if test "x$as_myself" = x; then
+@@ -15585,12 +13573,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -19259,7 +18895,7 @@
done
PS1='$ '
PS2='> '
-@@ -15602,7 +13443,89 @@ export LC_ALL
+@@ -15602,7 +13594,89 @@
LANGUAGE=C
export LANGUAGE
@@ -19350,7 +18986,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -15616,8 +13539,12 @@ else
+@@ -15616,8 +13690,12 @@
as_basename=false
fi
@@ -19364,7 +19000,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -15637,76 +13564,25 @@ $as_echo X/"$0" |
+@@ -15637,76 +13715,25 @@
}
s/.*/./; q'`
@@ -19452,7 +19088,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -15735,8 +13611,56 @@ fi
+@@ -15735,8 +13762,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -19510,7 +19146,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -15755,10 +13679,10 @@ else
+@@ -15755,10 +13830,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -19523,7 +19159,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -15773,13 +13697,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -15773,13 +13848,19 @@
exec 6>&1
@@ -19539,13 +19175,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by evolution-mapi $as_me 0.28.1, which was
+ This file was extended by evolution-mapi $as_me 0.28.3, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -15811,13 +13741,15 @@ _ACEOF
+@@ -15811,13 +13892,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -19564,7 +19200,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -15836,16 +13768,17 @@ $config_headers
+@@ -15836,16 +13919,17 @@
Configuration commands:
$config_commands
@@ -19575,7 +19211,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- evolution-mapi config.status 0.28.1
+ evolution-mapi config.status 0.28.3
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -19586,7 +19222,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -15881,6 +13814,8 @@ do
+@@ -15881,6 +13965,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -19595,7 +19231,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -15888,20 +13823,19 @@ do
+@@ -15888,20 +13974,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -19620,7 +19256,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -15909,11 +13843,10 @@ Try \`$0 --help' for more information."
+@@ -15909,11 +13994,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -19635,7 +19271,7 @@
ac_need_defaults=false ;;
esac
-@@ -16235,9 +14168,7 @@ do
+@@ -16235,9 +14319,7 @@
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -19646,7 +19282,7 @@
esac
done
-@@ -16264,7 +14195,7 @@ $debug ||
+@@ -16264,7 +14346,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -19655,7 +19291,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -16275,11 +14206,7 @@ $debug ||
+@@ -16275,11 +14357,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -19668,7 +19304,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -16304,10 +14231,16 @@ else
+@@ -16304,10 +14382,16 @@
# The final `:' finishes the AND list.
ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
fi
@@ -19687,7 +19323,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -16324,9 +14257,7 @@ _ACEOF
+@@ -16324,9 +14408,7 @@
echo "_ACEOF"
} >conf$$files.sh &&
. ./conf$$files.sh ||
@@ -19698,7 +19334,7 @@
rm -f conf$$files.sh
{
-@@ -16334,24 +14265,18 @@ rm -f conf$$files.sh
+@@ -16334,24 +14416,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -19726,7 +19362,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -16373,7 +14298,7 @@ s/'"$ac_delim"'$//
+@@ -16373,7 +14449,7 @@
t delim
:nl
h
@@ -19735,7 +19371,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -16387,7 +14312,7 @@ s/.\{148\}//
+@@ -16387,7 +14463,7 @@
t nl
:delim
h
@@ -19744,7 +19380,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -16446,9 +14371,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -16446,9 +14522,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -19755,7 +19391,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -16489,9 +14412,7 @@ for ac_last_try in false false :; do
+@@ -16489,9 +14563,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -19766,7 +19402,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -16576,9 +14497,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -16576,9 +14648,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -19777,7 +19413,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -16591,9 +14510,7 @@ do
+@@ -16591,9 +14661,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -19788,7 +19424,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -16621,12 +14538,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -16621,12 +14689,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -19803,7 +19439,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -16637,7 +14552,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -16637,7 +14703,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -19812,7 +19448,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -16650,9 +14565,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -16650,9 +14716,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -19823,7 +19459,7 @@
esac
;;
esac
-@@ -16680,47 +14593,7 @@ $as_echo X"$ac_file" |
+@@ -16680,47 +14744,7 @@
q
}
s/.*/./; q'`
@@ -19872,7 +19508,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -16777,7 +14650,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -16777,7 +14801,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -19880,7 +19516,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -16787,12 +14659,11 @@ ac_sed_dataroot='
+@@ -16787,12 +14810,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -19895,7 +19531,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -16802,7 +14673,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -16802,7 +14824,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -19904,7 +19540,7 @@
esac
_ACEOF
-@@ -16836,14 +14707,12 @@ if $ac_cs_awk_getline; then
+@@ -16836,14 +14858,12 @@
else
$AWK -f "$tmp/subs.awk" | $SHELL
fi >$tmp/out \
@@ -19921,7 +19557,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -16853,9 +14722,7 @@ which seems to be undefined. Please mak
+@@ -16853,9 +14873,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -19932,7 +19568,7 @@
;;
:H)
#
-@@ -16866,25 +14733,19 @@ $as_echo "$as_me: error: could not creat
+@@ -16866,25 +14884,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -19962,7 +19598,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -16922,7 +14783,7 @@ $as_echo X"$_am_arg" |
+@@ -16922,7 +14934,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -19971,7 +19607,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -17017,47 +14878,7 @@ $as_echo X"$file" |
+@@ -17017,47 +15029,7 @@
q
}
s/.*/./; q'`
@@ -20020,7 +19656,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -17704,9 +15525,7 @@ _LT_EOF
+@@ -17704,9 +15676,7 @@
;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -20031,7 +19667,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -17729,15 +15548,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -17729,15 +15699,12 @@
done # for ac_tag
@@ -20049,7 +19685,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -17758,10 +15574,10 @@ if test "$no_create" != yes; then
+@@ -17758,10 +15725,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -20062,29 +19698,364 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: evolution-mapi-0.28.1/ltmain.sh
-===================================================================
---- evolution-mapi-0.28.1.orig/ltmain.sh 2009-12-11 12:05:17.674455521 +0100
-+++ evolution-mapi-0.28.1/ltmain.sh 2009-12-11 12:03:54.581957585 +0100
+
+--- evolution-mapi-0.28.3/INSTALL 2009-07-02 12:04:25.000000000 +0300
++++ evolution-mapi-0.28.3-relib/INSTALL 2010-03-02 22:18:30.000000000 +0200
+@@ -2,18 +2,24 @@
+ *************************
+
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+-2006, 2007 Free Software Foundation, Inc.
++2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+-This file is free documentation; the Free Software Foundation gives
+-unlimited permission to copy, distribute and modify it.
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
+
+ Basic Installation
+ ==================
+
+-Briefly, the shell commands `./configure; make; make install' should
++ Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package. The following
+ more-detailed instructions are generic; see the `README' file for
+-instructions specific to this package.
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation. It uses
+@@ -42,7 +48,7 @@
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+@@ -53,12 +59,22 @@
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+- the package.
++ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+- documentation.
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
+
+- 5. You can remove the program binaries and object files from the
++ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+@@ -67,15 +83,22 @@
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+- 6. Often, you can also type `make uninstall' to remove the installed
+- files again.
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
+
+ Compilers and Options
+ =====================
+
+-Some systems require unusual options for compilation or linking that the
+-`configure' script does not know about. Run `./configure --help' for
+-details on some of the pertinent environment variables.
++ Some systems require unusual options for compilation or linking that
++the `configure' script does not know about. Run `./configure --help'
++for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+ by setting variables in the command line or in the environment. Here
+@@ -88,25 +111,41 @@
+ Compiling For Multiple Architectures
+ ====================================
+
+-You can compile the package for more than one kind of computer at the
++ You can compile the package for more than one kind of computer at the
+ same time, by placing the object files for each architecture in their
+ own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory. After you have
+ installed the package for one architecture, use `make distclean' before
+ reconfiguring for another architecture.
+
++ On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor. Like
++this:
++
++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CPP="gcc -E" CXXCPP="g++ -E"
++
++ This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
++
+ Installation Names
+ ==================
+
+-By default, `make install' installs the package's commands under
++ By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc. You
+ can specify an installation prefix other than `/usr/local' by giving
+-`configure' the option `--prefix=PREFIX'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+@@ -117,16 +156,47 @@
+ In addition, if you use an unusual directory layout you can give
+ options like `--bindir=DIR' to specify different values for particular
+ kinds of files. Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+
+ If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+-Optional Features
+-=================
+-
+-Some packages pay attention to `--enable-FEATURE' options to
++ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+ is something like `gnu-as' or `x' (for the X Window System). The
+@@ -138,14 +208,53 @@
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
++Particular systems
++==================
++
++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
++a workaround. If GNU CC is not installed, it is therefore recommended
++to try
++
++ ./configure CC="cc"
++
++and if that doesn't work, try
++
++ ./configure CC="cc -nodtk"
++
++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
++directory contains several dysfunctional programs; working variants of
++these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
++in your `PATH', put it _after_ `/usr/bin'.
++
++ On Haiku, software installed for all users goes in `/boot/common',
++not `/usr/local'. It is recommended to use the following options:
++
++ ./configure --prefix=/boot/common
++
+ Specifying the System Type
+ ==========================
+
+-There may be some features `configure' cannot figure out automatically,
+-but needs to determine by the type of machine the package will run on.
+-Usually, assuming the package is built to be run on the _same_
+-architectures, `configure' can figure that out, but if it prints a
+-message saying it cannot guess the machine type, give it the
++ There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on. Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
+ `--build=TYPE' option. TYPE can either be a short name for the system
+ type, such as `sun4', or a canonical name which has the form:
+
+@@ -153,7 +262,8 @@
+
+ where SYSTEM can have one of these forms:
+
+- OS KERNEL-OS
++ OS
++ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+ `config.sub' isn't included in this package, then this package doesn't
+@@ -171,9 +281,9 @@
+ Sharing Defaults
+ ================
+
+-If you want to set default values for `configure' scripts to share, you
+-can create a site shell script called `config.site' that gives default
+-values for variables like `CC', `cache_file', and `prefix'.
++ If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
+ `configure' looks for `PREFIX/share/config.site' if it exists, then
+ `PREFIX/etc/config.site' if it exists. Or, you can set the
+ `CONFIG_SITE' environment variable to the location of the site script.
+@@ -182,7 +292,7 @@
+ Defining Variables
+ ==================
+
+-Variables not defined in a site shell script can be set in the
++ Variables not defined in a site shell script can be set in the
+ environment passed to `configure'. However, some packages may run
+ configure again during the build, and the customized values of these
+ variables may be lost. In order to avoid this problem, you should set
+@@ -201,11 +311,19 @@
+ `configure' Invocation
+ ======================
+
+-`configure' recognizes the following options to control how it operates.
++ `configure' recognizes the following options to control how it
++operates.
+
+ `--help'
+ `-h'
+- Print a summary of the options to `configure', and exit.
++ Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++ Print a summary of the options unique to this package's
++ `configure', and exit. The `short' variant lists options used
++ only in the top level, while the `recursive' variant lists options
++ also present in any nested packages.
+
+ `--version'
+ `-V'
+@@ -232,6 +350,16 @@
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
++`--prefix=DIR'
++ Use DIR as the installation prefix. *note Installation Names::
++ for more details, including other options available for fine-tuning
++ the installation locations.
++
++`--no-create'
++`-n'
++ Run the configure checks, but stop before creating any output
++ files.
++
+ `configure' also accepts some other, not widely useful, options. Run
+ `configure --help' for more details.
+
+
+--- evolution-mapi-0.28.3/ltmain.sh 2010-03-01 15:28:39.000000000 +0200
++++ evolution-mapi-0.28.3-relib/ltmain.sh 2010-03-02 22:18:23.000000000 +0200
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
-@@ -73,7 +73,7 @@
+@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
- package_revision=1.3012
-
-@@ -116,15 +116,15 @@ $lt_unset CDPATH
+-package_revision=1.3012
++package_revision=1.3017
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -116,15 +116,15 @@
: ${CP="cp -f"}
: ${ECHO="echo"}
@@ -20104,7 +20075,7 @@
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
-@@ -5033,7 +5033,10 @@ func_mode_link ()
+@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -20116,7 +20087,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@ func_mode_link ()
+@@ -5344,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -20146,7 +20117,7 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@ func_mode_link ()
+@@ -5893,6 +5896,7 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -20154,7 +20125,7 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -6206,6 +6210,9 @@ func_mode_link ()
+@@ -6206,6 +6210,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -20164,20 +20135,16 @@
esac
;;
no)
-Index: evolution-mapi-0.28.1/src/Makefile.in
-===================================================================
---- evolution-mapi-0.28.1.orig/src/Makefile.in 2009-12-11 12:05:17.986460045 +0100
-+++ evolution-mapi-0.28.1/src/Makefile.in 2009-12-11 12:04:39.030453286 +0100
-@@ -135,8 +135,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -190,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+--- evolution-mapi-0.28.3/Makefile.in 2010-03-01 15:28:46.000000000 +0200
++++ evolution-mapi-0.28.3-relib/Makefile.in 2010-03-02 22:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -206,6 +206,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20185,20 +20152,66 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: evolution-mapi-0.28.1/src/account-setup-eplugin/Makefile.in
-===================================================================
---- evolution-mapi-0.28.1.orig/src/account-setup-eplugin/Makefile.in 2009-12-11 12:05:18.601957070 +0100
-+++ evolution-mapi-0.28.1/src/account-setup-eplugin/Makefile.in 2009-12-11 12:04:39.198454599 +0100
-@@ -162,8 +162,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -217,6 +215,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -368,7 +369,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -393,7 +394,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -557,7 +558,8 @@
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -601,17 +603,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+
+--- evolution-mapi-0.28.3/src/account-setup-eplugin/Makefile.in 2010-03-01 15:28:45.000000000 +0200
++++ evolution-mapi-0.28.3-relib/src/account-setup-eplugin/Makefile.in 2010-03-02 22:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -217,6 +217,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20206,7 +20219,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -314,7 +313,8 @@ liborg_gnome_exchange_mapi_la_LIBADD = \
+@@ -314,7 +315,8 @@
$(EVOLUTION_PLUGIN_LIBS) \
$(CAMEL_LIBS) \
$(LIBECAL_LIBS) \
@@ -20216,20 +20229,16 @@
liborg_gnome_exchange_mapi_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_exchange_mapi_la_CFLAGS = $(LIBMAPI_CFLAGS)
-Index: evolution-mapi-0.28.1/src/addressbook/Makefile.in
-===================================================================
---- evolution-mapi-0.28.1.orig/src/addressbook/Makefile.in 2009-12-11 12:05:18.481964646 +0100
-+++ evolution-mapi-0.28.1/src/addressbook/Makefile.in 2009-12-11 12:04:39.330453627 +0100
-@@ -171,8 +171,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -226,6 +224,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+--- evolution-mapi-0.28.3/src/addressbook/Makefile.in 2010-03-01 15:28:45.000000000 +0200
++++ evolution-mapi-0.28.3-relib/src/addressbook/Makefile.in 2010-03-02 22:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -226,6 +226,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20237,20 +20246,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: evolution-mapi-0.28.1/src/calendar/Makefile.in
-===================================================================
---- evolution-mapi-0.28.1.orig/src/calendar/Makefile.in 2009-12-11 12:05:18.373964673 +0100
-+++ evolution-mapi-0.28.1/src/calendar/Makefile.in 2009-12-11 12:04:39.458454048 +0100
-@@ -157,8 +157,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -212,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+--- evolution-mapi-0.28.3/src/calendar/Makefile.in 2010-03-01 15:28:46.000000000 +0200
++++ evolution-mapi-0.28.3-relib/src/calendar/Makefile.in 2010-03-02 22:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -212,6 +212,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20258,20 +20263,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: evolution-mapi-0.28.1/src/camel/Makefile.in
-===================================================================
---- evolution-mapi-0.28.1.orig/src/camel/Makefile.in 2009-12-11 12:05:18.222462393 +0100
-+++ evolution-mapi-0.28.1/src/camel/Makefile.in 2009-12-11 12:04:39.590454073 +0100
-@@ -165,8 +165,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -220,6 +218,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+--- evolution-mapi-0.28.3/src/camel/Makefile.in 2010-03-01 15:28:46.000000000 +0200
++++ evolution-mapi-0.28.3-relib/src/camel/Makefile.in 2010-03-02 22:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -220,6 +220,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20279,20 +20280,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: evolution-mapi-0.28.1/src/libexchangemapi/Makefile.in
-===================================================================
---- evolution-mapi-0.28.1.orig/src/libexchangemapi/Makefile.in 2009-12-11 12:05:18.070460464 +0100
-+++ evolution-mapi-0.28.1/src/libexchangemapi/Makefile.in 2009-12-11 12:04:39.714454397 +0100
-@@ -166,8 +166,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -221,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+--- evolution-mapi-0.28.3/src/libexchangemapi/Makefile.in 2010-03-01 15:28:46.000000000 +0200
++++ evolution-mapi-0.28.3-relib/src/libexchangemapi/Makefile.in 2010-03-02 22:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -221,6 +221,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20300,3 +20297,38 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+
+--- evolution-mapi-0.28.3/src/Makefile.in 2010-03-01 15:28:45.000000000 +0200
++++ evolution-mapi-0.28.3-relib/src/Makefile.in 2010-03-02 22:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -190,6 +190,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -313,7 +314,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -338,7 +339,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
More information about the pkg-evolution-commits
mailing list