[Pkg-mono-svn-commits] rev 2535 - in evolution-sharp/trunk/debian:
. patches
Jose Carlos Garcia Sogo
jsogo at costa.debian.org
Wed May 3 22:01:51 UTC 2006
Author: jsogo
Date: 2006-05-03 22:01:50 +0000 (Wed, 03 May 2006)
New Revision: 2535
Removed:
evolution-sharp/trunk/debian/patches/autoreconf.dpatch
evolution-sharp/trunk/debian/patches/evolution-2.6.dpatch
evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch
Modified:
evolution-sharp/trunk/debian/changelog
evolution-sharp/trunk/debian/control
evolution-sharp/trunk/debian/patches/00list
Log:
Upstream has released a new version
+ It builds with evo 2.6, so dropping patches needed for that
+ It uses glib2.0-sharp, dropping patch
Depend on evolution 2.6 and evolution-data-server 1.6
Modified: evolution-sharp/trunk/debian/changelog
===================================================================
--- evolution-sharp/trunk/debian/changelog 2006-05-03 20:44:24 UTC (rev 2534)
+++ evolution-sharp/trunk/debian/changelog 2006-05-03 22:01:50 UTC (rev 2535)
@@ -1,30 +1,30 @@
-evolution-sharp (0.10.2-4) UNRELEASED; urgency=low
+evolution-sharp (0.11.1-1) UNRELEASED; urgency=low
+ * New upstream version.
+ + Compiles with evolution 2.6 (Closes: #362607)
+ + Works with libglib2-cil (Closes: #360054, #348662)
+
* Change maintainer to Debian Mono group.
* Add myself as uploader.
-
+
* Install GAC libraries in /usr/lib/cli/evolution-sharp-2.0, conforming
to new CLI policy 0.4.0.
* Install GAPI xml files.
-
+
* debian/rules: use dh_installcligac
* debian/installcligac: new file. Needed by dh_installcligac
* debian/patches:
+ evolution-sharp.pc: New. Update where libraries are installed.
+ fix-dllmappings: New. libevolutionglue is being installed in
/usr/lib/cli/evolution-sharp-2.0
- + fix-glibsharpglue-dllimport: New. Use libglib2.0-cil. (Closes: #360054, #348662)
- + evolution-2.6: new,
- + autoreconf: new. Both patchs make this package compile with
- evolution 2.6. (Closes: #362607)
- * debian/control:
+ * debian/control:
+ remove build-dependency in libgtkhtml3.8-dev (Closes: #348269)
+ build depend on new cli-common-dev (>= 0.4.0)
+ build depend on libevolution-dev (>= 2.6.0), and
- evolution-data-server-dev (>= 1.5.5) (Closes: #339743)
+ evolution-data-server-dev (>= 1.6.1) (Closes: #339743)
- -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 23 Apr 2006 19:35:37 +0200
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Wed, 3 May 2006 23:17:49 +0200
evolution-sharp (0.10.2-3) unstable; urgency=low
Modified: evolution-sharp/trunk/debian/control
===================================================================
--- evolution-sharp/trunk/debian/control 2006-05-03 20:44:24 UTC (rev 2534)
+++ evolution-sharp/trunk/debian/control 2006-05-03 22:01:50 UTC (rev 2535)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libgtk2.0-dev (>= 2.0.0), libgnome2.0-cil, gtk-sharp2-gapi, evolution-dev (>= 2.6.0) , evolution-data-server-dev (>= 1.5.5), cli-common-dev (>= 0.4.0), mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev (>= 1.0), mono-gac
+Build-Depends: debhelper (>= 4.0.0), dpatch, libgtk2.0-dev (>= 2.0.0), libgnome2.0-cil, gtk-sharp2-gapi, evolution-dev (>= 2.6.0) , evolution-data-server-dev (>= 1.6.1), cli-common-dev (>= 0.4.0), mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev (>= 1.0), mono-gac
Standards-Version: 3.6.2
Package: libevolution-cil
Modified: evolution-sharp/trunk/debian/patches/00list
===================================================================
--- evolution-sharp/trunk/debian/patches/00list 2006-05-03 20:44:24 UTC (rev 2534)
+++ evolution-sharp/trunk/debian/patches/00list 2006-05-03 22:01:50 UTC (rev 2535)
@@ -1,5 +1,2 @@
evolution-sharp.pc.dpatch
fix-dllmappings.dpatch
-fix-glibsharpglue-dllimport.dpatch
-evolution-2.6.dpatch
-autoreconf.dpatch
Deleted: evolution-sharp/trunk/debian/patches/autoreconf.dpatch
===================================================================
--- evolution-sharp/trunk/debian/patches/autoreconf.dpatch 2006-05-03 20:44:24 UTC (rev 2534)
+++ evolution-sharp/trunk/debian/patches/autoreconf.dpatch 2006-05-03 22:01:50 UTC (rev 2535)
@@ -1,12291 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- ../evolution-sharp-0.10.2/configure 2005-09-12 22:56:48.000000000 +0200
-+++ evolution-sharp-0.10.2/configure 2006-03-14 22:21:05.697624952 +0100
-@@ -285,8 +285,8 @@
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-- echo_test_string="`eval $cmd`" &&
-+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+ echo_test_string=`eval $cmd` &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
-@@ -463,7 +463,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS EDS_VERSION EDS_SOVERSION EBOOK_SOVERSION ECAL_SOVERSION USE_EVO12_TRUE USE_EVO12_FALSE MONO_CFLAGS MONO_LIBS CSC GACUTIL LIB_PREFIX LIB_SUFFIX GTK_SHARP_CFLAGS GTK_SHARP_LIBS GAPI_CODEGEN GAPI_FIXUP LIBECAL_CFLAGS LIBECAL_LIBS LIBEBOOK_CFLAGS LIBEBOOK_LIBS GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS IDL_INCLUDES EVO_SHELL_CFLAGS EVO_SHELL_LIBS API_VERSION LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS EDS_VERSION EDS_SOVERSION EBOOK_SOVERSION ECAL_SOVERSION USE_EVO13_TRUE USE_EVO13_FALSE USE_EVO12_TRUE USE_EVO12_FALSE MONO_CFLAGS MONO_LIBS CSC GACUTIL LIB_PREFIX LIB_SUFFIX GTK_SHARP_CFLAGS GTK_SHARP_LIBS GAPI_CODEGEN GAPI_FIXUP LIBECAL_CFLAGS LIBECAL_LIBS LIBEBOOK_CFLAGS LIBEBOOK_LIBS GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS IDL_INCLUDES EVO_SHELL_CFLAGS EVO_SHELL_LIBS API_VERSION LIBOBJS LTLIBOBJS'
- ac_subst_files='EVOSHARP_MARSHAL_RULE'
-
- # Initialize some variables set by options.
-@@ -944,6 +944,58 @@
- ac_env_FFLAGS_value=$FFLAGS
- ac_cv_env_FFLAGS_set=${FFLAGS+set}
- ac_cv_env_FFLAGS_value=$FFLAGS
-+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+ac_env_PKG_CONFIG_value=$PKG_CONFIG
-+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-+ac_env_BASE_DEPENDENCIES_CFLAGS_set=${BASE_DEPENDENCIES_CFLAGS+set}
-+ac_env_BASE_DEPENDENCIES_CFLAGS_value=$BASE_DEPENDENCIES_CFLAGS
-+ac_cv_env_BASE_DEPENDENCIES_CFLAGS_set=${BASE_DEPENDENCIES_CFLAGS+set}
-+ac_cv_env_BASE_DEPENDENCIES_CFLAGS_value=$BASE_DEPENDENCIES_CFLAGS
-+ac_env_BASE_DEPENDENCIES_LIBS_set=${BASE_DEPENDENCIES_LIBS+set}
-+ac_env_BASE_DEPENDENCIES_LIBS_value=$BASE_DEPENDENCIES_LIBS
-+ac_cv_env_BASE_DEPENDENCIES_LIBS_set=${BASE_DEPENDENCIES_LIBS+set}
-+ac_cv_env_BASE_DEPENDENCIES_LIBS_value=$BASE_DEPENDENCIES_LIBS
-+ac_env_MONO_CFLAGS_set=${MONO_CFLAGS+set}
-+ac_env_MONO_CFLAGS_value=$MONO_CFLAGS
-+ac_cv_env_MONO_CFLAGS_set=${MONO_CFLAGS+set}
-+ac_cv_env_MONO_CFLAGS_value=$MONO_CFLAGS
-+ac_env_MONO_LIBS_set=${MONO_LIBS+set}
-+ac_env_MONO_LIBS_value=$MONO_LIBS
-+ac_cv_env_MONO_LIBS_set=${MONO_LIBS+set}
-+ac_cv_env_MONO_LIBS_value=$MONO_LIBS
-+ac_env_GTK_SHARP_CFLAGS_set=${GTK_SHARP_CFLAGS+set}
-+ac_env_GTK_SHARP_CFLAGS_value=$GTK_SHARP_CFLAGS
-+ac_cv_env_GTK_SHARP_CFLAGS_set=${GTK_SHARP_CFLAGS+set}
-+ac_cv_env_GTK_SHARP_CFLAGS_value=$GTK_SHARP_CFLAGS
-+ac_env_GTK_SHARP_LIBS_set=${GTK_SHARP_LIBS+set}
-+ac_env_GTK_SHARP_LIBS_value=$GTK_SHARP_LIBS
-+ac_cv_env_GTK_SHARP_LIBS_set=${GTK_SHARP_LIBS+set}
-+ac_cv_env_GTK_SHARP_LIBS_value=$GTK_SHARP_LIBS
-+ac_env_LIBECAL_CFLAGS_set=${LIBECAL_CFLAGS+set}
-+ac_env_LIBECAL_CFLAGS_value=$LIBECAL_CFLAGS
-+ac_cv_env_LIBECAL_CFLAGS_set=${LIBECAL_CFLAGS+set}
-+ac_cv_env_LIBECAL_CFLAGS_value=$LIBECAL_CFLAGS
-+ac_env_LIBECAL_LIBS_set=${LIBECAL_LIBS+set}
-+ac_env_LIBECAL_LIBS_value=$LIBECAL_LIBS
-+ac_cv_env_LIBECAL_LIBS_set=${LIBECAL_LIBS+set}
-+ac_cv_env_LIBECAL_LIBS_value=$LIBECAL_LIBS
-+ac_env_LIBEBOOK_CFLAGS_set=${LIBEBOOK_CFLAGS+set}
-+ac_env_LIBEBOOK_CFLAGS_value=$LIBEBOOK_CFLAGS
-+ac_cv_env_LIBEBOOK_CFLAGS_set=${LIBEBOOK_CFLAGS+set}
-+ac_cv_env_LIBEBOOK_CFLAGS_value=$LIBEBOOK_CFLAGS
-+ac_env_LIBEBOOK_LIBS_set=${LIBEBOOK_LIBS+set}
-+ac_env_LIBEBOOK_LIBS_value=$LIBEBOOK_LIBS
-+ac_cv_env_LIBEBOOK_LIBS_set=${LIBEBOOK_LIBS+set}
-+ac_cv_env_LIBEBOOK_LIBS_value=$LIBEBOOK_LIBS
-+ac_env_EVO_SHELL_CFLAGS_set=${EVO_SHELL_CFLAGS+set}
-+ac_env_EVO_SHELL_CFLAGS_value=$EVO_SHELL_CFLAGS
-+ac_cv_env_EVO_SHELL_CFLAGS_set=${EVO_SHELL_CFLAGS+set}
-+ac_cv_env_EVO_SHELL_CFLAGS_value=$EVO_SHELL_CFLAGS
-+ac_env_EVO_SHELL_LIBS_set=${EVO_SHELL_LIBS+set}
-+ac_env_EVO_SHELL_LIBS_value=$EVO_SHELL_LIBS
-+ac_cv_env_EVO_SHELL_LIBS_set=${EVO_SHELL_LIBS+set}
-+ac_cv_env_EVO_SHELL_LIBS_value=$EVO_SHELL_LIBS
-
- #
- # Report the --help message.
-@@ -1062,6 +1114,29 @@
- CXXCPP C++ preprocessor
- F77 Fortran 77 compiler command
- FFLAGS Fortran 77 compiler flags
-+ PKG_CONFIG path to pkg-config utility
-+ BASE_DEPENDENCIES_CFLAGS
-+ C compiler flags for BASE_DEPENDENCIES, overriding pkg-config
-+ BASE_DEPENDENCIES_LIBS
-+ linker flags for BASE_DEPENDENCIES, overriding pkg-config
-+ MONO_CFLAGS C compiler flags for MONO, overriding pkg-config
-+ MONO_LIBS linker flags for MONO, overriding pkg-config
-+ GTK_SHARP_CFLAGS
-+ C compiler flags for GTK_SHARP, overriding pkg-config
-+ GTK_SHARP_LIBS
-+ linker flags for GTK_SHARP, overriding pkg-config
-+ LIBECAL_CFLAGS
-+ C compiler flags for LIBECAL, overriding pkg-config
-+ LIBECAL_LIBS
-+ linker flags for LIBECAL, overriding pkg-config
-+ LIBEBOOK_CFLAGS
-+ C compiler flags for LIBEBOOK, overriding pkg-config
-+ LIBEBOOK_LIBS
-+ linker flags for LIBEBOOK, overriding pkg-config
-+ EVO_SHELL_CFLAGS
-+ C compiler flags for EVO_SHELL, overriding pkg-config
-+ EVO_SHELL_LIBS
-+ linker flags for EVO_SHELL, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1154,7 +1229,7 @@
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-@@ -2831,8 +2906,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2890,8 +2964,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3007,8 +3080,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3062,8 +3134,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3108,8 +3179,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3153,8 +3223,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3432,7 +3501,7 @@
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
-- # but apparently some GNU ld's only accept -v.
-+ # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-@@ -3466,7 +3535,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
-@@ -3499,7 +3568,7 @@
- case $host_os in
- darwin*)
- if test "$GCC" = yes; then
-- reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
-@@ -3515,36 +3584,43 @@
- # Let the user override the test.
- lt_cv_path_NM="$NM"
- else
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-- IFS="$lt_save_ifs"
-- test -z "$ac_dir" && ac_dir=.
-- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-- # Check to see if the nm accepts a BSD-compat flag.
-- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-- # nm: unknown option "B" ignored
-- # Tru64's nm complains that /dev/null is an invalid object file
-- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-- */dev/null* | *'Invalid file or object type'*)
-- lt_cv_path_NM="$tmp_nm -B"
-- break
-- ;;
-- *)
-- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-- */dev/null*)
-- lt_cv_path_NM="$tmp_nm -p"
-+ lt_nm_to_check="${ac_tool_prefix}nm"
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+ lt_nm_to_check="$lt_nm_to_check nm"
-+ fi
-+ for lt_tmp_nm in $lt_nm_to_check; do
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ tmp_nm="$ac_dir/$lt_tmp_nm"
-+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+ # Check to see if the nm accepts a BSD-compat flag.
-+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+ # nm: unknown option "B" ignored
-+ # Tru64's nm complains that /dev/null is an invalid object file
-+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+ */dev/null* | *'Invalid file or object type'*)
-+ lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
-- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-- continue # so that we can try to find one that supports BSD flags
-+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+ */dev/null*)
-+ lt_cv_path_NM="$tmp_nm -p"
-+ break
-+ ;;
-+ *)
-+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+ continue # so that we can try to find one that supports BSD flags
-+ ;;
-+ esac
- ;;
- esac
-- esac
-- fi
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
- done
-- IFS="$lt_save_ifs"
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
-@@ -3636,7 +3712,7 @@
-
- hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
-- case "$host_cpu" in
-+ case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -3652,6 +3728,11 @@
- esac
- ;;
-
-+interix3*)
-+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
-@@ -3667,7 +3748,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
- 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
-@@ -3697,15 +3778,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--sco3.2v5*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -3726,10 +3803,13 @@
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
-+ pc)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
- esac
- ;;
-
--sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
-@@ -3747,6 +3827,9 @@
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
-
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
-
-@@ -3782,7 +3865,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 3785 "configure"' > conftest.$ac_ext
-+ echo '#line 3868 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -3825,7 +3908,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- case "`/usr/bin/file conftest.o`" in
-+ case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
- x86_64-*linux*)
-@@ -3902,8 +3985,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3938,6 +4020,26 @@
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-+sparc*-*solaris*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ case `/usr/bin/file conftest.o` in
-+ *64-bit*)
-+ case $lt_cv_prog_gnu_ld in
-+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+ *) LD="${LD-ld} -64" ;;
-+ esac
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-
- esac
-
-@@ -4212,8 +4314,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4383,8 +4484,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4451,8 +4551,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4712,8 +4811,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4771,8 +4869,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4843,8 +4940,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4888,8 +4984,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5361,7 +5456,7 @@
-
-
- # Provide some information about the compiler.
--echo "$as_me:5364:" \
-+echo "$as_me:5459:" \
- "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -5407,8 +5502,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5457,8 +5551,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5558,12 +5651,18 @@
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
-- lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-+
-+ interix*)
-+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+ lt_cv_sys_max_cmd_len=196608
-+ ;;
-+
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-@@ -5577,6 +5676,17 @@
- esac
- fi
- ;;
-+ sco3.2v5*)
-+ lt_cv_sys_max_cmd_len=102400
-+ ;;
-+ sysv5* | sco5v6* | sysv4.2uw2*)
-+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+ if test -n "$kargmax"; then
-+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
-+ else
-+ lt_cv_sys_max_cmd_len=32768
-+ fi
-+ ;;
- *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
-@@ -5662,9 +5772,18 @@
- osf*)
- symcode='[BCDEGQRST]'
- ;;
--solaris* | sysv5*)
-+solaris*)
- symcode='[BDRT]'
- ;;
-+sco3.2v5*)
-+ symcode='[DT]'
-+ ;;
-+sysv4.2uw2*)
-+ symcode='[DT]'
-+ ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+ symcode='[ABDT]'
-+ ;;
- sysv4)
- symcode='[DFNSTU]'
- ;;
-@@ -5873,7 +5992,7 @@
- default_ofile=libtool
- can_build_shared=yes
-
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6130,6 +6249,7 @@
- test -z "$AS" && AS=as
- test -z "$CC" && CC=cc
- test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
- test -z "$DLLTOOL" && DLLTOOL=dlltool
- test -z "$LD" && LD=ld
- test -z "$LN_S" && LN_S="ln -s"
-@@ -6149,10 +6269,10 @@
- if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
-- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
-- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-@@ -6194,7 +6314,7 @@
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
-- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
-@@ -6256,7 +6376,7 @@
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
-- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
-@@ -6351,6 +6471,9 @@
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
-
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
-
-@@ -6358,82 +6481,17 @@
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-
-
--#
--# Check for any special shared library compilation flags.
--#
--lt_prog_cc_shlib=
--if test "$GCC" = no; then
-- case $host_os in
-- sco3.2v5*)
-- lt_prog_cc_shlib='-belf'
-- ;;
-- esac
--fi
--if test -n "$lt_prog_cc_shlib"; then
-- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
--echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then :
-- else
-- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
--echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-- lt_cv_prog_cc_can_build_shared=no
-- fi
--fi
--
--
--#
--# Check to make sure the static flag actually works.
--#
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
--if test "${lt_prog_compiler_static_works+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- lt_prog_compiler_static_works=no
-- save_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-- # The compiler can only warn and ignore the option if not recognized
-- # So say no if there are warnings
-- if test -s conftest.err; then
-- # Append any errors to the config.log.
-- cat conftest.err 1>&5
-- $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works=yes
-- fi
-- else
-- lt_prog_compiler_static_works=yes
-- fi
-- fi
-- $rm conftest*
-- LDFLAGS="$save_LDFLAGS"
--
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
--
--if test x"$lt_prog_compiler_static_works" = xyes; then
-- :
--else
-- lt_prog_compiler_static=
--fi
--
--
--
-
- lt_prog_compiler_no_builtin_flag=
-
-@@ -6456,20 +6514,20 @@
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:6462: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:6520: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:6466: \$? = $ac_status" >&5
-+ echo "$as_me:6524: \$? = $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.
-- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_rtti_exceptions=yes
- fi
- fi
-@@ -6530,6 +6588,11 @@
- lt_prog_compiler_pic='-fno-common'
- ;;
-
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
-+ ;;
-+
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
-@@ -6546,7 +6609,7 @@
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -6593,7 +6656,7 @@
- lt_prog_compiler_wl='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -6623,12 +6686,12 @@
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-static'
- ;;
-- pgcc* | pgf77* | pgf90*)
-+ pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-fpic'
-- lt_prog_compiler_static='-static'
-+ lt_prog_compiler_static='-Bstatic'
- ;;
- ccc*)
- lt_prog_compiler_wl='-Wl,'
-@@ -6644,11 +6707,6 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-- sco3.2v5*)
-- lt_prog_compiler_pic='-Kpic'
-- lt_prog_compiler_static='-dn'
-- ;;
--
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
-@@ -6666,7 +6724,7 @@
- lt_prog_compiler_static='-Bstatic'
- ;;
-
-- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
-@@ -6679,6 +6737,12 @@
- fi
- ;;
-
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ ;;
-+
- unicos*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_can_build_shared=no
-@@ -6718,20 +6782,20 @@
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:6724: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:6788: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:6728: \$? = $ac_status" >&5
-+ echo "$as_me:6792: \$? = $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.
-- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works=yes
- fi
- fi
-@@ -6752,7 +6816,7 @@
- fi
-
- fi
--case "$host_os" in
-+case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic=
-@@ -6762,6 +6826,48 @@
- ;;
- esac
-
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_static_works+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_static_works=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The linker can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&5
-+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works=yes
-+ fi
-+ else
-+ lt_prog_compiler_static_works=yes
-+ fi
-+ fi
-+ $rm conftest*
-+ LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-+
-+if test x"$lt_prog_compiler_static_works" = xyes; then
-+ :
-+else
-+ lt_prog_compiler_static=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -6780,25 +6886,25 @@
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:6786: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:6892: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:6790: \$? = $ac_status" >&5
-+ echo "$as_me:6896: \$? = $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
- # So say no if there are warnings
-- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-- $SED '/^$/d' out/conftest.err >out/conftest.er2
-- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_c_o=yes
- fi
- fi
-- chmod u+w .
-+ chmod u+w . 2>&5
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
-@@ -6894,6 +7000,10 @@
- with_gnu_ld=no
- fi
- ;;
-+ interix*)
-+ # we just hope/assume this is gcc and not c89 (= MSVC++)
-+ with_gnu_ld=yes
-+ ;;
- openbsd*)
- with_gnu_ld=no
- ;;
-@@ -6978,7 +7088,7 @@
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds='$CC -shared $libobjs $deplibs $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
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -6987,22 +7097,37 @@
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
-- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- ld_shlibs=no
- fi
- ;;
-
-+ interix3*)
-+ hardcode_direct=no
-+ hardcode_shlibpath_var=no
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec='${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.
-+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ 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'
-+ ;;
-+
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
-- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
-- pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
-- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
-+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
- tmp_addflag=' -i_dynamic' ;;
-@@ -7019,12 +7144,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -7034,7 +7160,7 @@
- fi
- ;;
-
-- solaris* | sysv5*)
-+ solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs=no
- cat <<EOF 1>&2
-@@ -7055,6 +7181,33 @@
- fi
- ;;
-
-+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+ case `$LD -v 2>&1` in
-+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+ ld_shlibs=no
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+ ;;
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- sunos4*)
- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
-@@ -7088,7 +7241,7 @@
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L=yes
-- if test "$GCC" = yes && test -z "$link_static_flag"; then
-+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- hardcode_direct=unsupported
-@@ -7122,6 +7275,7 @@
- break
- fi
- done
-+ ;;
- esac
-
- exp_sym_flag='-bexport'
-@@ -7159,6 +7313,7 @@
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_libdir_separator=
- fi
-+ ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
-@@ -7171,11 +7326,11 @@
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
-- if test "$aix_use_runtimelinking" = yes; then
-+ if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
-- fi
-+ fi
- fi
- fi
-
-@@ -7211,8 +7366,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7240,12 +7394,12 @@
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag="-z nodefs"
-- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7272,8 +7426,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7305,13 +7458,11 @@
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag=' ${wl}-bernotok'
- allow_undefined_flag=' ${wl}-berok'
-- # -bexpall does not export symbols beginning with underscore (_)
-- always_export_symbols=yes
- # Exported symbols can be pulled into shared objects from archives
-- whole_archive_flag_spec=' '
-+ whole_archive_flag_spec='$convenience'
- archive_cmds_need_lc=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
-- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-@@ -7350,7 +7501,7 @@
- ;;
-
- darwin* | rhapsody*)
-- case "$host_os" in
-+ case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag='${wl}-undefined ${wl}suppress'
- ;;
-@@ -7379,7 +7530,7 @@
- output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
-@@ -7388,7 +7539,7 @@
- output_verbose_link_cmd='echo'
- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
-@@ -7429,11 +7580,20 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
-+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-+ kfreebsd*-gnu)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
-+ link_all_deplibs=no
- ;;
-
- hpux9*)
-@@ -7452,47 +7612,62 @@
- export_dynamic_flag_spec='${wl}-E'
- ;;
-
-- hpux10* | hpux11*)
-+ hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+
-+ hardcode_direct=yes
-+ export_dynamic_flag_spec='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L=yes
-+ fi
-+ ;;
-+
-+ hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case $host_cpu in
-+ hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
-+ ia64*)
-+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
- *)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ case $host_cpu in
-+ hppa*64*)
-+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
-- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*)
-- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld='+b $libdir'
-- hardcode_libdir_separator=:
-- hardcode_direct=no
-- hardcode_shlibpath_var=no
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=no
- hardcode_shlibpath_var=no
--
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L=yes
- ;;
- *)
-- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator=:
- hardcode_direct=yes
- export_dynamic_flag_spec='${wl}-E'
-
-@@ -7516,7 +7691,7 @@
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -7594,14 +7769,6 @@
- hardcode_libdir_separator=:
- ;;
-
-- sco3.2v5*)
-- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_shlibpath_var=no
-- export_dynamic_flag_spec='${wl}-Bexport'
-- runpath_var=LD_RUN_PATH
-- hardcode_runpath_var=yes
-- ;;
--
- solaris*)
- no_undefined_flag=' -z text'
- if test "$GCC" = yes; then
-@@ -7687,36 +7854,45 @@
- fi
- ;;
-
-- sysv4.2uw2*)
-- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct=yes
-- hardcode_minus_L=no
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ no_undefined_flag='${wl}-z,text'
-+ archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
-- hardcode_runpath_var=yes
-- runpath_var=LD_RUN_PATH
-- ;;
-+ runpath_var='LD_RUN_PATH'
-
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-- no_undefined_flag='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
-- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
-- runpath_var='LD_RUN_PATH'
-- hardcode_shlibpath_var=no
- ;;
-
-- sysv5*)
-- no_undefined_flag=' -z text'
-- # $CC -shared without GNU ld will not create a library from C++
-- # object files and a static libstdc++, better avoid it by now
-- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-- hardcode_libdir_flag_spec=
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
-+ no_undefined_flag='${wl}-z,text'
-+ allow_undefined_flag='${wl}-z,nodefs'
-+ archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
-+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ hardcode_libdir_separator=':'
-+ link_all_deplibs=yes
-+ export_dynamic_flag_spec='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
- ;;
-
- uts4*)
-@@ -7735,11 +7911,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
- test "$ld_shlibs" = no && can_build_shared=no
-
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
-- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--
- #
- # Do we need to explicitly link libc?
- #
-@@ -7772,6 +7943,7 @@
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
-+ pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
-@@ -7932,7 +8104,8 @@
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
-- $install_prog $dir/$dlname \$dldir/$dlname'
-+ $install_prog $dir/$dlname \$dldir/$dlname~
-+ chmod a+x \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
-@@ -7985,7 +8158,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -8023,7 +8196,14 @@
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test -x /usr/bin/objformat; then
-+ objformat=`/usr/bin/objformat`
-+ else
-+ case $host_os in
-+ freebsd[123]*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-@@ -8045,10 +8225,15 @@
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-- *) # from 3.2 on
-+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-+ freebsd*) # from 4.6 on
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
- esac
- ;;
-
-@@ -8068,7 +8253,7 @@
- version_type=sunos
- need_lib_prefix=no
- need_version=no
-- case "$host_cpu" in
-+ case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
-@@ -8108,13 +8293,25 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--irix5* | irix6* | nonstopux*)
-- case $host_os in
-- nonstopux*) version_type=nonstopux ;;
-- *)
-- if test "$lt_cv_prog_gnu_ld" = yes; then
-- version_type=linux
-- else
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
- version_type=irix
- fi ;;
- esac
-@@ -8180,6 +8377,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
-@@ -8229,6 +8438,7 @@
-
- openbsd*)
- version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
-@@ -8272,13 +8482,6 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
--sco3.2v5*)
-- version_type=osf
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -8304,7 +8507,7 @@
- need_version=yes
- ;;
-
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-@@ -8337,6 +8540,29 @@
- fi
- ;;
-
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8352,6 +8578,11 @@
- echo "${ECHO_T}$dynamic_linker" >&6
- test "$dynamic_linker" = no && can_build_shared=no
-
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action=
-@@ -8483,8 +8714,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8587,8 +8817,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8653,8 +8882,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8747,8 +8975,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8813,8 +9040,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8880,8 +9106,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8947,8 +9172,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -9007,7 +9231,7 @@
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
-- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -9023,7 +9247,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 9026 "configure"
-+#line 9250 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -9080,6 +9304,8 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+ else
-+ puts (dlerror ());
-
- exit (status);
- }
-@@ -9089,12 +9315,12 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
-@@ -9109,7 +9335,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
- if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -9121,7 +9347,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 9124 "configure"
-+#line 9350 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -9178,6 +9404,8 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+ else
-+ puts (dlerror ());
-
- exit (status);
- }
-@@ -9187,12 +9415,12 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
- esac
- else :
- # compilation failed
-@@ -9225,7 +9453,7 @@
- fi
-
-
--# Report which librarie types wil actually be built
-+# Report which library types will actually be built
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -9237,7 +9465,7 @@
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
-@@ -9275,7 +9503,7 @@
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -9441,6 +9669,9 @@
- # A C compiler.
- LTCC=$lt_LTCC
-
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
- # A language-specific compiler.
- CC=$lt_compiler
-
-@@ -9771,6 +10002,9 @@
- echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
- fi
- fi
-+ if test -z "$LTCFLAGS"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+ fi
-
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
-@@ -9823,6 +10057,7 @@
- hardcode_libdir_flag_spec_ld_CXX=
- hardcode_libdir_separator_CXX=
- hardcode_minus_L_CXX=no
-+hardcode_shlibpath_var_CXX=unsupported
- hardcode_automatic_CXX=no
- module_cmds_CXX=
- module_expsym_cmds_CXX=
-@@ -9840,7 +10075,7 @@
- compiler_lib_search_path_CXX=
-
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
-
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -9850,13 +10085,16 @@
- lt_simple_compile_test_code="int some_variable = 0;\n"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
-
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
-
-@@ -9864,13 +10102,13 @@
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-
-@@ -9885,12 +10123,12 @@
- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
- else
-- unset lt_cv_prog_gnu_ld
-+ $as_unset lt_cv_prog_gnu_ld
- fi
- if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
- else
-- unset lt_cv_path_LD
-+ $as_unset lt_cv_path_LD
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
-@@ -9976,7 +10214,7 @@
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
-- # but apparently some GNU ld's only accept -v.
-+ # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-@@ -10010,7 +10248,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
-@@ -10101,6 +10339,7 @@
- ;;
- esac
- done
-+ ;;
- esac
-
- exp_sym_flag='-bexport'
-@@ -10138,6 +10377,7 @@
- hardcode_libdir_flag_spec_CXX='-L$libdir'
- hardcode_libdir_separator_CXX=
- fi
-+ ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
-@@ -10190,8 +10430,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10220,12 +10459,12 @@
-
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag_CXX="-z nodefs"
-- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10252,8 +10491,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10285,16 +10523,26 @@
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag_CXX=' ${wl}-bernotok'
- allow_undefined_flag_CXX=' ${wl}-berok'
-- # -bexpall does not export symbols beginning with underscore (_)
-- always_export_symbols_CXX=yes
- # Exported symbols can be pulled into shared objects from archives
-- whole_archive_flag_spec_CXX=' '
-+ whole_archive_flag_spec_CXX='$convenience'
- archive_cmds_need_lc_CXX=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
-- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ allow_undefined_flag_CXX=unsupported
-+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ ld_shlibs_CXX=no
-+ fi
-+ ;;
-+
- chorus*)
- case $cc_basename in
- *)
-@@ -10304,7 +10552,6 @@
- esac
- ;;
-
--
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
- # as there is no search path for DLLs.
-@@ -10314,7 +10561,7 @@
- enable_shared_with_static_runtimes_CXX=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_CXX='$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
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10323,13 +10570,13 @@
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
-- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- ld_shlibs_CXX=no
- fi
- ;;
- darwin* | rhapsody*)
-- case "$host_os" in
-+ case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
- ;;
-@@ -10367,7 +10614,7 @@
- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
-@@ -10380,7 +10627,7 @@
- output_verbose_link_cmd='echo'
- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
-@@ -10460,33 +10707,22 @@
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
-- case "$host_cpu" in
-- hppa*64*)
-- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-- hardcode_libdir_separator_CXX=:
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_CXX='-L$libdir'
- ;;
- *)
-- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
- ;;
- esac
- fi
-- case "$host_cpu" in
-- hppa*64*)
-- hardcode_direct_CXX=no
-- hardcode_shlibpath_var_CXX=no
-- ;;
-- ia64*)
-+ case $host_cpu in
-+ hppa*64*|ia64*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
-- hardcode_minus_L_CXX=yes # Not in the search PATH,
-- # but as the default
-- # location of the library.
- ;;
- *)
- hardcode_direct_CXX=yes
-@@ -10502,9 +10738,12 @@
- ld_shlibs_CXX=no
- ;;
- aCC*)
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ case $host_cpu in
-+ hppa*64*)
-+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -10523,9 +10762,12 @@
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
-- case "$host_cpu" in
-- ia64*|hppa*64*)
-- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ case $host_cpu in
-+ hppa*64*)
-+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -10539,6 +10781,20 @@
- ;;
- esac
- ;;
-+ interix3*)
-+ hardcode_direct_CXX=no
-+ hardcode_shlibpath_var_CXX=no
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_CXX='${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.
-+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ archive_expsym_cmds_CXX='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*)
-@@ -10624,7 +10880,7 @@
-
- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-- whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
- cxx*)
- # Compaq C++
-@@ -10667,7 +10923,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -10821,19 +11077,6 @@
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-- sco*)
-- archive_cmds_need_lc_CXX=no
-- case $cc_basename in
-- CC*)
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
-- *)
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
-- esac
-- ;;
- sunos4*)
- case $cc_basename in
- CC*)
-@@ -10856,10 +11099,11 @@
- case $cc_basename in
- CC*)
- # Sun C++ 4.2, 5.x and Centerline C++
-+ archive_cmds_need_lc_CXX=yes
- no_undefined_flag_CXX=' -zdefs'
-- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $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'
-
- hardcode_libdir_flag_spec_CXX='-R$libdir'
- hardcode_shlibpath_var_CXX=no
-@@ -10879,15 +11123,7 @@
- esac
- link_all_deplibs_CXX=yes
-
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- #
-- # There doesn't appear to be a way to prevent this compiler from
-- # explicitly linking system object files so we need to strip them
-- # from the output so that they don't get included in the library
-- # dependencies.
-- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ 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
-@@ -10933,8 +11169,59 @@
- ;;
- esac
- ;;
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+ no_undefined_flag_CXX='${wl}-z,text'
- archive_cmds_need_lc_CXX=no
-+ hardcode_shlibpath_var_CXX=no
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ ;;
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
-+ # For security reasons, it is highly recommended that you always
-+ # use absolute paths for naming shared libraries, and exclude the
-+ # DT_RUNPATH tag from executables and libraries. But doing so
-+ # requires that you compile everything twice, which is a pain.
-+ # So that behaviour is only enabled if SCOABSPATH is set to a
-+ # non-empty value in the environment. Most likely only useful for
-+ # creating official distributions of packages.
-+ # This is a hack until libtool officially supports absolute path
-+ # names for shared libraries.
-+ no_undefined_flag_CXX='${wl}-z,text'
-+ allow_undefined_flag_CXX='${wl}-z,nodefs'
-+ archive_cmds_need_lc_CXX=no
-+ hardcode_shlibpath_var_CXX=no
-+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ hardcode_libdir_separator_CXX=':'
-+ link_all_deplibs_CXX=yes
-+ export_dynamic_flag_spec_CXX='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
- ;;
- tandem*)
- case $cc_basename in
-@@ -10991,7 +11278,7 @@
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
-- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
-@@ -11067,6 +11354,29 @@
-
- $rm -f confest.$objext
-
-+# PORTME: override above test on systems where it is broken
-+case $host_os in
-+interix3*)
-+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+ # hack all around it, let's just trust "g++" to DTRT.
-+ predep_objects_CXX=
-+ postdep_objects_CXX=
-+ postdeps_CXX=
-+ ;;
-+
-+solaris*)
-+ case $cc_basename in
-+ CC*)
-+ # 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.
-+ postdeps_CXX='-lCstd -lCrun'
-+ ;;
-+ esac
-+ ;;
-+esac
-+
-+
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -11114,6 +11424,10 @@
- # DJGPP does not support shared libraries at all
- lt_prog_compiler_pic_CXX=
- ;;
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
-+ ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -11122,7 +11436,7 @@
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- ;;
- *)
-@@ -11183,15 +11497,15 @@
- case $cc_basename in
- CC*)
- lt_prog_compiler_wl_CXX='-Wl,'
-- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
- lt_prog_compiler_pic_CXX='+Z'
- fi
- ;;
- aCC*)
- lt_prog_compiler_wl_CXX='-Wl,'
-- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-- case "$host_cpu" in
-+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -11204,6 +11518,10 @@
- ;;
- esac
- ;;
-+ interix*)
-+ # This is c89, which is MS Visual C++ (no shared libs)
-+ # Anyone wants to do a port?
-+ ;;
- irix5* | irix6* | nonstopux*)
- case $cc_basename in
- CC*)
-@@ -11232,7 +11550,7 @@
- # Portland Group C++ compiler.
- lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_pic_CXX='-fpic'
-- lt_prog_compiler_static_CXX='-static'
-+ lt_prog_compiler_static_CXX='-Bstatic'
- ;;
- cxx*)
- # Compaq C++
-@@ -11258,7 +11576,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -11283,15 +11601,6 @@
- ;;
- psos*)
- ;;
-- sco*)
-- case $cc_basename in
-- CC*)
-- lt_prog_compiler_pic_CXX='-fPIC'
-- ;;
-- *)
-- ;;
-- esac
-- ;;
- solaris*)
- case $cc_basename in
- CC*)
-@@ -11333,7 +11642,14 @@
- ;;
- esac
- ;;
-- unixware*)
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ case $cc_basename in
-+ CC*)
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ ;;
-+ esac
- ;;
- vxworks*)
- ;;
-@@ -11366,20 +11682,20 @@
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:11372: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11688: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:11376: \$? = $ac_status" >&5
-+ echo "$as_me:11692: \$? = $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.
-- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_CXX=yes
- fi
- fi
-@@ -11400,7 +11716,7 @@
- fi
-
- fi
--case "$host_os" in
-+case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_CXX=
-@@ -11410,6 +11726,48 @@
- ;;
- esac
-
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_static_works_CXX=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The linker can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&5
-+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works_CXX=yes
-+ fi
-+ else
-+ lt_prog_compiler_static_works_CXX=yes
-+ fi
-+ fi
-+ $rm conftest*
-+ LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
-+
-+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-+ :
-+else
-+ lt_prog_compiler_static_CXX=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-@@ -11428,25 +11786,25 @@
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:11434: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11792: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:11438: \$? = $ac_status" >&5
-+ echo "$as_me:11796: \$? = $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
- # So say no if there are warnings
-- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-- $SED '/^$/d' out/conftest.err >out/conftest.er2
-- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_c_o_CXX=yes
- fi
- fi
-- chmod u+w .
-+ chmod u+w . 2>&5
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
-@@ -11503,6 +11861,12 @@
- cygwin* | mingw*)
- export_symbols_cmds_CXX='$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'
- ;;
-+ kfreebsd*-gnu)
-+ link_all_deplibs_CXX=no
-+ ;;
-+ linux*)
-+ link_all_deplibs_CXX=no
-+ ;;
- *)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -11512,11 +11876,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
- test "$ld_shlibs_CXX" = no && can_build_shared=no
-
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
-- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--
- #
- # Do we need to explicitly link libc?
- #
-@@ -11549,6 +11908,7 @@
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl_CXX
-+ pic_flag=$lt_prog_compiler_pic_CXX
- compiler_flags=-v
- linker_flags=-v
- verstring=
-@@ -11709,7 +12069,8 @@
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
-- $install_prog $dir/$dlname \$dldir/$dlname'
-+ $install_prog $dir/$dlname \$dldir/$dlname~
-+ chmod a+x \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
-@@ -11762,7 +12123,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -11800,7 +12161,14 @@
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test -x /usr/bin/objformat; then
-+ objformat=`/usr/bin/objformat`
-+ else
-+ case $host_os in
-+ freebsd[123]*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-@@ -11822,10 +12190,15 @@
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-- *) # from 3.2 on
-+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-+ freebsd*) # from 4.6 on
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
- esac
- ;;
-
-@@ -11845,7 +12218,7 @@
- version_type=sunos
- need_lib_prefix=no
- need_version=no
-- case "$host_cpu" in
-+ case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
-@@ -11885,6 +12258,18 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-@@ -11957,6 +12342,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
-@@ -12006,6 +12403,7 @@
-
- openbsd*)
- version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
-@@ -12049,13 +12447,6 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
--sco3.2v5*)
-- version_type=osf
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -12081,7 +12472,7 @@
- need_version=yes
- ;;
-
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-@@ -12114,6 +12505,29 @@
- fi
- ;;
-
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12129,6 +12543,11 @@
- echo "${ECHO_T}$dynamic_linker" >&6
- test "$dynamic_linker" = no && can_build_shared=no
-
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_CXX=
-@@ -12166,1339 +12585,995 @@
- enable_fast_install=needless
- fi
-
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
--# FIXME - insert some real tests, host_os isn't really good enough
-- case $host_os in
-- darwin*)
-- if test -n "$STRIP" ; then
-- striplib="$STRIP -x"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-- ;;
-- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_CXX \
-+ CC_CXX \
-+ LD_CXX \
-+ lt_prog_compiler_wl_CXX \
-+ lt_prog_compiler_pic_CXX \
-+ lt_prog_compiler_static_CXX \
-+ lt_prog_compiler_no_builtin_flag_CXX \
-+ export_dynamic_flag_spec_CXX \
-+ thread_safe_flag_spec_CXX \
-+ whole_archive_flag_spec_CXX \
-+ enable_shared_with_static_runtimes_CXX \
-+ old_archive_cmds_CXX \
-+ old_archive_from_new_cmds_CXX \
-+ predep_objects_CXX \
-+ postdep_objects_CXX \
-+ predeps_CXX \
-+ postdeps_CXX \
-+ compiler_lib_search_path_CXX \
-+ archive_cmds_CXX \
-+ archive_expsym_cmds_CXX \
-+ postinstall_cmds_CXX \
-+ postuninstall_cmds_CXX \
-+ old_archive_from_expsyms_cmds_CXX \
-+ allow_undefined_flag_CXX \
-+ no_undefined_flag_CXX \
-+ export_symbols_cmds_CXX \
-+ hardcode_libdir_flag_spec_CXX \
-+ hardcode_libdir_flag_spec_ld_CXX \
-+ hardcode_libdir_separator_CXX \
-+ hardcode_automatic_CXX \
-+ module_cmds_CXX \
-+ module_expsym_cmds_CXX \
-+ lt_cv_prog_compiler_c_o_CXX \
-+ exclude_expsyms_CXX \
-+ include_expsyms_CXX; do
-+
-+ case $var in
-+ old_archive_cmds_CXX | \
-+ old_archive_from_new_cmds_CXX | \
-+ archive_cmds_CXX | \
-+ archive_expsym_cmds_CXX | \
-+ module_cmds_CXX | \
-+ module_expsym_cmds_CXX | \
-+ old_archive_from_expsyms_cmds_CXX | \
-+ export_symbols_cmds_CXX | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
--fi
-
--if test "x$enable_dlopen" != xyes; then
-- enable_dlopen=unknown
-- enable_dlopen_self=unknown
-- enable_dlopen_self_static=unknown
--else
-- lt_cv_dlopen=no
-- lt_cv_dlopen_libs=
-+cfgfile="$ofile"
-
-- case $host_os in
-- beos*)
-- lt_cv_dlopen="load_add_on"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
-- ;;
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-- mingw* | pw32*)
-- lt_cv_dlopen="LoadLibrary"
-- lt_cv_dlopen_libs=
-- ;;
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-- cygwin*)
-- lt_cv_dlopen="dlopen"
-- lt_cv_dlopen_libs=
-- ;;
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-
-- darwin*)
-- # if libdl is installed we need to link against it
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dl_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
--fi
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-
-- ;;
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-
-- *)
-- echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
--if test "${ac_cv_func_shl_load+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&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
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-
--/* 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. */
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-
--#undef shl_load
-+# A C compiler.
-+LTCC=$lt_LTCC
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--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
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
--#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-
--int
--main ()
--{
--return f != shl_load;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_func_shl_load=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
-
--ac_cv_func_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
--if test $ac_cv_func_shl_load = yes; then
-- lt_cv_dlopen="shl_load"
--else
-- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char shl_load ();
--int
--main ()
--{
--shl_load ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dld_shl_load=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-
--ac_cv_lib_dld_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
--if test $ac_cv_lib_dld_shl_load = yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
--else
-- echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
--if test "${ac_cv_func_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define dlopen innocuous_dlopen
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-
--#undef dlopen
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--/* 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_dlopen) || defined (__stub___dlopen)
--choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
--#endif
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-
--int
--main ()
--{
--return f != dlopen;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_func_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-
--ac_cv_func_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
--if test $ac_cv_func_dlopen = yes; then
-- lt_cv_dlopen="dlopen"
--else
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dl_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: assembler.
-+AS="$AS"
-
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
-- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_svld_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-
--ac_cv_lib_svld_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
--if test $ac_cv_lib_svld_dlopen = yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
--else
-- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dld_link ();
--int
--main ()
--{
--dld_link ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dld_dld_link=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-
--ac_cv_lib_dld_dld_link=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
--if test $ac_cv_lib_dld_dld_link = yes; then
-- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
--fi
-+# Old archive suffix (normally "a").
-+libext="$libext"
-
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-
--fi
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
-
--fi
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
--fi
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-
--fi
-+# Do we need a version for libraries?
-+need_version=$need_version
-
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-
--fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-
-- ;;
-- esac
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-
-- if test "x$lt_cv_dlopen" != xno; then
-- enable_dlopen=yes
-- else
-- enable_dlopen=no
-- fi
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-- case $lt_cv_dlopen in
-- dlopen)
-- save_CPPFLAGS="$CPPFLAGS"
-- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-- save_LDFLAGS="$LDFLAGS"
-- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-- save_LIBS="$LIBS"
-- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 12803 "configure"
--#include "confdefs.h"
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+# Library versioning type.
-+version_type=$version_type
-
--#include <stdio.h>
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-- exit (status);
--}
--EOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self=no
-- fi
--fi
--rm -fr conftest*
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-
-- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self_static=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 12901 "configure"
--#include "confdefs.h"
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-
--#include <stdio.h>
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
-
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
-
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-- exit (status);
--}
--EOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self_static=no
-- fi
--fi
--rm -fr conftest*
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
-
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-- fi
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
-- ;;
-- esac
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-- case $lt_cv_dlopen_self_static in
-- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-- *) enable_dlopen_self_static=unknown ;;
-- esac
--fi
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
-- # See if we are running on zsh, and set the options which allow our commands through
-- # without removal of \ escapes.
-- if test -n "${ZSH_VERSION+set}" ; then
-- setopt NO_GLOB_SUBST
-- fi
-- # Now quote all the things that may contain metacharacters while being
-- # careful not to overquote the AC_SUBSTed values. We take copies of the
-- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-- SED SHELL STRIP \
-- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-- deplibs_check_method reload_flag reload_cmds need_locks \
-- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-- lt_cv_sys_global_symbol_to_c_name_address \
-- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-- old_postinstall_cmds old_postuninstall_cmds \
-- compiler_CXX \
-- CC_CXX \
-- LD_CXX \
-- lt_prog_compiler_wl_CXX \
-- lt_prog_compiler_pic_CXX \
-- lt_prog_compiler_static_CXX \
-- lt_prog_compiler_no_builtin_flag_CXX \
-- export_dynamic_flag_spec_CXX \
-- thread_safe_flag_spec_CXX \
-- whole_archive_flag_spec_CXX \
-- enable_shared_with_static_runtimes_CXX \
-- old_archive_cmds_CXX \
-- old_archive_from_new_cmds_CXX \
-- predep_objects_CXX \
-- postdep_objects_CXX \
-- predeps_CXX \
-- postdeps_CXX \
-- compiler_lib_search_path_CXX \
-- archive_cmds_CXX \
-- archive_expsym_cmds_CXX \
-- postinstall_cmds_CXX \
-- postuninstall_cmds_CXX \
-- old_archive_from_expsyms_cmds_CXX \
-- allow_undefined_flag_CXX \
-- no_undefined_flag_CXX \
-- export_symbols_cmds_CXX \
-- hardcode_libdir_flag_spec_CXX \
-- hardcode_libdir_flag_spec_ld_CXX \
-- hardcode_libdir_separator_CXX \
-- hardcode_automatic_CXX \
-- module_cmds_CXX \
-- module_expsym_cmds_CXX \
-- lt_cv_prog_compiler_c_o_CXX \
-- exclude_expsyms_CXX \
-- include_expsyms_CXX; do
--
-- case $var in
-- old_archive_cmds_CXX | \
-- old_archive_from_new_cmds_CXX | \
-- archive_cmds_CXX | \
-- archive_expsym_cmds_CXX | \
-- module_cmds_CXX | \
-- module_expsym_cmds_CXX | \
-- old_archive_from_expsyms_cmds_CXX | \
-- export_symbols_cmds_CXX | \
-- extract_expsyms_cmds | reload_cmds | finish_cmds | \
-- postinstall_cmds | postuninstall_cmds | \
-- old_postinstall_cmds | old_postuninstall_cmds | \
-- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-- # Double-quote double-evaled strings.
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-- ;;
-- *)
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-- ;;
-- esac
-- done
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-
-- case $lt_echo in
-- *'\$0 --fallback-echo"')
-- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-- ;;
-- esac
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
--cfgfile="$ofile"
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
-
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
-
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
-
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_CXX
-
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
-
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
--# A C compiler.
--LTCC=$lt_LTCC
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_CXX"
-
--# A language-specific compiler.
--CC=$lt_compiler_CXX
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
-
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
--# An ERE matcher.
--EGREP=$lt_EGREP
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
--# The linker used to build libraries.
--LD=$lt_LD_CXX
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
-
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
-
--# A BSD-compatible nm program.
--NM=$lt_NM
-+# ### END LIBTOOL TAG CONFIG: $tagname
-
--# A symbol stripping program
--STRIP=$lt_STRIP
-+__EOF__
-
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
-
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
-
--# Used on cygwin: assembler.
--AS="$AS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
-+ else
-+ tagname=""
-+ fi
-+ ;;
-
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
-+ F77)
-+ if test -n "$F77" && test "X$F77" != "Xno"; then
-
--# Object file suffix (normally "o").
--objext="$ac_objext"
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
--# Old archive suffix (normally "a").
--libext="$libext"
-
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
-+archive_cmds_need_lc_F77=no
-+allow_undefined_flag_F77=
-+always_export_symbols_F77=no
-+archive_expsym_cmds_F77=
-+export_dynamic_flag_spec_F77=
-+hardcode_direct_F77=no
-+hardcode_libdir_flag_spec_F77=
-+hardcode_libdir_flag_spec_ld_F77=
-+hardcode_libdir_separator_F77=
-+hardcode_minus_L_F77=no
-+hardcode_automatic_F77=no
-+module_cmds_F77=
-+module_expsym_cmds_F77=
-+link_all_deplibs_F77=unknown
-+old_archive_cmds_F77=$old_archive_cmds
-+no_undefined_flag_F77=
-+whole_archive_flag_spec_F77=
-+enable_shared_with_static_runtimes_F77=no
-
--# Executable file suffix (normally "").
--exeext="$exeext"
-+# Source file extension for f77 test sources.
-+ac_ext=f
-
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_CXX
--pic_mode=$pic_mode
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+objext_F77=$objext
-
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-+# Code to be used in simple link tests
-+lt_simple_link_test_code=" program t\n end\n"
-
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-
--# Do we need a version for libraries?
--need_version=$need_version
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
-
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_CXX
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+compiler_F77=$CC
-+for cc_temp in $compiler""; do
-+ case $cc_temp in
-+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+ \-*) ;;
-+ *) break;;
-+ esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
--# Library versioning type.
--version_type=$version_type
-
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6
-
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
-+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+test "$can_build_shared" = "no" && enable_shared=no
-
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+# 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
-+ ;;
-+aix4* | aix5*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6
-
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_CXX
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6
-
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-+GCC_F77="$G77"
-+LD_F77="$LD"
-
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-+lt_prog_compiler_wl_F77=
-+lt_prog_compiler_pic_F77=
-+lt_prog_compiler_static_F77=
-
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_CXX
--archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_CXX
--module_expsym_cmds=$lt_module_expsym_cmds_CXX
-+ if test "$GCC" = yes; then
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_static_F77='-static'
-
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ fi
-+ ;;
-
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_CXX
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_CXX
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_CXX
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-+ ;;
-
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_CXX
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ lt_prog_compiler_pic_F77='-fno-common'
-+ ;;
-
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
-+ ;;
-
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
-+ msdosdjgpp*)
-+ # Just because we use GCC doesn't mean we suddenly get shared libraries
-+ # on systems that don't support them.
-+ lt_prog_compiler_can_build_shared_F77=no
-+ enable_shared=no
-+ ;;
-
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ lt_prog_compiler_pic_F77=-Kconform_pic
-+ fi
-+ ;;
-
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_CXX
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_F77='-fPIC'
-+ ;;
-+ esac
-+ ;;
-
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_CXX
-+ *)
-+ lt_prog_compiler_pic_F77='-fPIC'
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ else
-+ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case $cc_basename in
-+ xlc*)
-+ lt_prog_compiler_pic_F77='-qnocommon'
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ ;;
-+ esac
-+ ;;
-
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-+ ;;
-
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+ hpux9* | hpux10* | hpux11*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_F77='+Z'
-+ ;;
-+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-+ ;;
-
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+ irix5* | irix6* | nonstopux*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+ newsos6)
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+ linux*)
-+ case $cc_basename in
-+ icc* | ecc*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-static'
-+ ;;
-+ pgcc* | pgf77* | pgf90* | pgf95*)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-fpic'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-+ ccc*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # All Alpha code is PIC.
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+ esac
-+ ;;
-
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+ osf3* | osf4* | osf5*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # All OSF/1 code is PIC.
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
--
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_CXX
-+ solaris*)
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ case $cc_basename in
-+ f77* | f90* | f95*)
-+ lt_prog_compiler_wl_F77='-Qoption ld ';;
-+ *)
-+ lt_prog_compiler_wl_F77='-Wl,';;
-+ esac
-+ ;;
-
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-+ sunos4*)
-+ lt_prog_compiler_wl_F77='-Qoption ld '
-+ lt_prog_compiler_pic_F77='-PIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ lt_prog_compiler_pic_F77='-Kconform_pic'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ fi
-+ ;;
-
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_CXX
-+ unicos*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_can_build_shared_F77=no
-+ ;;
-
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_CXX
-+ uts4*)
-+ lt_prog_compiler_pic_F77='-pic'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-+ *)
-+ lt_prog_compiler_can_build_shared_F77=no
-+ ;;
-+ esac
-+ fi
-
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_CXX
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_F77"; then
-
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_CXX
-+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_pic_works_F77=no
-+ ac_outfile=conftest.$ac_objext
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -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:13380: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:13384: \$? = $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.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_pic_works_F77=yes
-+ fi
-+ fi
-+ $rm conftest*
-
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-+ case $lt_prog_compiler_pic_F77 in
-+ "" | " "*) ;;
-+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-+ esac
-+else
-+ lt_prog_compiler_pic_F77=
-+ lt_prog_compiler_can_build_shared_F77=no
-+fi
-
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_CXX"
-+fi
-+case $host_os in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ lt_prog_compiler_pic_F77=
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-+ ;;
-+esac
-
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_CXX
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_static_works_F77=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The linker can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&5
-+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works_F77=yes
-+ fi
-+ else
-+ lt_prog_compiler_static_works_F77=yes
-+ fi
-+ fi
-+ $rm conftest*
-+ LDFLAGS="$save_LDFLAGS"
-
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_CXX
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
-
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-+ :
-+else
-+ lt_prog_compiler_static_F77=
-+fi
-
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_CXX
-
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_CXX
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o_F77=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
--# ### END LIBTOOL TAG CONFIG: $tagname
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -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:13484: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+ echo "$as_me:13488: \$? = $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
-+ # So say no if there are warnings
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+ lt_cv_prog_compiler_c_o_F77=yes
-+ fi
-+ fi
-+ chmod u+w . 2>&5
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
-+ cd ..
-+ rmdir conftest
-+ $rm conftest*
-
--__EOF__
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-
-
--else
-- # If there is no Makefile yet, we rely on a make rule to execute
-- # `config.status --recheck' to rerun these tests and create the
-- # libtool script then.
-- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-- if test -f "$ltmain_in"; then
-- test -f Makefile && make "$ltmain"
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+ hard_links=yes
-+ $rm conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6
-+ if test "$hard_links" = no; then
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ need_locks=warn
- fi
-+else
-+ need_locks=no
- fi
-
-+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--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
--
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--with_gnu_ld=$lt_save_with_gnu_ld
--lt_cv_path_LDCXX=$lt_cv_path_LD
--lt_cv_path_LD=$lt_save_path_LD
--lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--
-- else
-- tagname=""
-- fi
-- ;;
--
-- F77)
-- if test -n "$F77" && test "X$F77" != "Xno"; then
--
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
--
--
--archive_cmds_need_lc_F77=no
--allow_undefined_flag_F77=
--always_export_symbols_F77=no
--archive_expsym_cmds_F77=
--export_dynamic_flag_spec_F77=
--hardcode_direct_F77=no
--hardcode_libdir_flag_spec_F77=
--hardcode_libdir_flag_spec_ld_F77=
--hardcode_libdir_separator_F77=
--hardcode_minus_L_F77=no
--hardcode_automatic_F77=no
--module_cmds_F77=
--module_expsym_cmds_F77=
--link_all_deplibs_F77=unknown
--old_archive_cmds_F77=$old_archive_cmds
--no_undefined_flag_F77=
--whole_archive_flag_spec_F77=
--enable_shared_with_static_runtimes_F77=no
--
--# Source file extension for f77 test sources.
--ac_ext=f
--
--# Object file extension for compiled f77 test sources.
--objext=o
--objext_F77=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
--
--# Allow CC to be a program name with arguments.
--compiler=$CC
--
--
--# save warnings/boilerplate of simple test code
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
--_lt_compiler_boilerplate=`cat conftest.err`
--$rm conftest*
--
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
--
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${F77-"f77"}
--compiler=$CC
--compiler_F77=$CC
--for cc_temp in $compiler""; do
-+ runpath_var=
-+ allow_undefined_flag_F77=
-+ enable_shared_with_static_runtimes_F77=no
-+ archive_cmds_F77=
-+ archive_expsym_cmds_F77=
-+ old_archive_From_new_cmds_F77=
-+ old_archive_from_expsyms_cmds_F77=
-+ export_dynamic_flag_spec_F77=
-+ whole_archive_flag_spec_F77=
-+ thread_safe_flag_spec_F77=
-+ hardcode_libdir_flag_spec_F77=
-+ hardcode_libdir_flag_spec_ld_F77=
-+ hardcode_libdir_separator_F77=
-+ hardcode_direct_F77=no
-+ hardcode_minus_L_F77=no
-+ hardcode_shlibpath_var_F77=unsupported
-+ link_all_deplibs_F77=unknown
-+ hardcode_automatic_F77=no
-+ module_cmds_F77=
-+ module_expsym_cmds_F77=
-+ always_export_symbols_F77=no
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ # include_expsyms should be a list of space-separated symbols to be *always*
-+ # included in the symbol list
-+ include_expsyms_F77=
-+ # exclude_expsyms can be an extended regexp of symbols to exclude
-+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+ # as well as any symbol that contains `d'.
-+ exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+ # platforms (ab)use it in PIC code, but their linkers get confused if
-+ # the symbol is explicitly referenced. Since portable code cannot
-+ # rely on this symbol name, it's probably fine to never include it in
-+ # preloaded symbol tables.
-+ extract_expsyms_cmds=
-+ # Just being paranoid about ensuring that cc_basename is set.
-+ for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-@@ -13508,500 +13583,459 @@
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ if test "$GCC" != yes; then
-+ with_gnu_ld=no
-+ fi
-+ ;;
-+ interix*)
-+ # we just hope/assume this is gcc and not c89 (= MSVC++)
-+ with_gnu_ld=yes
-+ ;;
-+ openbsd*)
-+ with_gnu_ld=no
-+ ;;
-+ esac
-
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
--
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
--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
-- ;;
--aix4* | aix5*)
-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-- test "$enable_shared" = yes && enable_static=no
-- fi
-- ;;
--esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
--
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
--
--test "$ld_shlibs_F77" = no && can_build_shared=no
--
--GCC_F77="$G77"
--LD_F77="$LD"
-+ ld_shlibs_F77=yes
-+ if test "$with_gnu_ld" = yes; then
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ wlarc='${wl}'
-
--lt_prog_compiler_wl_F77=
--lt_prog_compiler_pic_F77=
--lt_prog_compiler_static_F77=
-+ # Set some defaults for GNU ld with shared library support. These
-+ # are reset later if shared libraries are not supported. Putting them
-+ # here allows them to be overridden if necessary.
-+ runpath_var=LD_RUN_PATH
-+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-+ export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ whole_archive_flag_spec_F77=
-+ fi
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [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 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+ # See if GNU ld supports shared libraries.
-+ case $host_os in
-+ aix3* | aix4* | aix5*)
-+ # On AIX/PPC, the GNU linker is very broken
-+ if test "$host_cpu" != ia64; then
-+ ld_shlibs_F77=no
-+ cat <<EOF 1>&2
-
-- if test "$GCC" = yes; then
-- lt_prog_compiler_wl_F77='-Wl,'
-- lt_prog_compiler_static_F77='-static'
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-
-- case $host_os in
-- aix*)
-- # All AIX code is PIC.
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- lt_prog_compiler_static_F77='-Bstatic'
-+EOF
- fi
- ;;
-
- amigaos*)
-- # FIXME: we need at least 68020 code to build shared libraries, but
-- # adding the `-m68020' flag to GCC prevents building anything better,
-- # like `-m68040'.
-- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-- ;;
--
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
-- ;;
-+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_minus_L_F77=yes
-
-- mingw* | pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-+ # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-+ # that the semantics of dynamic libraries on AmigaOS, at least up
-+ # to version 4, is to share data among multiple programs linked
-+ # with the same dynamic library. Since this doesn't match the
-+ # behavior of shared libraries on other platforms, we can't use
-+ # them.
-+ ld_shlibs_F77=no
- ;;
-
-- darwin* | rhapsody*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- lt_prog_compiler_pic_F77='-fno-common'
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ allow_undefined_flag_F77=unsupported
-+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
- ;;
-
-- msdosdjgpp*)
-- # Just because we use GCC doesn't mean we suddenly get shared libraries
-- # on systems that don't support them.
-- lt_prog_compiler_can_build_shared_F77=no
-- enable_shared=no
-- ;;
-+ cygwin* | mingw* | pw32*)
-+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ allow_undefined_flag_F77=unsupported
-+ always_export_symbols_F77=no
-+ enable_shared_with_static_runtimes_F77=yes
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- lt_prog_compiler_pic_F77=-Kconform_pic
-+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $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
-+ # is EXPORTS), use it as is; otherwise, prepend...
-+ archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ echo EXPORTS > $output_objdir/$soname.def;
-+ cat $export_symbols >> $output_objdir/$soname.def;
-+ fi~
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ else
-+ ld_shlibs_F77=no
- fi
- ;;
-
-- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
-- *)
-- lt_prog_compiler_pic_F77='-fPIC'
-- ;;
-- esac
-+ interix3*)
-+ hardcode_direct_F77=no
-+ hardcode_shlibpath_var_F77=no
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_F77='${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.
-+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ archive_expsym_cmds_F77='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'
- ;;
-
-- *)
-- lt_prog_compiler_pic_F77='-fPIC'
-- ;;
-- esac
-- else
-- # PORTME Check for flag to pass linker flags through the system compiler.
-- case $host_os in
-- aix*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- lt_prog_compiler_static_F77='-Bstatic'
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_addflag=
-+ case $cc_basename,$host_cpu in
-+ pgcc*) # Portland Group C compiler
-+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_addflag=' $pic_flag'
-+ ;;
-+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
-+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_addflag=' $pic_flag -Mnomain' ;;
-+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-+ tmp_addflag=' -i_dynamic' ;;
-+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-+ tmp_addflag=' -i_dynamic -nofor_main' ;;
-+ ifc* | ifort*) # Intel Fortran compiler
-+ tmp_addflag=' -nofor_main' ;;
-+ esac
-+ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+ $echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ fi
-+ link_all_deplibs_F77=no
- else
-- lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-+ ld_shlibs_F77=no
- fi
- ;;
-- darwin*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- case $cc_basename in
-- xlc*)
-- lt_prog_compiler_pic_F77='-qnocommon'
-- lt_prog_compiler_wl_F77='-Wl,'
-- ;;
-- esac
-- ;;
--
-- mingw* | pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-- ;;
-
-- hpux9* | hpux10* | hpux11*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
-- *)
-- lt_prog_compiler_pic_F77='+Z'
-- ;;
-- esac
-- # Is there a better lt_prog_compiler_static that works with the bundled CC?
-- lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
- ;;
-
-- irix5* | irix6* | nonstopux*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- # PIC (with -KPIC) is the default.
-- lt_prog_compiler_static_F77='-non_shared'
-- ;;
-+ solaris*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs_F77=no
-+ cat <<EOF 1>&2
-
-- newsos6)
-- lt_prog_compiler_pic_F77='-KPIC'
-- lt_prog_compiler_static_F77='-Bstatic'
-- ;;
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-
-- linux*)
-- case $cc_basename in
-- icc* | ecc*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- lt_prog_compiler_pic_F77='-KPIC'
-- lt_prog_compiler_static_F77='-static'
-- ;;
-- pgcc* | pgf77* | pgf90*)
-- # Portland Group compilers (*not* the Pentium gcc compiler,
-- # which looks to be a dead project)
-- lt_prog_compiler_wl_F77='-Wl,'
-- lt_prog_compiler_pic_F77='-fpic'
-- lt_prog_compiler_static_F77='-static'
-- ;;
-- ccc*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- # All Alpha code is PIC.
-- lt_prog_compiler_static_F77='-non_shared'
-- ;;
-- esac
-+EOF
-+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
- ;;
-
-- osf3* | osf4* | osf5*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- # All OSF/1 code is PIC.
-- lt_prog_compiler_static_F77='-non_shared'
-- ;;
-+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+ case `$LD -v 2>&1` in
-+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+ ld_shlibs_F77=no
-+ cat <<_LT_EOF 1>&2
-
-- sco3.2v5*)
-- lt_prog_compiler_pic_F77='-Kpic'
-- lt_prog_compiler_static_F77='-dn'
-- ;;
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-
-- solaris*)
-- lt_prog_compiler_pic_F77='-KPIC'
-- lt_prog_compiler_static_F77='-Bstatic'
-- case $cc_basename in
-- f77* | f90* | f95*)
-- lt_prog_compiler_wl_F77='-Qoption ld ';;
-- *)
-- lt_prog_compiler_wl_F77='-Wl,';;
-+_LT_EOF
-+ ;;
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
- esac
- ;;
-
- sunos4*)
-- lt_prog_compiler_wl_F77='-Qoption ld '
-- lt_prog_compiler_pic_F77='-PIC'
-- lt_prog_compiler_static_F77='-Bstatic'
-+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
- ;;
-
-- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- lt_prog_compiler_pic_F77='-KPIC'
-- lt_prog_compiler_static_F77='-Bstatic'
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
- ;;
-+ esac
-
-- sysv4*MP*)
-- if test -d /usr/nec ;then
-- lt_prog_compiler_pic_F77='-Kconform_pic'
-- lt_prog_compiler_static_F77='-Bstatic'
-+ if test "$ld_shlibs_F77" = no; then
-+ runpath_var=
-+ hardcode_libdir_flag_spec_F77=
-+ export_dynamic_flag_spec_F77=
-+ whole_archive_flag_spec_F77=
-+ fi
-+ else
-+ # PORTME fill in a description of your system's linker (not GNU ld)
-+ case $host_os in
-+ aix3*)
-+ allow_undefined_flag_F77=unsupported
-+ always_export_symbols_F77=yes
-+ archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+ # Note: this linker hardcodes the directories in LIBPATH if there
-+ # are no directories specified by -L.
-+ hardcode_minus_L_F77=yes
-+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+ # Neither direct hardcoding nor static linking is supported with a
-+ # broken collect2.
-+ hardcode_direct_F77=unsupported
- fi
- ;;
-
-- unicos*)
-- lt_prog_compiler_wl_F77='-Wl,'
-- lt_prog_compiler_can_build_shared_F77=no
-- ;;
-+ aix4* | aix5*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ aix_use_runtimelinking=no
-
-- uts4*)
-- lt_prog_compiler_pic_F77='-pic'
-- lt_prog_compiler_static_F77='-Bstatic'
-- ;;
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+ aix_use_runtimelinking=yes
-+ break
-+ fi
-+ done
-+ ;;
-+ esac
-
-- *)
-- lt_prog_compiler_can_build_shared_F77=no
-- ;;
-- esac
-- fi
--
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$lt_prog_compiler_pic_F77"; then
-+ # 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.
-
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
--if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- lt_prog_compiler_pic_works_F77=no
-- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-- lt_compiler_flag="$lt_prog_compiler_pic_F77"
-- # Insert the option either (1) after the last *FLAGS variable, or
-- # (2) before a word containing "conftest.", or (3) at the end.
-- # Note that $ac_compile itself does not contain backslashes and begins
-- # with a dollar sign (not a hyphen), so the echo should work correctly.
-- # The option is referenced via a variable to avoid confusing sed.
-- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13786: $lt_compile\"" >&5)
-- (eval "$lt_compile" 2>conftest.err)
-- ac_status=$?
-- cat conftest.err >&5
-- echo "$as_me:13790: \$? = $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.
-- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_F77=yes
-- fi
-- fi
-- $rm conftest*
-+ archive_cmds_F77=''
-+ hardcode_direct_F77=yes
-+ hardcode_libdir_separator_F77=':'
-+ link_all_deplibs_F77=yes
-
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-+ if test "$GCC" = yes; then
-+ case $host_os in aix4.[012]|aix4.[012].*)
-+ # We only want to do this on AIX 4.2 and lower, the check
-+ # below for broken collect2 doesn't work under 4.3+
-+ collect2name=`${CC} -print-prog-name=collect2`
-+ if test -f "$collect2name" && \
-+ strings "$collect2name" | grep resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ hardcode_direct_F77=yes
-+ else
-+ # We have old collect2
-+ hardcode_direct_F77=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ hardcode_minus_L_F77=yes
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_libdir_separator_F77=
-+ fi
-+ ;;
-+ esac
-+ shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
-+ else
-+ # not using gcc
-+ if test "$host_cpu" = ia64; then
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-
--if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-- case $lt_prog_compiler_pic_F77 in
-- "" | " "*) ;;
-- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-- esac
--else
-- lt_prog_compiler_pic_F77=
-- lt_prog_compiler_can_build_shared_F77=no
--fi
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ always_export_symbols_F77=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ allow_undefined_flag_F77='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-
--fi
--case "$host_os" in
-- # For platforms which do not support PIC, -DPIC is meaningless:
-- *djgpp*)
-- lt_prog_compiler_pic_F77=
-- ;;
-- *)
-- lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-- ;;
--esac
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
- else
-- lt_cv_prog_compiler_c_o_F77=no
-- $rm -r conftest 2>/dev/null
-- mkdir conftest
-- cd conftest
-- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- lt_compiler_flag="-o out/conftest2.$ac_objext"
-- # Insert the option either (1) after the last *FLAGS variable, or
-- # (2) before a word containing "conftest.", or (3) at the end.
-- # Note that $ac_compile itself does not contain backslashes and begins
-- # with a dollar sign (not a hyphen), so the echo should work correctly.
-- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13848: $lt_compile\"" >&5)
-- (eval "$lt_compile" 2>out/conftest.err)
-- ac_status=$?
-- cat out/conftest.err >&5
-- echo "$as_me:13852: \$? = $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
-- # So say no if there are warnings
-- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-- $SED '/^$/d' out/conftest.err >out/conftest.er2
-- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-- lt_cv_prog_compiler_c_o_F77=yes
-- fi
-- fi
-- chmod u+w .
-- $rm conftest*
-- # SGI C++ compiler will create directory out/ii_files/ for
-- # template instantiation
-- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-- $rm out/* && rmdir out
-- cd ..
-- rmdir conftest
-- $rm conftest*
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-+ allow_undefined_flag_F77="-z nodefs"
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-
--hard_links="nottested"
--if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-- # do not overwrite the value of need_locks provided by the user
-- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-- hard_links=yes
-- $rm conftest*
-- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- touch conftest.a
-- ln conftest.a conftest.b 2>&5 || hard_links=no
-- ln conftest.a conftest.b 2>/dev/null && hard_links=no
-- echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-- if test "$hard_links" = no; then
-- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-- need_locks=warn
-- fi
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
- else
-- need_locks=no
--fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-- runpath_var=
-- allow_undefined_flag_F77=
-- enable_shared_with_static_runtimes_F77=no
-- archive_cmds_F77=
-- archive_expsym_cmds_F77=
-- old_archive_From_new_cmds_F77=
-- old_archive_from_expsyms_cmds_F77=
-- export_dynamic_flag_spec_F77=
-- whole_archive_flag_spec_F77=
-- thread_safe_flag_spec_F77=
-- hardcode_libdir_flag_spec_F77=
-- hardcode_libdir_flag_spec_ld_F77=
-- hardcode_libdir_separator_F77=
-- hardcode_direct_F77=no
-- hardcode_minus_L_F77=no
-- hardcode_shlibpath_var_F77=unsupported
-- link_all_deplibs_F77=unknown
-- hardcode_automatic_F77=no
-- module_cmds_F77=
-- module_expsym_cmds_F77=
-- always_export_symbols_F77=no
-- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-- # include_expsyms should be a list of space-separated symbols to be *always*
-- # included in the symbol list
-- include_expsyms_F77=
-- # exclude_expsyms can be an extended regexp of symbols to exclude
-- # it will be wrapped by ` (' and `)$', so one must not match beginning or
-- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-- # as well as any symbol that contains `d'.
-- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-- # platforms (ab)use it in PIC code, but their linkers get confused if
-- # the symbol is explicitly referenced. Since portable code cannot
-- # rely on this symbol name, it's probably fine to never include it in
-- # preloaded symbol tables.
-- extract_expsyms_cmds=
-- # Just being paranoid about ensuring that cc_basename is set.
-- for cc_temp in $compiler""; do
-- case $cc_temp in
-- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-- \-*) ;;
-- *) break;;
-- esac
--done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--
-- case $host_os in
-- cygwin* | mingw* | pw32*)
-- # FIXME: the MSVC++ port hasn't been tested in a loooong time
-- # When not using gcc, we currently assume that we are using
-- # Microsoft Visual C++.
-- if test "$GCC" != yes; then
-- with_gnu_ld=no
-- fi
-- ;;
-- openbsd*)
-- with_gnu_ld=no
-- ;;
-- esac
--
-- ld_shlibs_F77=yes
-- if test "$with_gnu_ld" = yes; then
-- # If archive_cmds runs LD, not CC, wlarc should be empty
-- wlarc='${wl}'
--
-- # Set some defaults for GNU ld with shared library support. These
-- # are reset later if shared libraries are not supported. Putting them
-- # here allows them to be overridden if necessary.
-- runpath_var=LD_RUN_PATH
-- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-- export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-- # ancient GNU ld didn't support --whole-archive et. al.
-- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-- else
-- whole_archive_flag_spec_F77=
-- fi
-- supports_anon_versioning=no
-- case `$LD -v 2>/dev/null` in
-- *\ [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 ...
-- *\ 2.11.*) ;; # other 2.11 versions
-- *) supports_anon_versioning=yes ;;
-- esac
--
-- # See if GNU ld supports shared libraries.
-- case $host_os in
-- aix3* | aix4* | aix5*)
-- # On AIX/PPC, the GNU linker is very broken
-- if test "$host_cpu" != ia64; then
-- ld_shlibs_F77=no
-- cat <<EOF 1>&2
--
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
--*** to be unable to reliably create shared libraries on AIX.
--*** Therefore, libtool is disabling shared libraries support. If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
--
--EOF
-+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ no_undefined_flag_F77=' ${wl}-bernotok'
-+ allow_undefined_flag_F77=' ${wl}-berok'
-+ # Exported symbols can be pulled into shared objects from archives
-+ whole_archive_flag_spec_F77='$convenience'
-+ archive_cmds_need_lc_F77=yes
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
- fi
- ;;
-
-@@ -14009,714 +14043,377 @@
- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_minus_L_F77=yes
--
-- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-- # that the semantics of dynamic libraries on AmigaOS, at least up
-- # to version 4, is to share data among multiple programs linked
-- # with the same dynamic library. Since this doesn't match the
-- # behavior of shared libraries on other platforms, we can't use
-- # them.
-+ # see comment about different semantics on the GNU ld section
- ld_shlibs_F77=no
- ;;
-
-- beos*)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- allow_undefined_flag_F77=unsupported
-- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-- # support --undefined. This deserves some investigation. FIXME
-- archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- else
-- ld_shlibs_F77=no
-- fi
-+ bsdi[45]*)
-+ export_dynamic_flag_spec_F77=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32*)
-- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-- # as there is no search path for DLLs.
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ hardcode_libdir_flag_spec_F77=' '
- allow_undefined_flag_F77=unsupported
-- always_export_symbols_F77=no
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+ # The linker will automatically build a .lib file if we build a DLL.
-+ old_archive_From_new_cmds_F77='true'
-+ # FIXME: Should let the user specify the lib program.
-+ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_F77=yes
-- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
--
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-- cp $export_symbols $output_objdir/$soname.def;
-- else
-- echo EXPORTS > $output_objdir/$soname.def;
-- cat $export_symbols >> $output_objdir/$soname.def;
-- fi~
-- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-- else
-- ld_shlibs_F77=no
-- fi
- ;;
-
-- linux*)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- tmp_addflag=
-- case $cc_basename,$host_cpu in
-- pgcc*) # Portland Group C compiler
-- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-- tmp_addflag=' $pic_flag'
-- ;;
-- pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
-- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-- tmp_addflag=' $pic_flag -Mnomain' ;;
-- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-- tmp_addflag=' -i_dynamic' ;;
-- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-- tmp_addflag=' -i_dynamic -nofor_main' ;;
-- ifc* | ifort*) # Intel Fortran compiler
-- tmp_addflag=' -nofor_main' ;;
-- esac
-- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--
-- if test $supports_anon_versioning = yes; then
-- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-- $echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-- fi
-- else
-- ld_shlibs_F77=no
-- fi
-+ darwin* | rhapsody*)
-+ case $host_os in
-+ rhapsody* | darwin1.[012])
-+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ archive_cmds_need_lc_F77=no
-+ hardcode_direct_F77=no
-+ hardcode_automatic_F77=yes
-+ hardcode_shlibpath_var_F77=unsupported
-+ whole_archive_flag_spec_F77=''
-+ link_all_deplibs_F77=yes
-+ if test "$GCC" = yes ; then
-+ output_verbose_link_cmd='echo'
-+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case $cc_basename in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ ld_shlibs_F77=no
-+ ;;
-+ esac
-+ fi
- ;;
-
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-- wlarc=
-- else
-- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- fi
-+ dgux*)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_shlibpath_var_F77=no
- ;;
-
-- solaris* | sysv5*)
-- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-- ld_shlibs_F77=no
-- cat <<EOF 1>&2
-+ freebsd1*)
-+ ld_shlibs_F77=no
-+ ;;
-
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems. Therefore, libtool
--*** is disabling shared libraries support. We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer. Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-
--EOF
-- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- else
-- ld_shlibs_F77=no
-- fi
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=yes
-+ hardcode_minus_L_F77=yes
-+ hardcode_shlibpath_var_F77=no
- ;;
-
-- sunos4*)
-- archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- wlarc=
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | dragonfly*)
-+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
-- *)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-+ kfreebsd*-gnu)
-+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ link_all_deplibs_F77=no
-+ ;;
-+
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
-- ld_shlibs_F77=no
-+ archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
-- ;;
-- esac
-+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ hardcode_direct_F77=yes
-
-- if test "$ld_shlibs_F77" = no; then
-- runpath_var=
-- hardcode_libdir_flag_spec_F77=
-- export_dynamic_flag_spec_F77=
-- whole_archive_flag_spec_F77=
-- fi
-- else
-- # PORTME fill in a description of your system's linker (not GNU ld)
-- case $host_os in
-- aix3*)
-- allow_undefined_flag_F77=unsupported
-- always_export_symbols_F77=yes
-- archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-- # Note: this linker hardcodes the directories in LIBPATH if there
-- # are no directories specified by -L.
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
- hardcode_minus_L_F77=yes
-- if test "$GCC" = yes && test -z "$link_static_flag"; then
-- # Neither direct hardcoding nor static linking is supported with a
-- # broken collect2.
-- hardcode_direct_F77=unsupported
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+ ;;
-+
-+ hpux10*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+
-+ hardcode_direct_F77=yes
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_F77=yes
- fi
- ;;
-
-- aix4* | aix5*)
-- if test "$host_cpu" = ia64; then
-- # On IA64, the linker does run time linking by default, so we don't
-- # have to do anything special.
-- aix_use_runtimelinking=no
-- exp_sym_flag='-Bexport'
-- no_entry_flag=""
-+ hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case $host_cpu in
-+ hppa*64*)
-+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
- else
-- # If we're using GNU nm, then we don't want the "-C" option.
-- # -C means demangle to AIX nm, but means don't demangle with GNU nm
-- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-- else
-- export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-- fi
-- aix_use_runtimelinking=no
-+ case $host_cpu in
-+ hppa*64*)
-+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-
-- # Test if we are trying to use run time linking or normal
-- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-- for ld_flag in $LDFLAGS; do
-- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-- aix_use_runtimelinking=yes
-- break
-- fi
-- done
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-+ hardcode_direct_F77=no
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+ *)
-+ hardcode_direct_F77=yes
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_F77=yes
-+ ;;
- esac
-+ fi
-+ ;;
-
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
- fi
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ link_all_deplibs_F77=yes
-+ ;;
-
-- # 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.
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-
-- archive_cmds_F77=''
-+ newsos6)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes
-- hardcode_libdir_separator_F77=':'
-- link_all_deplibs_F77=yes
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-
-- if test "$GCC" = yes; then
-- case $host_os in aix4.[012]|aix4.[012].*)
-- # We only want to do this on AIX 4.2 and lower, the check
-- # below for broken collect2 doesn't work under 4.3+
-- collect2name=`${CC} -print-prog-name=collect2`
-- if test -f "$collect2name" && \
-- strings "$collect2name" | grep resolve_lib_name >/dev/null
-- then
-- # We have reworked collect2
-- hardcode_direct_F77=yes
-- else
-- # We have old collect2
-- hardcode_direct_F77=unsupported
-- # It fails to find uninstalled libraries when the uninstalled
-- # path is not listed in the libpath. Setting hardcode_minus_L
-- # to unsupported forces relinking
-- hardcode_minus_L_F77=yes
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_libdir_separator_F77=
-- fi
-- esac
-- shared_flag='-shared'
-- if test "$aix_use_runtimelinking" = yes; then
-- shared_flag="$shared_flag "'${wl}-G'
-- fi
-+ openbsd*)
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_F77='${wl}-E'
- else
-- # not using gcc
-- if test "$host_cpu" = ia64; then
-- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-- # chokes on -Wl,-G. The following line is correct:
-- shared_flag='-G'
-- else
-- if test "$aix_use_runtimelinking" = yes; then
-- shared_flag='${wl}-G'
-- else
-- shared_flag='${wl}-bM:SRE'
-- fi
-- fi
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ ;;
-+ esac
- fi
-+ ;;
-
-- # It seems that -bexpall does not export symbols beginning with
-- # underscore (_), so it is better to generate a list of symbols to export.
-- always_export_symbols_F77=yes
-- if test "$aix_use_runtimelinking" = yes; then
-- # Warning - without using the other runtime loading flags (-brtl),
-- # -berok will link without error, but may produce a broken library.
-- allow_undefined_flag_F77='-berok'
-- # Determine the default libpath from the value encoded in an empty executable.
-- cat >conftest.$ac_ext <<_ACEOF
-- program main
-+ os2*)
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_minus_L_F77=yes
-+ allow_undefined_flag_F77=unsupported
-+ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-
-- end
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
-- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-- else
-- if test "$host_cpu" = ia64; then
-- hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-- allow_undefined_flag_F77="-z nodefs"
-- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-- else
-- # Determine the default libpath from the value encoded in an empty executable.
-- cat >conftest.$ac_ext <<_ACEOF
-- program main
--
-- end
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
-- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-- # Warning - without using the other run time loading flags,
-- # -berok will link without error, but may produce a broken library.
-- no_undefined_flag_F77=' ${wl}-bernotok'
-- allow_undefined_flag_F77=' ${wl}-berok'
-- # -bexpall does not export symbols beginning with underscore (_)
-- always_export_symbols_F77=yes
-- # Exported symbols can be pulled into shared objects from archives
-- whole_archive_flag_spec_F77=' '
-- archive_cmds_need_lc_F77=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
-- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-- fi
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ allow_undefined_flag_F77=' -expect_unresolved \*'
-+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
- ;;
-
-- amigaos*)
-- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_minus_L_F77=yes
-- # see comment about different semantics on the GNU ld section
-- ld_shlibs_F77=no
-- ;;
--
-- bsdi[45]*)
-- export_dynamic_flag_spec_F77=-rdynamic
-- ;;
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ else
-+ allow_undefined_flag_F77=' -expect_unresolved \*'
-+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-- cygwin* | mingw* | pw32*)
-- # When not using gcc, we currently assume that we are using
-- # Microsoft Visual C++.
-- # hardcode_libdir_flag_spec is actually meaningless, as there is
-- # no search path for DLLs.
-- hardcode_libdir_flag_spec_F77=' '
-- allow_undefined_flag_F77=unsupported
-- # Tell ltmain to make .lib files, not .a files.
-- libext=lib
-- # Tell ltmain to make .dll files, not .so files.
-- shrext_cmds=".dll"
-- # FIXME: Setting linknames here is a bad hack.
-- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-- # The linker will automatically build a .lib file if we build a DLL.
-- old_archive_From_new_cmds_F77='true'
-- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-- fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-- enable_shared_with_static_runtimes_F77=yes
-+ # Both c and cxx compiler support -rpath directly
-+ hardcode_libdir_flag_spec_F77='-rpath $libdir'
-+ fi
-+ hardcode_libdir_separator_F77=:
- ;;
-
-- darwin* | rhapsody*)
-- case "$host_os" in
-- rhapsody* | darwin1.[012])
-- allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[012])
-- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-+ solaris*)
-+ no_undefined_flag_F77=' -z text'
-+ if test "$GCC" = yes; then
-+ wlarc='${wl}'
-+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+ else
-+ wlarc=''
-+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ fi
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_shlibpath_var_F77=no
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *)
-+ # The compiler driver will combine linker options so we
-+ # cannot just pass the convience library names through
-+ # without $wl, iff we do not link with $LD.
-+ # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ case $wlarc in
-+ '')
-+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+ *)
-+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ esac ;;
- esac
-- archive_cmds_need_lc_F77=no
-- hardcode_direct_F77=no
-- hardcode_automatic_F77=yes
-- hardcode_shlibpath_var_F77=unsupported
-- whole_archive_flag_spec_F77=''
- link_all_deplibs_F77=yes
-- if test "$GCC" = yes ; then
-- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- case $cc_basename in
-- xlc*)
-- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- ;;
-- *)
-- ld_shlibs_F77=no
-- ;;
-- esac
-- fi
- ;;
-
-- dgux*)
-- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
- hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_minus_L_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
-- freebsd1*)
-- ld_shlibs_F77=no
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=yes # is this really true???
-+ ;;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ reload_cmds_F77='$CC -r -o $output$reload_objs'
-+ hardcode_direct_F77=no
-+ ;;
-+ motorola)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-+ ;;
-+ esac
-+ runpath_var='LD_RUN_PATH'
-+ hardcode_shlibpath_var_F77=no
- ;;
-
-- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-- # support. Future versions do this automatically, but an explicit c++rt0.o
-- # does not break anything, and helps significantly (at the cost of a little
-- # extra space).
-- freebsd2.2*)
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- hardcode_direct_F77=yes
-+ sysv4.3*)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_F77=no
-- ;;
--
-- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_F77=yes
-- hardcode_minus_L_F77=yes
-- hardcode_shlibpath_var_F77=no
-- ;;
--
-- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- ;;
--
-- hpux9*)
-- if test "$GCC" = yes; then
-- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- else
-- archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- fi
-- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator_F77=:
-- hardcode_direct_F77=yes
--
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L_F77=yes
-- export_dynamic_flag_spec_F77='${wl}-E'
-- ;;
--
-- hpux10* | hpux11*)
-- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- ;;
-- *)
-- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-- ;;
-- esac
-- else
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-- ;;
-- *)
-- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-- ;;
-- esac
-- fi
-- if test "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*)
-- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-- hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-- hardcode_libdir_separator_F77=:
-- hardcode_direct_F77=no
-- hardcode_shlibpath_var_F77=no
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_direct_F77=no
-- hardcode_shlibpath_var_F77=no
--
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L_F77=yes
-- ;;
-- *)
-- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator_F77=:
-- hardcode_direct_F77=yes
-- export_dynamic_flag_spec_F77='${wl}-E'
--
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L_F77=yes
-- ;;
-- esac
-- fi
-- ;;
--
-- irix5* | irix6* | nonstopux*)
-- if test "$GCC" = yes; then
-- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-- fi
-- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-- hardcode_libdir_separator_F77=:
-- link_all_deplibs_F77=yes
-- ;;
--
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-- else
-- archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-- fi
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- ;;
--
-- newsos6)
-- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_F77=yes
-- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-- hardcode_libdir_separator_F77=:
-- hardcode_shlibpath_var_F77=no
-- ;;
--
-- openbsd*)
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_F77='${wl}-E'
-- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- ;;
-- *)
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- ;;
-- esac
-- fi
-- ;;
--
-- os2*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_minus_L_F77=yes
-- allow_undefined_flag_F77=unsupported
-- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-- old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-- ;;
--
-- osf3*)
-- if test "$GCC" = yes; then
-- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- allow_undefined_flag_F77=' -expect_unresolved \*'
-- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- fi
-- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-- hardcode_libdir_separator_F77=:
-- ;;
--
-- osf4* | osf5*) # as osf3* with the addition of -msym flag
-- if test "$GCC" = yes; then
-- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-- else
-- allow_undefined_flag_F77=' -expect_unresolved \*'
-- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
--
-- # Both c and cxx compiler support -rpath directly
-- hardcode_libdir_flag_spec_F77='-rpath $libdir'
-- fi
-- hardcode_libdir_separator_F77=:
-- ;;
--
-- sco3.2v5*)
-- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_shlibpath_var_F77=no
-- export_dynamic_flag_spec_F77='${wl}-Bexport'
-- runpath_var=LD_RUN_PATH
-- hardcode_runpath_var=yes
-- ;;
--
-- solaris*)
-- no_undefined_flag_F77=' -z text'
-- if test "$GCC" = yes; then
-- wlarc='${wl}'
-- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-- else
-- wlarc=''
-- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-- fi
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- hardcode_shlibpath_var_F77=no
-- case $host_os in
-- solaris2.[0-5] | solaris2.[0-5].*) ;;
-- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-- esac
-- link_all_deplibs_F77=yes
-- ;;
--
-- sunos4*)
-- if test "x$host_vendor" = xsequent; then
-- # Use $CC to link under sequent, because it throws in some extra .o
-- # files that make .init and .fini sections work.
-- archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
-- archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-- fi
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_direct_F77=yes
-- hardcode_minus_L_F77=yes
-- hardcode_shlibpath_var_F77=no
-- ;;
--
-- sysv4)
-- case $host_vendor in
-- sni)
-- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_F77=yes # is this really true???
-- ;;
-- siemens)
-- ## LD is ld it makes a PLAMLIB
-- ## CC just makes a GrossModule.
-- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-- reload_cmds_F77='$CC -r -o $output$reload_objs'
-- hardcode_direct_F77=no
-- ;;
-- motorola)
-- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-- ;;
-- esac
-- runpath_var='LD_RUN_PATH'
-- hardcode_shlibpath_var_F77=no
-- ;;
--
-- sysv4.3*)
-- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_shlibpath_var_F77=no
-- export_dynamic_flag_spec_F77='-Bexport'
-+ export_dynamic_flag_spec_F77='-Bexport'
- ;;
-
- sysv4*MP*)
-@@ -14729,36 +14426,45 @@
- fi
- ;;
-
-- sysv4.2uw2*)
-- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_F77=yes
-- hardcode_minus_L_F77=no
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ no_undefined_flag_F77='${wl}-z,text'
-+ archive_cmds_need_lc_F77=no
- hardcode_shlibpath_var_F77=no
-- hardcode_runpath_var=yes
-- runpath_var=LD_RUN_PATH
-- ;;
-+ runpath_var='LD_RUN_PATH'
-
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-- no_undefined_flag_F77='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
-- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
-- runpath_var='LD_RUN_PATH'
-- hardcode_shlibpath_var_F77=no
- ;;
-
-- sysv5*)
-- no_undefined_flag_F77=' -z text'
-- # $CC -shared without GNU ld will not create a library from C++
-- # object files and a static libstdc++, better avoid it by now
-- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-- hardcode_libdir_flag_spec_F77=
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
-+ no_undefined_flag_F77='${wl}-z,text'
-+ allow_undefined_flag_F77='${wl}-z,nodefs'
-+ archive_cmds_need_lc_F77=no
- hardcode_shlibpath_var_F77=no
-+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ hardcode_libdir_separator_F77=':'
-+ link_all_deplibs_F77=yes
-+ export_dynamic_flag_spec_F77='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
- ;;
-
- uts4*)
-@@ -14777,11 +14483,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
- test "$ld_shlibs_F77" = no && can_build_shared=no
-
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
-- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--
- #
- # Do we need to explicitly link libc?
- #
-@@ -14814,6 +14515,7 @@
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl_F77
-+ pic_flag=$lt_prog_compiler_pic_F77
- compiler_flags=-v
- linker_flags=-v
- verstring=
-@@ -14974,7 +14676,8 @@
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
-- $install_prog $dir/$dlname \$dldir/$dlname'
-+ $install_prog $dir/$dlname \$dldir/$dlname~
-+ chmod a+x \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
-@@ -15027,7 +14730,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -15065,7 +14768,14 @@
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test -x /usr/bin/objformat; then
-+ objformat=`/usr/bin/objformat`
-+ else
-+ case $host_os in
-+ freebsd[123]*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-@@ -15087,10 +14797,15 @@
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-- *) # from 3.2 on
-+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-+ freebsd*) # from 4.6 on
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
- esac
- ;;
-
-@@ -15110,7 +14825,7 @@
- version_type=sunos
- need_lib_prefix=no
- need_version=no
-- case "$host_cpu" in
-+ case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
-@@ -15150,6 +14865,18 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-@@ -15222,6 +14949,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
-@@ -15271,6 +15010,7 @@
-
- openbsd*)
- version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
-@@ -15314,13 +15054,6 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
--sco3.2v5*)
-- version_type=osf
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -15346,7 +15079,7 @@
- need_version=yes
- ;;
-
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-@@ -15379,6 +15112,29 @@
- fi
- ;;
-
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15394,6 +15150,11 @@
- echo "${ECHO_T}$dynamic_linker" >&6
- test "$dynamic_linker" = no && can_build_shared=no
-
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_F77=
-@@ -15431,36 +15192,6 @@
- enable_fast_install=needless
- fi
-
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
--# FIXME - insert some real tests, host_os isn't really good enough
-- case $host_os in
-- darwin*)
-- if test -n "$STRIP" ; then
-- striplib="$STRIP -x"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-- ;;
-- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- ;;
-- esac
--fi
--
--
-
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -15475,7 +15206,7 @@
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -15593,6 +15324,9 @@
- # A C compiler.
- LTCC=$lt_LTCC
-
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
- # A language-specific compiler.
- CC=$lt_compiler_F77
-
-@@ -15903,6 +15637,9 @@
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
-
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
-
-@@ -15910,13 +15647,13 @@
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-
-@@ -15964,20 +15701,20 @@
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:15970: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15707: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15974: \$? = $ac_status" >&5
-+ echo "$as_me:15711: \$? = $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.
-- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_rtti_exceptions=yes
- fi
- fi
-@@ -16038,6 +15775,11 @@
- lt_prog_compiler_pic_GCJ='-fno-common'
- ;;
-
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
-+ ;;
-+
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
-@@ -16054,7 +15796,7 @@
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -16101,7 +15843,7 @@
- lt_prog_compiler_wl_GCJ='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -16131,12 +15873,12 @@
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-static'
- ;;
-- pgcc* | pgf77* | pgf90*)
-+ pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-fpic'
-- lt_prog_compiler_static_GCJ='-static'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
- ccc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16152,11 +15894,6 @@
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
-- sco3.2v5*)
-- lt_prog_compiler_pic_GCJ='-Kpic'
-- lt_prog_compiler_static_GCJ='-dn'
-- ;;
--
- solaris*)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16174,7 +15911,7 @@
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
-- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16187,6 +15924,12 @@
- fi
- ;;
-
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ ;;
-+
- unicos*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_can_build_shared_GCJ=no
-@@ -16226,20 +15969,20 @@
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:16232: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15975: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16236: \$? = $ac_status" >&5
-+ echo "$as_me:15979: \$? = $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.
-- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-- $SED '/^$/d' conftest.err >conftest.er2
-- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_GCJ=yes
- fi
- fi
-@@ -16260,7 +16003,7 @@
- fi
-
- fi
--case "$host_os" in
-+case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_GCJ=
-@@ -16270,6 +16013,48 @@
- ;;
- esac
-
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_static_works_GCJ=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The linker can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&5
-+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works_GCJ=yes
-+ fi
-+ else
-+ lt_prog_compiler_static_works_GCJ=yes
-+ fi
-+ fi
-+ $rm conftest*
-+ LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
-+
-+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-+ :
-+else
-+ lt_prog_compiler_static_GCJ=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -16288,25 +16073,25 @@
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -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:16294: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16079: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:16298: \$? = $ac_status" >&5
-+ echo "$as_me:16083: \$? = $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
- # So say no if there are warnings
-- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-- $SED '/^$/d' out/conftest.err >out/conftest.er2
-- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_c_o_GCJ=yes
- fi
- fi
-- chmod u+w .
-+ chmod u+w . 2>&5
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
-@@ -16402,6 +16187,10 @@
- with_gnu_ld=no
- fi
- ;;
-+ interix*)
-+ # we just hope/assume this is gcc and not c89 (= MSVC++)
-+ with_gnu_ld=yes
-+ ;;
- openbsd*)
- with_gnu_ld=no
- ;;
-@@ -16486,7 +16275,7 @@
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $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
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16495,22 +16284,37 @@
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
-- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
-+ interix3*)
-+ hardcode_direct_GCJ=no
-+ hardcode_shlibpath_var_GCJ=no
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_GCJ='${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.
-+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ archive_expsym_cmds_GCJ='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'
-+ ;;
-+
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
-- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
-- pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
-- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
-+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
- tmp_addflag=' -i_dynamic' ;;
-@@ -16527,12 +16331,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_GCJ=no
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -16542,7 +16347,7 @@
- fi
- ;;
-
-- solaris* | sysv5*)
-+ solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs_GCJ=no
- cat <<EOF 1>&2
-@@ -16563,6 +16368,33 @@
- fi
- ;;
-
-+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+ case `$LD -v 2>&1` in
-+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+ ld_shlibs_GCJ=no
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+ ;;
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- sunos4*)
- archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
-@@ -16596,7 +16428,7 @@
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L_GCJ=yes
-- if test "$GCC" = yes && test -z "$link_static_flag"; then
-+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- hardcode_direct_GCJ=unsupported
-@@ -16630,6 +16462,7 @@
- break
- fi
- done
-+ ;;
- esac
-
- exp_sym_flag='-bexport'
-@@ -16667,6 +16500,7 @@
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_libdir_separator_GCJ=
- fi
-+ ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
-@@ -16679,11 +16513,11 @@
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
-- if test "$aix_use_runtimelinking" = yes; then
-+ if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
-- fi
-+ fi
- fi
- fi
-
-@@ -16719,8 +16553,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -16748,12 +16581,12 @@
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag_GCJ="-z nodefs"
-- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16780,8 +16613,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -16813,13 +16645,11 @@
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag_GCJ=' ${wl}-bernotok'
- allow_undefined_flag_GCJ=' ${wl}-berok'
-- # -bexpall does not export symbols beginning with underscore (_)
-- always_export_symbols_GCJ=yes
- # Exported symbols can be pulled into shared objects from archives
-- whole_archive_flag_spec_GCJ=' '
-+ whole_archive_flag_spec_GCJ='$convenience'
- archive_cmds_need_lc_GCJ=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
-- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-@@ -16858,7 +16688,7 @@
- ;;
-
- darwin* | rhapsody*)
-- case "$host_os" in
-+ case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
- ;;
-@@ -16887,7 +16717,7 @@
- output_verbose_link_cmd='echo'
- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
-@@ -16896,7 +16726,7 @@
- output_verbose_link_cmd='echo'
- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
-@@ -16937,11 +16767,20 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
-+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-+ kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
-+ link_all_deplibs_GCJ=no
- ;;
-
- hpux9*)
-@@ -16960,47 +16799,62 @@
- export_dynamic_flag_spec_GCJ='${wl}-E'
- ;;
-
-- hpux10* | hpux11*)
-+ hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_GCJ=:
-+
-+ hardcode_direct_GCJ=yes
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_GCJ=yes
-+ fi
-+ ;;
-+
-+ hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case $host_cpu in
-+ hppa*64*)
- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
-+ ia64*)
-+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
- *)
- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ case $host_cpu in
-+ hppa*64*)
-+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
-- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*)
-- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_GCJ=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-- hardcode_libdir_separator_GCJ=:
-- hardcode_direct_GCJ=no
-- hardcode_shlibpath_var_GCJ=no
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
--
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L_GCJ=yes
- ;;
- *)
-- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator_GCJ=:
- hardcode_direct_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
-
-@@ -17024,7 +16878,7 @@
- link_all_deplibs_GCJ=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -17102,14 +16956,6 @@
- hardcode_libdir_separator_GCJ=:
- ;;
-
-- sco3.2v5*)
-- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_shlibpath_var_GCJ=no
-- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-- runpath_var=LD_RUN_PATH
-- hardcode_runpath_var=yes
-- ;;
--
- solaris*)
- no_undefined_flag_GCJ=' -z text'
- if test "$GCC" = yes; then
-@@ -17195,36 +17041,45 @@
- fi
- ;;
-
-- sysv4.2uw2*)
-- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_GCJ=yes
-- hardcode_minus_L_GCJ=no
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ no_undefined_flag_GCJ='${wl}-z,text'
-+ archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-- hardcode_runpath_var=yes
-- runpath_var=LD_RUN_PATH
-- ;;
-+ runpath_var='LD_RUN_PATH'
-
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-- no_undefined_flag_GCJ='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
-- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
-- runpath_var='LD_RUN_PATH'
-- hardcode_shlibpath_var_GCJ=no
- ;;
-
-- sysv5*)
-- no_undefined_flag_GCJ=' -z text'
-- # $CC -shared without GNU ld will not create a library from C++
-- # object files and a static libstdc++, better avoid it by now
-- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-- hardcode_libdir_flag_spec_GCJ=
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
-+ no_undefined_flag_GCJ='${wl}-z,text'
-+ allow_undefined_flag_GCJ='${wl}-z,nodefs'
-+ archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ hardcode_libdir_separator_GCJ=':'
-+ link_all_deplibs_GCJ=yes
-+ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
- ;;
-
- uts4*)
-@@ -17243,1493 +17098,713 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
-- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--
--#
--# Do we need to explicitly link libc?
- #
--case "x$archive_cmds_need_lc_GCJ" in
--x|xyes)
-- # Assume -lc should be added
-- archive_cmds_need_lc_GCJ=yes
--
-- if test "$enable_shared" = yes && test "$GCC" = yes; then
-- case $archive_cmds_GCJ in
-- *'~'*)
-- # FIXME: we may have to deal with multi-command sequences.
-- ;;
-- '$CC '*)
-- # 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.
-- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } 2>conftest.err; then
-- soname=conftest
-- lib=conftest
-- libobjs=conftest.$ac_objext
-- deplibs=
-- wl=$lt_prog_compiler_wl_GCJ
-- compiler_flags=-v
-- linker_flags=-v
-- verstring=
-- output_objdir=.
-- libname=conftest
-- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-- allow_undefined_flag_GCJ=
-- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
-- then
-- archive_cmds_need_lc_GCJ=no
-- else
-- archive_cmds_need_lc_GCJ=yes
-- fi
-- allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-- else
-- cat conftest.err 1>&5
-- fi
-- $rm conftest*
-- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-- ;;
-- esac
-- fi
-- ;;
--esac
--
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
--library_names_spec=
--libname_spec='lib$name'
--soname_spec=
--shrext_cmds=".so"
--postinstall_cmds=
--postuninstall_cmds=
--finish_cmds=
--finish_eval=
--shlibpath_var=
--shlibpath_overrides_runpath=unknown
--version_type=none
--dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
--need_lib_prefix=unknown
--hardcode_into_libs=no
--
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
--
--case $host_os in
--aix3*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-- shlibpath_var=LIBPATH
--
-- # AIX 3 has no versioning support, so we append a major version to the name.
-- soname_spec='${libname}${release}${shared_ext}$major'
-- ;;
--
--aix4* | aix5*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- hardcode_into_libs=yes
-- if test "$host_cpu" = ia64; then
-- # AIX 5 supports IA64
-- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- else
-- # With GCC up to 2.95.x, collect2 would create an import file
-- # for dependence libraries. The import file would start with
-- # the line `#! .'. This would cause the generated library to
-- # depend on `.', always an invalid library. This was fixed in
-- # development snapshots of GCC prior to 3.0.
-- case $host_os in
-- aix4 | aix4.[01] | aix4.[01].*)
-- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-- echo ' yes '
-- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-- :
-- else
-- can_build_shared=no
-- fi
-- ;;
-- esac
-- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-- # soname into executable. Probably we can add versioning support to
-- # collect2, so additional links can be useful in future.
-- if test "$aix_use_runtimelinking" = yes; then
-- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-- # instead of lib<name>.a to let people know that these are not
-- # typical AIX shared libraries.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- else
-- # We preserve .a as extension for shared libraries through AIX4.2
-- # and later when we are not doing run time linking.
-- library_names_spec='${libname}${release}.a $libname.a'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- fi
-- shlibpath_var=LIBPATH
-- fi
-- ;;
--
--amigaos*)
-- library_names_spec='$libname.ixlibrary $libname.a'
-- # Create ${libname}_ixlibrary.a entries in /sys/libs.
-- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-- ;;
--
--beos*)
-- library_names_spec='${libname}${shared_ext}'
-- dynamic_linker="$host_os ld.so"
-- shlibpath_var=LIBRARY_PATH
-- ;;
--
--bsdi[45]*)
-- version_type=linux
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-- # the default ld.so.conf also contains /usr/contrib/lib and
-- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-- # libtool to hard-code these into programs
-- ;;
--
--cygwin* | mingw* | pw32*)
-- version_type=windows
-- shrext_cmds=".dll"
-- need_version=no
-- need_lib_prefix=no
--
-- case $GCC,$host_os in
-- yes,cygwin* | yes,mingw* | yes,pw32*)
-- library_names_spec='$libname.dll.a'
-- # DLL is installed to $(libdir)/../bin by postinstall_cmds
-- postinstall_cmds='base_file=`basename \${file}`~
-- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-- dldir=$destdir/`dirname \$dlpath`~
-- test -d \$dldir || mkdir -p \$dldir~
-- $install_prog $dir/$dlname \$dldir/$dlname'
-- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-- dlpath=$dir/\$dldll~
-- $rm \$dlpath'
-- shlibpath_overrides_runpath=yes
--
-- case $host_os in
-- cygwin*)
-- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-- ;;
-- mingw*)
-- # MinGW DLLs use traditional 'lib' prefix
-- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-- # It is most probably a Windows format PATH printed by
-- # mingw gcc, but we are running on Cygwin. Gcc prints its search
-- # path with ; separators, and with drive letters. We can handle the
-- # drive letters (cygwin fileutils understands them), so leave them,
-- # especially as we might pass files found there to a mingw objdump,
-- # which wouldn't understand a cygwinified path. Ahh.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
-- ;;
-- pw32*)
-- # pw32 DLLs use 'pw' prefix rather than 'lib'
-- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-- ;;
-- esac
-- ;;
--
-- *)
-- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-- ;;
-- esac
-- dynamic_linker='Win32 ld.exe'
-- # FIXME: first we should search . and the directory the executable is in
-- shlibpath_var=PATH
-- ;;
--
--darwin* | rhapsody*)
-- dynamic_linker="$host_os dyld"
-- version_type=darwin
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-- soname_spec='${libname}${release}${major}$shared_ext'
-- shlibpath_overrides_runpath=yes
-- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-- ;;
--
--dgux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--freebsd1*)
-- dynamic_linker=no
-- ;;
--
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
--freebsd* | dragonfly*)
-- # DragonFly does not have aout. When/if they implement a new
-- # versioning mechanism, adjust this.
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-- need_version=no
-- need_lib_prefix=no
-- ;;
-- freebsd-*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-- need_version=yes
-- ;;
-- esac
-- shlibpath_var=LD_LIBRARY_PATH
-- case $host_os in
-- freebsd2*)
-- shlibpath_overrides_runpath=yes
-- ;;
-- freebsd3.[01]* | freebsdelf3.[01]*)
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
-- *) # from 3.2 on
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- ;;
-- esac
-- ;;
--
--gnu*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- hardcode_into_libs=yes
-- ;;
--
--hpux9* | hpux10* | hpux11*)
-- # Give a soname corresponding to the major version so that dld.sl refuses to
-- # link against other versions.
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
-- case "$host_cpu" in
-- ia64*)
-- shrext_cmds='.so'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.so"
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- if test "X$HPUX_IA64_MODE" = X32; then
-- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-- else
-- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-- fi
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- hppa*64*)
-- shrext_cmds='.sl'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- *)
-- shrext_cmds='.sl'
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=SHLIB_PATH
-- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- ;;
-- esac
-- # HP-UX runs *really* slowly unless shared libraries are mode 555.
-- postinstall_cmds='chmod 555 $lib'
-- ;;
--
--irix5* | irix6* | nonstopux*)
-- case $host_os in
-- nonstopux*) version_type=nonstopux ;;
-- *)
-- if test "$lt_cv_prog_gnu_ld" = yes; then
-- version_type=linux
-- else
-- version_type=irix
-- fi ;;
-- esac
-- need_lib_prefix=no
-- need_version=no
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-- case $host_os in
-- irix5* | nonstopux*)
-- libsuff= shlibsuff=
-- ;;
-- *)
-- case $LD in # libtool.m4 will add one of these switches to LD
-- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-- libsuff= shlibsuff= libmagic=32-bit;;
-- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-- libsuff=32 shlibsuff=N32 libmagic=N32;;
-- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-- libsuff=64 shlibsuff=64 libmagic=64-bit;;
-- *) libsuff= shlibsuff= libmagic=never-match;;
-- esac
-- ;;
-- esac
-- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-- shlibpath_overrides_runpath=no
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-- hardcode_into_libs=yes
-- ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
-- dynamic_linker=no
-- ;;
--
--# This must be Linux ELF.
--linux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- # This implies no fast_install, which is unacceptable.
-- # Some rework will be needed to allow for fast_install
-- # before this can be enabled.
-- hardcode_into_libs=yes
--
-- # Append ld.so.conf contents to the search path
-- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-- fi
--
-- # We used to test for /lib/ld.so.1 and disable shared libraries on
-- # powerpc, because MkLinux only supported shared libraries with the
-- # GNU dynamic linker. Since this was broken with cross compilers,
-- # most powerpc-linux boxes support dynamic linking these days and
-- # people can always --disable-shared, the test was removed, and we
-- # assume the GNU/Linux dynamic linker is in use.
-- dynamic_linker='GNU/Linux ld.so'
-- ;;
--
--knetbsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
--netbsd*)
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- dynamic_linker='NetBSD (a.out) ld.so'
-- else
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- dynamic_linker='NetBSD ld.elf_so'
-- fi
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
--
--newsos6)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- ;;
--
--nto-qnx*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- ;;
--
--openbsd*)
-- version_type=sunos
-- need_lib_prefix=no
-- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-- case $host_os in
-- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-- *) need_version=no ;;
-- esac
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- case $host_os in
-- openbsd2.[89] | openbsd2.[89].*)
-- shlibpath_overrides_runpath=no
-- ;;
-- *)
-- shlibpath_overrides_runpath=yes
-- ;;
-- esac
-- else
-- shlibpath_overrides_runpath=yes
-- fi
-- ;;
--
--os2*)
-- libname_spec='$name'
-- shrext_cmds=".dll"
-- need_lib_prefix=no
-- library_names_spec='$libname${shared_ext} $libname.a'
-- dynamic_linker='OS/2 ld.exe'
-- shlibpath_var=LIBPATH
-- ;;
--
--osf3* | osf4* | osf5*)
-- version_type=osf
-- need_lib_prefix=no
-- need_version=no
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-- ;;
--
--sco3.2v5*)
-- version_type=osf
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--solaris*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- # ldd complains unless libraries are executable
-- postinstall_cmds='chmod +x $lib'
-- ;;
--
--sunos4*)
-- version_type=sunos
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- if test "$with_gnu_ld" = yes; then
-- need_lib_prefix=no
-- fi
-- need_version=yes
-- ;;
--
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- case $host_vendor in
-- sni)
-- shlibpath_overrides_runpath=no
-- need_lib_prefix=no
-- export_dynamic_flag_spec='${wl}-Blargedynsym'
-- runpath_var=LD_RUN_PATH
-- ;;
-- siemens)
-- need_lib_prefix=no
-- ;;
-- motorola)
-- need_lib_prefix=no
-- need_version=no
-- shlibpath_overrides_runpath=no
-- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-- ;;
-- esac
-- ;;
--
--sysv4*MP*)
-- if test -d /usr/nec ;then
-- version_type=linux
-- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-- soname_spec='$libname${shared_ext}.$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- fi
-- ;;
--
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
-- dynamic_linker=no
-- ;;
--esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
--test "$dynamic_linker" = no && can_build_shared=no
--
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action_GCJ=
--if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-- test -n "$runpath_var_GCJ" || \
-- test "X$hardcode_automatic_GCJ" = "Xyes" ; then
--
-- # We can hardcode non-existant directories.
-- if test "$hardcode_direct_GCJ" != no &&
-- # If the only mechanism to avoid hardcoding is shlibpath_var, we
-- # have to relink, otherwise we might link with an installed library
-- # when we should be linking with a yet-to-be-installed one
-- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-- test "$hardcode_minus_L_GCJ" != no; then
-- # Linking always hardcodes the temporary library directory.
-- hardcode_action_GCJ=relink
-- else
-- # We can link without hardcoding, and we can hardcode nonexisting dirs.
-- hardcode_action_GCJ=immediate
-- fi
--else
-- # We cannot hardcode anything, or else we can only hardcode existing
-- # directories.
-- hardcode_action_GCJ=unsupported
--fi
--echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6
--
--if test "$hardcode_action_GCJ" = relink; then
-- # Fast installation is not supported
-- enable_fast_install=no
--elif test "$shlibpath_overrides_runpath" = yes ||
-- test "$enable_shared" = no; then
-- # Fast installation is not necessary
-- enable_fast_install=needless
--fi
--
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
--# FIXME - insert some real tests, host_os isn't really good enough
-- case $host_os in
-- darwin*)
-- if test -n "$STRIP" ; then
-- striplib="$STRIP -x"
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-- ;;
-- *)
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- ;;
-- esac
--fi
--
--if test "x$enable_dlopen" != xyes; then
-- enable_dlopen=unknown
-- enable_dlopen_self=unknown
-- enable_dlopen_self_static=unknown
--else
-- lt_cv_dlopen=no
-- lt_cv_dlopen_libs=
--
-- case $host_os in
-- beos*)
-- lt_cv_dlopen="load_add_on"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
-- ;;
--
-- mingw* | pw32*)
-- lt_cv_dlopen="LoadLibrary"
-- lt_cv_dlopen_libs=
-- ;;
--
-- cygwin*)
-- lt_cv_dlopen="dlopen"
-- lt_cv_dlopen_libs=
-- ;;
--
-- darwin*)
-- # if libdl is installed we need to link against it
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dl_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = 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
--
-- ;;
--
-- *)
-- echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
--if test "${ac_cv_func_shl_load+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&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 gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--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
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
--#endif
--
--int
--main ()
--{
--return f != shl_load;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_func_shl_load=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_func_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
--if test $ac_cv_func_shl_load = yes; then
-- lt_cv_dlopen="shl_load"
--else
-- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char shl_load ();
--int
--main ()
--{
--shl_load ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dld_shl_load=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_dld_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
--if test $ac_cv_lib_dld_shl_load = yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
--else
-- echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
--if test "${ac_cv_func_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); 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 dlopen
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--/* 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_dlopen) || defined (__stub___dlopen)
--choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
--#endif
--
--int
--main ()
--{
--return f != dlopen;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_func_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_func_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
--if test $ac_cv_func_dlopen = yes; then
-- lt_cv_dlopen="dlopen"
--else
-- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dl_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
-- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_svld_dlopen=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_svld_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
--if test $ac_cv_lib_svld_dlopen = yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
--else
-- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_GCJ" in
-+x|xyes)
-+ # Assume -lc should be added
-+ archive_cmds_need_lc_GCJ=yes
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dld_link ();
--int
--main ()
--{
--dld_link ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $archive_cmds_GCJ in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # 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.
-+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$lt_prog_compiler_wl_GCJ
-+ pic_flag=$lt_prog_compiler_pic_GCJ
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-+ allow_undefined_flag_GCJ=
-+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dld_dld_link=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ (exit $ac_status); }
-+ then
-+ archive_cmds_need_lc_GCJ=no
-+ else
-+ archive_cmds_need_lc_GCJ=yes
-+ fi
-+ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $rm conftest*
-+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-
--ac_cv_lib_dld_dld_link=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
--if test $ac_cv_lib_dld_dld_link = yes; then
-- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-
--fi
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-
--fi
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-
--fi
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-
-+bsdi[45]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-
--fi
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-
-+ case $GCC,$host_os in
-+ yes,cygwin* | yes,mingw* | yes,pw32*)
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+ dldir=$destdir/`dirname \$dlpath`~
-+ test -d \$dldir || mkdir -p \$dldir~
-+ $install_prog $dir/$dlname \$dldir/$dlname~
-+ chmod a+x \$dldir/$dlname'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $rm \$dlpath'
-+ shlibpath_overrides_runpath=yes
-
--fi
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+ ;;
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
-+ ;;
-
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-
-- if test "x$lt_cv_dlopen" != xno; then
-- enable_dlopen=yes
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+ if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
-- enable_dlopen=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-
-- case $lt_cv_dlopen in
-- dlopen)
-- save_CPPFLAGS="$CPPFLAGS"
-- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
-- save_LDFLAGS="$LDFLAGS"
-- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+dgux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-
-- save_LIBS="$LIBS"
-- LIBS="$lt_cv_dlopen_libs $LIBS"
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
-
-- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 18534 "configure"
--#include "confdefs.h"
-+kfreebsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ if test -x /usr/bin/objformat; then
-+ objformat=`/usr/bin/objformat`
-+ else
-+ case $host_os in
-+ freebsd[123]*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[01]* | freebsdelf3.[01]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ freebsd*) # from 4.6 on
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-
--#include <stdio.h>
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case $host_cpu in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
-+# This must be Linux ELF.
-+linux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-
-- exit (status);
--}
--EOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self=no
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
--fi
--rm -fr conftest*
-
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-
-- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self_static=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 18632 "configure"
--#include "confdefs.h"
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-
--#include <stdio.h>
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
-+openbsd*)
-+ version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ need_lib_prefix=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
-+ esac
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[89] | openbsd2.[89].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
-+solaris*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-
-- exit (status);
--}
--EOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ export_dynamic_flag_spec='${wl}-Blargedynsym'
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ fi
-+ ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self_static=no
- fi
--fi
--rm -fr conftest*
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
-+test "$dynamic_linker" = no && can_build_shared=no
-
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-- fi
-
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
-- ;;
-- esac
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+hardcode_action_GCJ=
-+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-+ test -n "$runpath_var_GCJ" || \
-+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
-+ # We can hardcode non-existant directories.
-+ if test "$hardcode_direct_GCJ" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-+ test "$hardcode_minus_L_GCJ" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ hardcode_action_GCJ=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ hardcode_action_GCJ=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ hardcode_action_GCJ=unsupported
-+fi
-+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-- case $lt_cv_dlopen_self_static in
-- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-- *) enable_dlopen_self_static=unknown ;;
-- esac
-+if test "$hardcode_action_GCJ" = relink; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
- fi
-
-
-@@ -18746,7 +17821,7 @@
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -18864,6 +17939,9 @@
- # A C compiler.
- LTCC=$lt_LTCC
-
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
- # A language-specific compiler.
- CC=$lt_compiler_GCJ
-
-@@ -19173,6 +18251,9 @@
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
-
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
-
-@@ -19180,13 +18261,13 @@
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-
-@@ -19221,7 +18302,7 @@
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-@@ -19339,6 +18420,9 @@
- # A C compiler.
- LTCC=$lt_LTCC
-
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
- # A language-specific compiler.
- CC=$lt_compiler_RC
-
-@@ -19727,11 +18811,11 @@
- fi
-
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ 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
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-@@ -19756,7 +18840,6 @@
- done
- done
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
- esac
- fi
-@@ -19770,78 +18853,19 @@
- echo "${ECHO_T}no" >&6
- fi
-
-- fi
--
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for evolution-data-server-1.2 >= 1.3.5" >&5
--echo $ECHO_N "checking for evolution-data-server-1.2 >= 1.3.5... $ECHO_C" >&6
--
-- if $PKG_CONFIG --exists "evolution-data-server-1.2 >= 1.3.5" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- succeeded=yes
--
-- echo "$as_me:$LINENO: checking BASE_DEPENDENCIES_CFLAGS" >&5
--echo $ECHO_N "checking BASE_DEPENDENCIES_CFLAGS... $ECHO_C" >&6
-- BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 1.3.5"`
-- echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_CFLAGS" >&5
--echo "${ECHO_T}$BASE_DEPENDENCIES_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking BASE_DEPENDENCIES_LIBS" >&5
--echo $ECHO_N "checking BASE_DEPENDENCIES_LIBS... $ECHO_C" >&6
-- BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 1.3.5"`
-- echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_LIBS" >&5
--echo "${ECHO_T}$BASE_DEPENDENCIES_LIBS" >&6
-- else
-- BASE_DEPENDENCIES_CFLAGS=""
-- BASE_DEPENDENCIES_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.3.5"`
--
-- fi
--
--
--
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
--
-- if test $succeeded = yes; then
-- eds13=yes
-- else
-- eds13=no
-- fi
--
--if test "x$eds13" = "xyes"; then
-- EDS_VERSION=-1.2
-- EDS_SOVERSION=4
-- EBOOK_SOVERSION=5
-- ECAL_SOVERSION=3
--else
--
-- succeeded=no
--
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+ 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
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $PKG_CONFIG in
-+ case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -19851,80 +18875,266 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
- esac
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
--if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-- fi
--
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0" >&5
--echo $ECHO_N "checking for evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0... $ECHO_C" >&6
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
-+else
-+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-
-- if $PKG_CONFIG --exists "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.9.0
-+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- succeeded=yes
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ PKG_CONFIG=""
-+ fi
-+
-+fi
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
-+echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 1.3.5\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 1.3.5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 1.3.5" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 1.3.5\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 1.3.5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 1.3.5" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-
-- echo "$as_me:$LINENO: checking BASE_DEPENDENCIES_CFLAGS" >&5
--echo $ECHO_N "checking BASE_DEPENDENCIES_CFLAGS... $ECHO_C" >&6
-- BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0"`
-- echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_CFLAGS" >&5
--echo "${ECHO_T}$BASE_DEPENDENCIES_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking BASE_DEPENDENCIES_LIBS" >&5
--echo $ECHO_N "checking BASE_DEPENDENCIES_LIBS... $ECHO_C" >&6
-- BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0"`
-- echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_LIBS" >&5
--echo "${ECHO_T}$BASE_DEPENDENCIES_LIBS" >&6
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.3.5"`
- else
-- BASE_DEPENDENCIES_CFLAGS=""
-- BASE_DEPENDENCIES_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0"`
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.3.5"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-+
-+ eds=no
-+elif test $pkg_failed = untried; then
-+ eds=no
-+else
-+ BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
-+ BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ eds=yes
-+fi
-+if test "x$eds" = "xyes"; then
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
-+echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 1.5.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 1.5.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 1.5.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 1.5.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 1.5.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 1.5.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.5.0"`
-+ else
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.5.0"`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-+
-+ eds13=yes
-+elif test $pkg_failed = untried; then
-+ eds13=yes
-+else
-+ BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
-+ BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ eds13=no
-+fi
-
-+ if test "x$eds13" = "xyes"; then
-+ EDS_SOVERSION=4
-+ else
-+ EDS_SOVERSION=7
-+ fi
-
-+ EDS_VERSION=-1.2
-+ EBOOK_SOVERSION=5
-+ ECAL_SOVERSION=3
-+else
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
-+echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6
-
-- if test $succeeded = yes; then
-- eds12=yes
-- else
-- eds12=no
-- fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-
-
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0"`
-+ else
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-+
-+ eds12=no
-+elif test $pkg_failed = untried; then
-+ eds12=no
-+else
-+ BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
-+ BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ eds12=yes
-+fi
-+
- if test "x$eds12" = "xyes"; then
- EDS_VERSION=-1.2
- EDS_SOVERSION=4
-@@ -19944,6 +19154,16 @@
-
-
-
-+if test "x$eds13" = "xyes"; then
-+ USE_EVO13_TRUE=
-+ USE_EVO13_FALSE='#'
-+else
-+ USE_EVO13_TRUE='#'
-+ USE_EVO13_FALSE=
-+fi
-+
-+
-+
- if test "x$eds12" = "xyes"; then
- USE_EVO12_TRUE=
- USE_EVO12_FALSE='#'
-@@ -19954,103 +19174,116 @@
-
-
-
-- succeeded=no
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for MONO" >&5
-+echo $ECHO_N "checking for MONO... $ECHO_C" >&6
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$MONO_CFLAGS"; then
-+ pkg_cv_MONO_CFLAGS="$MONO_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= 1.0.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "mono >= 1.0.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_MONO_CFLAGS=`$PKG_CONFIG --cflags "mono >= 1.0.0" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ if test -n "$MONO_LIBS"; then
-+ pkg_cv_MONO_LIBS="$MONO_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= 1.0.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "mono >= 1.0.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_MONO_LIBS=`$PKG_CONFIG --libs "mono >= 1.0.0" 2>/dev/null`
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for mono >= 1.0.0" >&5
--echo $ECHO_N "checking for mono >= 1.0.0... $ECHO_C" >&6
-
-- if $PKG_CONFIG --exists "mono >= 1.0.0" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- succeeded=yes
-+if test $pkg_failed = yes; then
-
-- echo "$as_me:$LINENO: checking MONO_CFLAGS" >&5
--echo $ECHO_N "checking MONO_CFLAGS... $ECHO_C" >&6
-- MONO_CFLAGS=`$PKG_CONFIG --cflags "mono >= 1.0.0"`
-- echo "$as_me:$LINENO: result: $MONO_CFLAGS" >&5
--echo "${ECHO_T}$MONO_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking MONO_LIBS" >&5
--echo $ECHO_N "checking MONO_LIBS... $ECHO_C" >&6
-- MONO_LIBS=`$PKG_CONFIG --libs "mono >= 1.0.0"`
-- echo "$as_me:$LINENO: result: $MONO_LIBS" >&5
--echo "${ECHO_T}$MONO_LIBS" >&6
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ MONO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono >= 1.0.0"`
- else
-- MONO_CFLAGS=""
-- MONO_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- MONO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono >= 1.0.0"`
-- echo $MONO_PKG_ERRORS
-+ MONO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono >= 1.0.0"`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$MONO_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (mono >= 1.0.0) were not met:
-
-+$MONO_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { echo "$as_me:$LINENO: error: Library requirements (mono >= 1.0.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements (mono >= 1.0.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables MONO_CFLAGS
-+and MONO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (mono >= 1.0.0) were not met:
-+
-+$MONO_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 MONO_CFLAGS
-+and MONO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { 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 MONO_CFLAGS
-+and MONO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 MONO_CFLAGS
-+and MONO_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
-+ MONO_LIBS=$pkg_cv_MONO_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+fi
- # Extract the first word of "mcs", so it can be a program name with args.
- set dummy mcs; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -20156,103 +19389,116 @@
-
-
-
-- succeeded=no
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for GTK_SHARP" >&5
-+echo $ECHO_N "checking for GTK_SHARP... $ECHO_C" >&6
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GTK_SHARP_CFLAGS"; then
-+ pkg_cv_GTK_SHARP_CFLAGS="$GTK_SHARP_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= 1.9.5\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= 1.9.5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 >= 1.9.5" 2>/dev/null`
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ if test -n "$GTK_SHARP_LIBS"; then
-+ pkg_cv_GTK_SHARP_LIBS="$GTK_SHARP_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= 1.9.5\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= 1.9.5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 >= 1.9.5" 2>/dev/null`
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for gtk-sharp-2.0 >= 1.9.5" >&5
--echo $ECHO_N "checking for gtk-sharp-2.0 >= 1.9.5... $ECHO_C" >&6
-
-- if $PKG_CONFIG --exists "gtk-sharp-2.0 >= 1.9.5" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- succeeded=yes
-+if test $pkg_failed = yes; then
-
-- echo "$as_me:$LINENO: checking GTK_SHARP_CFLAGS" >&5
--echo $ECHO_N "checking GTK_SHARP_CFLAGS... $ECHO_C" >&6
-- GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 >= 1.9.5"`
-- echo "$as_me:$LINENO: result: $GTK_SHARP_CFLAGS" >&5
--echo "${ECHO_T}$GTK_SHARP_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking GTK_SHARP_LIBS" >&5
--echo $ECHO_N "checking GTK_SHARP_LIBS... $ECHO_C" >&6
-- GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 >= 1.9.5"`
-- echo "$as_me:$LINENO: result: $GTK_SHARP_LIBS" >&5
--echo "${ECHO_T}$GTK_SHARP_LIBS" >&6
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-sharp-2.0 >= 1.9.5"`
- else
-- GTK_SHARP_CFLAGS=""
-- GTK_SHARP_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 >= 1.9.5"`
-- echo $GTK_SHARP_PKG_ERRORS
-+ GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 >= 1.9.5"`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GTK_SHARP_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 >= 1.9.5) were not met:
-
-+$GTK_SHARP_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { echo "$as_me:$LINENO: error: Library requirements (gtk-sharp-2.0 >= 1.9.5) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements (gtk-sharp-2.0 >= 1.9.5) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables GTK_SHARP_CFLAGS
-+and GTK_SHARP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (gtk-sharp-2.0 >= 1.9.5) were not met:
-+
-+$GTK_SHARP_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 GTK_SHARP_CFLAGS
-+and GTK_SHARP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { 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 GTK_SHARP_CFLAGS
-+and GTK_SHARP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 GTK_SHARP_CFLAGS
-+and GTK_SHARP_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ GTK_SHARP_CFLAGS=$pkg_cv_GTK_SHARP_CFLAGS
-+ GTK_SHARP_LIBS=$pkg_cv_GTK_SHARP_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+fi
-
-
- # Extract the first word of "gapi2-codegen", so it can be a program name with args.
-@@ -20295,175 +19541,22 @@
- echo "${ECHO_T}no" >&6
- fi
-
--if test "x$GAPI_CODEGEN" = "xno"; then
-- { { echo "$as_me:$LINENO: error: You need to install gtk-sharp2-gapi" >&5
--echo "$as_me: error: You need to install gtk-sharp2-gapi" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--# Extract the first word of "gapi2-fixup", so it can be a program name with args.
--set dummy gapi2-fixup; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_GAPI_FIXUP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $GAPI_FIXUP in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GAPI_FIXUP="$GAPI_FIXUP" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_GAPI_FIXUP="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
-- test -z "$ac_cv_path_GAPI_FIXUP" && ac_cv_path_GAPI_FIXUP="no"
-- ;;
--esac
--fi
--GAPI_FIXUP=$ac_cv_path_GAPI_FIXUP
--
--if test -n "$GAPI_FIXUP"; then
-- echo "$as_me:$LINENO: result: $GAPI_FIXUP" >&5
--echo "${ECHO_T}$GAPI_FIXUP" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--if test "x$GAPI_FIXUP" = "xno"; then
-- { { echo "$as_me:$LINENO: error: You need to install gtk-sharp2-gapi" >&5
--echo "$as_me: error: You need to install gtk-sharp2-gapi" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--LIBECAL_PKG_NAME="libecal$EDS_VERSION"
--
-- succeeded=no
--
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
--if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
-- fi
--
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for $LIBECAL_PKG_NAME >= 1.2.0" >&5
--echo $ECHO_N "checking for $LIBECAL_PKG_NAME >= 1.2.0... $ECHO_C" >&6
--
-- if $PKG_CONFIG --exists "$LIBECAL_PKG_NAME >= 1.2.0" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- succeeded=yes
--
-- echo "$as_me:$LINENO: checking LIBECAL_CFLAGS" >&5
--echo $ECHO_N "checking LIBECAL_CFLAGS... $ECHO_C" >&6
-- LIBECAL_CFLAGS=`$PKG_CONFIG --cflags "$LIBECAL_PKG_NAME >= 1.2.0"`
-- echo "$as_me:$LINENO: result: $LIBECAL_CFLAGS" >&5
--echo "${ECHO_T}$LIBECAL_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking LIBECAL_LIBS" >&5
--echo $ECHO_N "checking LIBECAL_LIBS... $ECHO_C" >&6
-- LIBECAL_LIBS=`$PKG_CONFIG --libs "$LIBECAL_PKG_NAME >= 1.2.0"`
-- echo "$as_me:$LINENO: result: $LIBECAL_LIBS" >&5
--echo "${ECHO_T}$LIBECAL_LIBS" >&6
-- else
-- LIBECAL_CFLAGS=""
-- LIBECAL_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- LIBECAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBECAL_PKG_NAME >= 1.2.0"`
-- echo $LIBECAL_PKG_ERRORS
-- fi
--
--
--
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
--
-- if test $succeeded = yes; then
-- :
-- else
-- { { echo "$as_me:$LINENO: error: Library requirements ($LIBECAL_PKG_NAME >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements ($LIBECAL_PKG_NAME >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--
--
--
--
--LIBEBOOK_PKG_NAME="libebook$EDS_VERSION"
--
-- succeeded=no
-+if test "x$GAPI_CODEGEN" = "xno"; then
-+ { { echo "$as_me:$LINENO: error: You need to install gtk-sharp2-gapi" >&5
-+echo "$as_me: error: You need to install gtk-sharp2-gapi" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
-+# Extract the first word of "gapi2-fixup", so it can be a program name with args.
-+set dummy gapi2-fixup; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_GAPI_FIXUP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $PKG_CONFIG in
-+ case $GAPI_FIXUP in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ac_cv_path_GAPI_FIXUP="$GAPI_FIXUP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -20473,81 +19566,260 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_GAPI_FIXUP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ test -z "$ac_cv_path_GAPI_FIXUP" && ac_cv_path_GAPI_FIXUP="no"
- ;;
- esac
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+GAPI_FIXUP=$ac_cv_path_GAPI_FIXUP
-
--if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+if test -n "$GAPI_FIXUP"; then
-+ echo "$as_me:$LINENO: result: $GAPI_FIXUP" >&5
-+echo "${ECHO_T}$GAPI_FIXUP" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-- fi
-+if test "x$GAPI_FIXUP" = "xno"; then
-+ { { echo "$as_me:$LINENO: error: You need to install gtk-sharp2-gapi" >&5
-+echo "$as_me: error: You need to install gtk-sharp2-gapi" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+LIBECAL_PKG_NAME="libecal$EDS_VERSION"
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for LIBECAL" >&5
-+echo $ECHO_N "checking for LIBECAL... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBECAL_CFLAGS"; then
-+ pkg_cv_LIBECAL_CFLAGS="$LIBECAL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBECAL_PKG_NAME >= 1.2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "$LIBECAL_PKG_NAME >= 1.2.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBECAL_CFLAGS=`$PKG_CONFIG --cflags "$LIBECAL_PKG_NAME >= 1.2.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBECAL_LIBS"; then
-+ pkg_cv_LIBECAL_LIBS="$LIBECAL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBECAL_PKG_NAME >= 1.2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "$LIBECAL_PKG_NAME >= 1.2.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBECAL_LIBS=`$PKG_CONFIG --libs "$LIBECAL_PKG_NAME >= 1.2.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ LIBECAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBECAL_PKG_NAME >= 1.2.0"`
-+ else
-+ LIBECAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBECAL_PKG_NAME >= 1.2.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$LIBECAL_PKG_ERRORS" >&5
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for $LIBEBOOK_PKG_NAME >= 1.2.0" >&5
--echo $ECHO_N "checking for $LIBEBOOK_PKG_NAME >= 1.2.0... $ECHO_C" >&6
-+ { { echo "$as_me:$LINENO: error: Package requirements ($LIBECAL_PKG_NAME >= 1.2.0) were not met:
-
-- if $PKG_CONFIG --exists "$LIBEBOOK_PKG_NAME >= 1.2.0" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
-+$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
-+echo "$as_me: error: Package requirements ($LIBECAL_PKG_NAME >= 1.2.0) 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; }; }
-+elif test $pkg_failed = untried; then
-+ { { 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 LIBECAL_CFLAGS
-+and LIBECAL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 LIBECAL_CFLAGS
-+and LIBECAL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ LIBECAL_CFLAGS=$pkg_cv_LIBECAL_CFLAGS
-+ LIBECAL_LIBS=$pkg_cv_LIBECAL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- succeeded=yes
-+ :
-+fi
-+
-+
-+
-+LIBEBOOK_PKG_NAME="libebook$EDS_VERSION"
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for LIBEBOOK" >&5
-+echo $ECHO_N "checking for LIBEBOOK... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBEBOOK_CFLAGS"; then
-+ pkg_cv_LIBEBOOK_CFLAGS="$LIBEBOOK_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBEBOOK_PKG_NAME >= 1.2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "$LIBEBOOK_PKG_NAME >= 1.2.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBEBOOK_CFLAGS=`$PKG_CONFIG --cflags "$LIBEBOOK_PKG_NAME >= 1.2.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBEBOOK_LIBS"; then
-+ pkg_cv_LIBEBOOK_LIBS="$LIBEBOOK_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBEBOOK_PKG_NAME >= 1.2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "$LIBEBOOK_PKG_NAME >= 1.2.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBEBOOK_LIBS=`$PKG_CONFIG --libs "$LIBEBOOK_PKG_NAME >= 1.2.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-
-- echo "$as_me:$LINENO: checking LIBEBOOK_CFLAGS" >&5
--echo $ECHO_N "checking LIBEBOOK_CFLAGS... $ECHO_C" >&6
-- LIBEBOOK_CFLAGS=`$PKG_CONFIG --cflags "$LIBEBOOK_PKG_NAME >= 1.2.0"`
-- echo "$as_me:$LINENO: result: $LIBEBOOK_CFLAGS" >&5
--echo "${ECHO_T}$LIBEBOOK_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking LIBEBOOK_LIBS" >&5
--echo $ECHO_N "checking LIBEBOOK_LIBS... $ECHO_C" >&6
-- LIBEBOOK_LIBS=`$PKG_CONFIG --libs "$LIBEBOOK_PKG_NAME >= 1.2.0"`
-- echo "$as_me:$LINENO: result: $LIBEBOOK_LIBS" >&5
--echo "${ECHO_T}$LIBEBOOK_LIBS" >&6
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ LIBEBOOK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBEBOOK_PKG_NAME >= 1.2.0"`
- else
-- LIBEBOOK_CFLAGS=""
-- LIBEBOOK_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- LIBEBOOK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBEBOOK_PKG_NAME >= 1.2.0"`
-- echo $LIBEBOOK_PKG_ERRORS
-+ LIBEBOOK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBEBOOK_PKG_NAME >= 1.2.0"`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$LIBEBOOK_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements ($LIBEBOOK_PKG_NAME >= 1.2.0) were not met:
-
-+$LIBEBOOK_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { echo "$as_me:$LINENO: error: Library requirements ($LIBEBOOK_PKG_NAME >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements ($LIBEBOOK_PKG_NAME >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables LIBEBOOK_CFLAGS
-+and LIBEBOOK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements ($LIBEBOOK_PKG_NAME >= 1.2.0) were not met:
-+
-+$LIBEBOOK_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 LIBEBOOK_CFLAGS
-+and LIBEBOOK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { 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 LIBEBOOK_CFLAGS
-+and LIBEBOOK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 LIBEBOOK_CFLAGS
-+and LIBEBOOK_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ LIBEBOOK_CFLAGS=$pkg_cv_LIBEBOOK_CFLAGS
-+ LIBEBOOK_LIBS=$pkg_cv_LIBEBOOK_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+fi
-
-
-
-@@ -20825,8 +20097,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21016,11 +20287,20 @@
- echo $ECHO_N "checking for ORBit - version >= $min_orbit_version... $ECHO_C" >&6
- no_orbit=""
- if test "$ORBIT_CONFIG" = "no" ; then
-- no_orbit=yes
-+ if test "$PKG_CONFIG" = "no" ; then
-+ no_orbit=yes
-+ else
-+ ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0`
-+ ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0`
-+ fi
- else
- ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags`
- ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs`
-+ fi
-+
-+ if test "x$no_orbit" = x ; then
- ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0`
-+
- orbit_config_major_version=`echo $ORBIT_VERSION | \
- sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- orbit_config_minor_version=`echo $ORBIT_VERSION | \
-@@ -21190,8 +20470,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -21263,226 +20542,678 @@
- done
- done
-
-- test -z "$ac_cv_path_ORBIT_IDL" && ac_cv_path_ORBIT_IDL=":"
-- ;;
--esac
-+ test -z "$ac_cv_path_ORBIT_IDL" && ac_cv_path_ORBIT_IDL=":"
-+ ;;
-+esac
-+fi
-+ORBIT_IDL=$ac_cv_path_ORBIT_IDL
-+
-+if test -n "$ORBIT_IDL"; then
-+ echo "$as_me:$LINENO: result: $ORBIT_IDL" >&5
-+echo "${ECHO_T}$ORBIT_IDL" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+
-+
-+
-+ rm -f conf.orbittest
-+
-+
-+echo "$as_me:$LINENO: checking for CORBA include paths" >&5
-+echo $ECHO_N "checking for CORBA include paths... $ECHO_C" >&6
-+IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0`" -I "`pkg-config --variable=idldir evolution-data-server-1.2`
-+echo "$as_me:$LINENO: result: $IDL_INCLUDES" >&5
-+echo "${ECHO_T}$IDL_INCLUDES" >&6
-+
-+
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for EVO_SHELL" >&5
-+echo $ECHO_N "checking for EVO_SHELL... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_CFLAGS"; then
-+ pkg_cv_EVO_SHELL_CFLAGS="$EVO_SHELL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.6\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.6"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.6"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_LIBS"; then
-+ pkg_cv_EVO_SHELL_LIBS="$EVO_SHELL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.6\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.6"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.6"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""evolution-shell-2.6""`
-+ else
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.6""`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EVO_SHELL_PKG_ERRORS" >&5
-+
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for EVO_SHELL" >&5
-+echo $ECHO_N "checking for EVO_SHELL... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_CFLAGS"; then
-+ pkg_cv_EVO_SHELL_CFLAGS="$EVO_SHELL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.4\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.4"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.4"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_LIBS"; then
-+ pkg_cv_EVO_SHELL_LIBS="$EVO_SHELL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.4\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.4"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.4"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""evolution-shell-2.4""`
-+ else
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.4""`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EVO_SHELL_PKG_ERRORS" >&5
-+
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for EVO_SHELL" >&5
-+echo $ECHO_N "checking for EVO_SHELL... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_CFLAGS"; then
-+ pkg_cv_EVO_SHELL_CFLAGS="$EVO_SHELL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.2"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_LIBS"; then
-+ pkg_cv_EVO_SHELL_LIBS="$EVO_SHELL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.2"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""evolution-shell-2.2""`
-+ else
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.2""`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EVO_SHELL_PKG_ERRORS" >&5
-+
-+ { { echo "$as_me:$LINENO: error: Package requirements (\"evolution-shell-2.2\") were not met:
-+
-+$EVO_SHELL_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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (\"evolution-shell-2.2\") were not met:
-+
-+$EVO_SHELL_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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { 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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ EVO_SHELL_CFLAGS=$pkg_cv_EVO_SHELL_CFLAGS
-+ EVO_SHELL_LIBS=$pkg_cv_EVO_SHELL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
- fi
--ORBIT_IDL=$ac_cv_path_ORBIT_IDL
-+elif test $pkg_failed = untried; then
-
--if test -n "$ORBIT_IDL"; then
-- echo "$as_me:$LINENO: result: $ORBIT_IDL" >&5
--echo "${ECHO_T}$ORBIT_IDL" >&6
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for EVO_SHELL" >&5
-+echo $ECHO_N "checking for EVO_SHELL... $ECHO_C" >&6
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_CFLAGS"; then
-+ pkg_cv_EVO_SHELL_CFLAGS="$EVO_SHELL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.2"" 2>/dev/null`
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_LIBS"; then
-+ pkg_cv_EVO_SHELL_LIBS="$EVO_SHELL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.2"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-
-+if test $pkg_failed = yes; then
-
-- rm -f conf.orbittest
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""evolution-shell-2.2""`
-+ else
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.2""`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EVO_SHELL_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (\"evolution-shell-2.2\") were not met:
-
--echo "$as_me:$LINENO: checking for CORBA include paths" >&5
--echo $ECHO_N "checking for CORBA include paths... $ECHO_C" >&6
--IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0`" -I "`pkg-config --variable=idldir evolution-data-server-1.2`
--echo "$as_me:$LINENO: result: $IDL_INCLUDES" >&5
--echo "${ECHO_T}$IDL_INCLUDES" >&6
-+$EVO_SHELL_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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (\"evolution-shell-2.2\") were not met:
-
-- succeeded=no
-+$EVO_SHELL_PKG_ERRORS
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+Alternatively, you may set the environment variables EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { 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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ EVO_SHELL_CFLAGS=$pkg_cv_EVO_SHELL_CFLAGS
-+ EVO_SHELL_LIBS=$pkg_cv_EVO_SHELL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+else
-+ EVO_SHELL_CFLAGS=$pkg_cv_EVO_SHELL_CFLAGS
-+ EVO_SHELL_LIBS=$pkg_cv_EVO_SHELL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+fi
-+elif test $pkg_failed = untried; then
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for EVO_SHELL" >&5
-+echo $ECHO_N "checking for EVO_SHELL... $ECHO_C" >&6
-
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ if test -n "$EVO_SHELL_CFLAGS"; then
-+ pkg_cv_EVO_SHELL_CFLAGS="$EVO_SHELL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.4\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.4"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.4"" 2>/dev/null`
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_LIBS"; then
-+ pkg_cv_EVO_SHELL_LIBS="$EVO_SHELL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.4\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.4"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.4"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for \"evolution-shell-2.4\"" >&5
--echo $ECHO_N "checking for \"evolution-shell-2.4\"... $ECHO_C" >&6
-
-- if $PKG_CONFIG --exists ""evolution-shell-2.4"" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- succeeded=yes
-+if test $pkg_failed = yes; then
-
-- echo "$as_me:$LINENO: checking EVO_SHELL_CFLAGS" >&5
--echo $ECHO_N "checking EVO_SHELL_CFLAGS... $ECHO_C" >&6
-- EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.4""`
-- echo "$as_me:$LINENO: result: $EVO_SHELL_CFLAGS" >&5
--echo "${ECHO_T}$EVO_SHELL_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking EVO_SHELL_LIBS" >&5
--echo $ECHO_N "checking EVO_SHELL_LIBS... $ECHO_C" >&6
-- EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.4""`
-- echo "$as_me:$LINENO: result: $EVO_SHELL_LIBS" >&5
--echo "${ECHO_T}$EVO_SHELL_LIBS" >&6
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""evolution-shell-2.4""`
- else
-- EVO_SHELL_CFLAGS=""
-- EVO_SHELL_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.4""`
--
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.4""`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EVO_SHELL_PKG_ERRORS" >&5
-
-
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for EVO_SHELL" >&5
-+echo $ECHO_N "checking for EVO_SHELL... $ECHO_C" >&6
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_CFLAGS"; then
-+ pkg_cv_EVO_SHELL_CFLAGS="$EVO_SHELL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.2"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_LIBS"; then
-+ pkg_cv_EVO_SHELL_LIBS="$EVO_SHELL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.2"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-
-- if test $succeeded = yes; then
-- :
-- else
-
-- succeeded=no
-
-- if test -z "$PKG_CONFIG"; then
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""evolution-shell-2.2""`
-+ else
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.2""`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EVO_SHELL_PKG_ERRORS" >&5
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
-+ { { echo "$as_me:$LINENO: error: Package requirements (\"evolution-shell-2.2\") were not met:
-+
-+$EVO_SHELL_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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (\"evolution-shell-2.2\") were not met:
-+
-+$EVO_SHELL_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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { 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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ EVO_SHELL_CFLAGS=$pkg_cv_EVO_SHELL_CFLAGS
-+ EVO_SHELL_LIBS=$pkg_cv_EVO_SHELL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
- fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+elif test $pkg_failed = untried; then
-+
-+pkg_failed=no
-+echo "$as_me:$LINENO: checking for EVO_SHELL" >&5
-+echo $ECHO_N "checking for EVO_SHELL... $ECHO_C" >&6
-
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ if test -n "$EVO_SHELL_CFLAGS"; then
-+ pkg_cv_EVO_SHELL_CFLAGS="$EVO_SHELL_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.2"" 2>/dev/null`
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EVO_SHELL_LIBS"; then
-+ pkg_cv_EVO_SHELL_LIBS="$EVO_SHELL_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"evolution-shell-2.2\"\"") >&5
-+ ($PKG_CONFIG --exists --print-errors ""evolution-shell-2.2"") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.2"" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-- fi
-
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for \"evolution-shell-2.2\"" >&5
--echo $ECHO_N "checking for \"evolution-shell-2.2\"... $ECHO_C" >&6
-
-- if $PKG_CONFIG --exists ""evolution-shell-2.2"" ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- succeeded=yes
-+if test $pkg_failed = yes; then
-
-- echo "$as_me:$LINENO: checking EVO_SHELL_CFLAGS" >&5
--echo $ECHO_N "checking EVO_SHELL_CFLAGS... $ECHO_C" >&6
-- EVO_SHELL_CFLAGS=`$PKG_CONFIG --cflags ""evolution-shell-2.2""`
-- echo "$as_me:$LINENO: result: $EVO_SHELL_CFLAGS" >&5
--echo "${ECHO_T}$EVO_SHELL_CFLAGS" >&6
--
-- echo "$as_me:$LINENO: checking EVO_SHELL_LIBS" >&5
--echo $ECHO_N "checking EVO_SHELL_LIBS... $ECHO_C" >&6
-- EVO_SHELL_LIBS=`$PKG_CONFIG --libs ""evolution-shell-2.2""`
-- echo "$as_me:$LINENO: result: $EVO_SHELL_LIBS" >&5
--echo "${ECHO_T}$EVO_SHELL_LIBS" >&6
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""evolution-shell-2.2""`
- else
-- EVO_SHELL_CFLAGS=""
-- EVO_SHELL_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.2""`
-- echo $EVO_SHELL_PKG_ERRORS
-+ EVO_SHELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""evolution-shell-2.2""`
- fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EVO_SHELL_PKG_ERRORS" >&5
-
-+ { { echo "$as_me:$LINENO: error: Package requirements (\"evolution-shell-2.2\") were not met:
-
-+$EVO_SHELL_PKG_ERRORS
-
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- if test $succeeded = yes; then
-- :
-- else
-- { { echo "$as_me:$LINENO: error: Library requirements (\"evolution-shell-2.2\") not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements (\"evolution-shell-2.2\") not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+Alternatively, you may set the environment variables EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (\"evolution-shell-2.2\") were not met:
-+
-+$EVO_SHELL_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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+elif test $pkg_failed = untried; then
-+ { { 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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-- fi
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&5
-+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 EVO_SHELL_CFLAGS
-+and EVO_SHELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ EVO_SHELL_CFLAGS=$pkg_cv_EVO_SHELL_CFLAGS
-+ EVO_SHELL_LIBS=$pkg_cv_EVO_SHELL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+fi
-+else
-+ EVO_SHELL_CFLAGS=$pkg_cv_EVO_SHELL_CFLAGS
-+ EVO_SHELL_LIBS=$pkg_cv_EVO_SHELL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+fi
-+else
-+ EVO_SHELL_CFLAGS=$pkg_cv_EVO_SHELL_CFLAGS
-+ EVO_SHELL_LIBS=$pkg_cv_EVO_SHELL_LIBS
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+fi
-
-
-
-@@ -21609,6 +21340,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${USE_EVO13_TRUE}" && test -z "${USE_EVO13_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"USE_EVO13\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"USE_EVO13\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${USE_EVO12_TRUE}" && test -z "${USE_EVO12_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_EVO12\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -22227,12 +21965,15 @@
- s, at ac_ct_F77@,$ac_ct_F77,;t t
- s, at LIBTOOL@,$LIBTOOL,;t t
- s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-+s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
- s, at BASE_DEPENDENCIES_CFLAGS@,$BASE_DEPENDENCIES_CFLAGS,;t t
- s, at BASE_DEPENDENCIES_LIBS@,$BASE_DEPENDENCIES_LIBS,;t t
- s, at EDS_VERSION@,$EDS_VERSION,;t t
- s, at EDS_SOVERSION@,$EDS_SOVERSION,;t t
- s, at EBOOK_SOVERSION@,$EBOOK_SOVERSION,;t t
- s, at ECAL_SOVERSION@,$ECAL_SOVERSION,;t t
-+s, at USE_EVO13_TRUE@,$USE_EVO13_TRUE,;t t
-+s, at USE_EVO13_FALSE@,$USE_EVO13_FALSE,;t t
- s, at USE_EVO12_TRUE@,$USE_EVO12_TRUE,;t t
- s, at USE_EVO12_FALSE@,$USE_EVO12_FALSE,;t t
- s, at MONO_CFLAGS@,$MONO_CFLAGS,;t t
-@@ -22432,11 +22173,6 @@
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -22475,6 +22211,12 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-@@ -22988,7 +22730,11 @@
- if test "x$eds12" = "xyes"; then
- echo "Using evolution-data-server 1.2.x API"
- else
--echo "Using evolution-data-server 1.3.x API"
-+ if test "x$eds13" = "xyes"; then
-+ echo "Using evolution-data-server 1.3.x API"
-+ else
-+ echo "Using evolution-data-server 1.5.x API"
-+ fi
- fi
- echo "---"
-
---- ../evolution-sharp-0.10.2/evolution/Makefile.in 2005-09-12 22:56:47.000000000 +0200
-+++ evolution-sharp-0.10.2/evolution/Makefile.in 2006-03-14 22:21:11.549735296 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -150,6 +150,8 @@
- STRIP = @STRIP@
- USE_EVO12_FALSE = @USE_EVO12_FALSE@
- USE_EVO12_TRUE = @USE_EVO12_TRUE@
-+USE_EVO13_FALSE = @USE_EVO13_FALSE@
-+USE_EVO13_TRUE = @USE_EVO13_TRUE@
- VERSION = @VERSION@
- ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
-@@ -157,6 +159,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -198,9 +201,10 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--RAW_APIS = evolution-api-1.2.raw evolution-api.raw
-- at USE_EVO12_FALSE@RAW_API = evolution-api.raw
-- at USE_EVO12_TRUE@RAW_API = evolution-api-1.2.raw
-+RAW_APIS = evolution-api-1.3.5.raw evolution-api-1.2.raw evolution-api.raw
-+ at USE_EVO12_FALSE@@USE_EVO13_FALSE at RAW_API = evolution-api.raw
-+ at USE_EVO12_TRUE@@USE_EVO13_FALSE at RAW_API = evolution-api-1.2.raw
-+ at USE_EVO13_TRUE@RAW_API = evolution-api-1.3.5.raw
- API = evolution-api.xml
- METADATA = Evolution.metadata
- ASSEMBLY_NAME = evolution-sharp
Deleted: evolution-sharp/trunk/debian/patches/evolution-2.6.dpatch
===================================================================
--- evolution-sharp/trunk/debian/patches/evolution-2.6.dpatch 2006-05-03 20:44:24 UTC (rev 2534)
+++ evolution-sharp/trunk/debian/patches/evolution-2.6.dpatch 2006-05-03 22:01:50 UTC (rev 2535)
@@ -1,3029 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/evolution-sharp/configure.in,v
-retrieving revision 1.29
-diff -u -p -r1.29 configure.in
---- evolution-sharp/configure.in 6 Dec 2005 20:36:00 -0000 1.29
-+++ evolution-sharp/configure.in 21 Jan 2006 16:31:17 -0000
-@@ -12,10 +12,17 @@ if test "x$PKG_CONFIG" = "xno"; then
- AC_MSG_ERROR([You need to install pkg-config])
- fi
-
--PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.3.5, eds13=yes, eds13=no)
--if test "x$eds13" = "xyes"; then
-+PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.3.5, eds=yes, eds=no)
-+if test "x$eds" = "xyes"; then
-+ PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.5.0, eds13=no, eds13=yes)
-+
-+ if test "x$eds13" = "xyes"; then
-+ EDS_SOVERSION=4
-+ else
-+ EDS_SOVERSION=7
-+ fi
-+
- EDS_VERSION=-1.2
-- EDS_SOVERSION=4
- EBOOK_SOVERSION=5
- ECAL_SOVERSION=3
- else
-@@ -36,6 +43,7 @@ AC_SUBST(EDS_SOVERSION)
- AC_SUBST(EBOOK_SOVERSION)
- AC_SUBST(ECAL_SOVERSION)
-
-+AM_CONDITIONAL(USE_EVO13, test "x$eds13" = "xyes")
- AM_CONDITIONAL(USE_EVO12, test "x$eds12" = "xyes")
-
- PKG_CHECK_MODULES(MONO, mono >= 1.0.0)
-@@ -107,7 +113,7 @@ IDL_INCLUDES="-I "`pkg-config --variable
- AC_MSG_RESULT($IDL_INCLUDES)
- AC_SUBST(IDL_INCLUDES)
-
--PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.4",, [PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.2")])
-+PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.6",, [PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.4",, [PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.2")])])
- AC_SUBST(EVO_SHELL_CFLAGS)
- AC_SUBST(EVO_SHELL_LIBS)
-
-@@ -133,7 +139,11 @@ echo
- if test "x$eds12" = "xyes"; then
- echo "Using evolution-data-server 1.2.x API"
- else
--echo "Using evolution-data-server 1.3.x API"
-+ if test "x$eds13" = "xyes"; then
-+ echo "Using evolution-data-server 1.3.x API"
-+ else
-+ echo "Using evolution-data-server 1.5.x API"
-+ fi
- fi
- echo "---"
-
-Index: evolution/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/evolution-sharp/evolution/Makefile.am,v
-retrieving revision 1.26
-diff -u -p -r1.26 Makefile.am
---- evolution-sharp/evolution/Makefile.am 12 Sep 2005 20:55:35 -0000 1.26
-+++ evolution-sharp/evolution/Makefile.am 21 Jan 2006 16:31:17 -0000
-@@ -1,9 +1,13 @@
--RAW_APIS = evolution-api-1.2.raw evolution-api.raw
-+RAW_APIS = evolution-api-1.3.5.raw evolution-api-1.2.raw evolution-api.raw
-
-+if USE_EVO13
-+RAW_API = evolution-api-1.3.5.raw
-+else
- if USE_EVO12
- RAW_API = evolution-api-1.2.raw
- else
- RAW_API = evolution-api.raw
-+endif
- endif
-
- API=evolution-api.xml
-Index: evolution/evolution-api.raw
-===================================================================
-RCS file: /cvs/gnome/evolution-sharp/evolution/evolution-api.raw,v
-retrieving revision 1.10
-diff -u -p -r1.10 evolution-api.raw
---- evolution-sharp/evolution/evolution-api.raw 30 Aug 2005 21:14:16 -0000 1.10
-+++ evolution-sharp/evolution/evolution-api.raw 21 Jan 2006 16:31:19 -0000
-@@ -883,6 +883,9 @@
- <method name="IsEvolutionList" cname="e_destination_is_evolution_list">
- <return-type type="gboolean" />
- </method>
-+ <method name="IsIgnored" cname="e_destination_is_ignored">
-+ <return-type type="gboolean" />
-+ </method>
- <method name="ListGetDests" cname="e_destination_list_get_dests">
- <return-type type="const-GList*" />
- </method>
-@@ -928,6 +931,12 @@
- <parameter type="gboolean" name="flag" />
- </parameters>
- </method>
-+ <method name="SetIgnored" cname="e_destination_set_ignored">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="gboolean" name="ignored" />
-+ </parameters>
-+ </method>
- <method name="SetName" cname="e_destination_set_name">
- <return-type type="void" />
- <parameters>
-@@ -1365,6 +1374,363 @@
- <return-type type="void" />
- </method>
- </struct>
-+ <alias name="_Evolution_Addressbook_Book" cname="GNOME_Evolution_Addressbook_Book" type="CORBA_Object" />
-+ <struct name="_Evolution_Addressbook_BookChangeItem" cname="GNOME_Evolution_Addressbook_BookChangeItem">
-+ <field name="ChangeType" cname="changeType" type="GNOME_Evolution_Addressbook_BookChangeType" />
-+ <field name="Vcard" cname="vcard" type="GNOME_Evolution_Addressbook_VCard" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookChangeType" cname="GNOME_Evolution_Addressbook_BookChangeType">
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_CORBA_sequence_CORBA_string_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="CORBASequence_CORBAString" cname="CORBA_sequence_CORBA_string CORBA_sequence_GNOME_Evolution_Addressbook_VCard" type="typedef" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_CORBA_sequence_GNOME_Evolution_Addressbook_VCard_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="CORBASequence_GNOME_Evolution_Addressbook_VCard" cname="CORBA_sequence_GNOME_Evolution_Addressbook_VCard GNOME_Evolution_Addressbook_VCardList" type="typedef" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_GNOME_Evolution_Addressbook_VCardList_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="Struct" cname="struct-{ CORBA_unsigned_long _maximum" type="typedef" />
-+ <field name="Length" cname="_length" type="typedef" />
-+ <field name="Buffer" cname="_buffer" type="CORBA_string*" />
-+ <field name="Release" cname="_release" type="CORBA_boolean" />
-+ <field name="CORBASequence_CORBAString" cname="CORBA_sequence_CORBA_string" type="}" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_CORBA_sequence_CORBA_string_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="CORBASequence_CORBAString" cname="CORBA_sequence_CORBA_string CORBA_sequence_GNOME_Evolution_Addressbook_ContactId" type="typedef" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_CORBA_sequence_GNOME_Evolution_Addressbook_ContactId_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="CORBASequence_GNOME_Evolution_Addressbook_ContactId" cname="CORBA_sequence_GNOME_Evolution_Addressbook_ContactId GNOME_Evolution_Addressbook_ContactIdList" type="typedef" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_GNOME_Evolution_Addressbook_ContactIdList_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="Struct" cname="struct-{ CORBA_unsigned_long _maximum" type="typedef" />
-+ <field name="Length" cname="_length" type="typedef" />
-+ <field name="Buffer" cname="_buffer" type="CORBA_string*" />
-+ <field name="Release" cname="_release" type="CORBA_boolean" />
-+ <field name="CORBASequence_CORBAString" cname="CORBA_sequence_CORBA_string" type="}" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_CORBA_sequence_CORBA_string_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="CORBASequence_CORBAString" cname="CORBA_sequence_CORBA_string GNOME_Evolution_Addressbook_stringlist" type="typedef" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_GNOME_Evolution_Addressbook_stringlist_struct" type="ORBIT2_MAYBE_CONST" />
-+ </struct>
-+ <alias name="_Evolution_Addressbook_BookFactory" cname="GNOME_Evolution_Addressbook_BookFactory" type="CORBA_Object" />
-+ <struct name="_Evolution_Addressbook_BookFactory_ProtocolNotSupported" cname="GNOME_Evolution_Addressbook_BookFactory_ProtocolNotSupported">
-+ <field name="Dummy" cname="dummy" type="int" />
-+ </struct>
-+ <alias name="_Evolution_Addressbook_BookListener" cname="GNOME_Evolution_Addressbook_BookListener" type="CORBA_Object" />
-+ <alias name="_Evolution_Addressbook_BookMode" cname="GNOME_Evolution_Addressbook_BookMode" type="CORBA_long" />
-+ <alias name="_Evolution_Addressbook_BookView" cname="GNOME_Evolution_Addressbook_BookView" type="CORBA_Object" />
-+ <alias name="_Evolution_Addressbook_BookViewListener" cname="GNOME_Evolution_Addressbook_BookViewListener" type="CORBA_Object" />
-+ <struct name="_Evolution_Addressbook_CallStatus" cname="GNOME_Evolution_Addressbook_CallStatus">
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_CORBA_sequence_GNOME_Evolution_Addressbook_BookChangeItem_struct" type="ORBIT2_MAYBE_CONST" />
-+ <field name="CORBASequence_GNOME_Evolution_Addressbook_BookChangeItem" cname="CORBA_sequence_GNOME_Evolution_Addressbook_BookChangeItem GNOME_Evolution_Addressbook_BookChangeList" type="typedef" />
-+ <field name="Struct" cname="struct-CORBA_TypeCode_struct-TC_GNOME_Evolution_Addressbook_BookChangeList_struct" type="ORBIT2_MAYBE_CONST" />
-+ </struct>
-+ <alias name="_Evolution_Addressbook_ContactId" cname="GNOME_Evolution_Addressbook_ContactId" type="CORBA_string" />
-+ <alias name="_Evolution_Addressbook_VCard" cname="GNOME_Evolution_Addressbook_VCard" type="CORBA_string" />
-+ <struct name="_Evolution_Addressbook_Book" cname="POA_GNOME_Evolution_Addressbook_Book">
-+ <field name="Private" cname="_private" type="void*" />
-+ <field name="Vepv" cname="vepv" type="POA_GNOME_Evolution_Addressbook_Book__vepv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookFactory" cname="POA_GNOME_Evolution_Addressbook_BookFactory">
-+ <field name="Private" cname="_private" type="void*" />
-+ <field name="Vepv" cname="vepv" type="POA_GNOME_Evolution_Addressbook_BookFactory__vepv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookFactory_Epv" cname="POA_GNOME_Evolution_Addressbook_BookFactory__epv">
-+ <field name="Private" cname="_private" type="void*" />
-+ <callback cname="getBook">
-+ <return-type type="GNOME_Evolution_Addressbook_Book" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookFactory_Vepv" cname="POA_GNOME_Evolution_Addressbook_BookFactory__vepv">
-+ <field name="BaseEpv" cname="_base_epv" type="PortableServer_ServantBase__epv*" />
-+ <field name="Bonobo_UnknownEpv" cname="Bonobo_Unknown_epv" type="POA_Bonobo_Unknown__epv*" />
-+ <field name="GNOME_Evolution_Addressbook_BookFactoryEpv" cname="GNOME_Evolution_Addressbook_BookFactory_epv" type="POA_GNOME_Evolution_Addressbook_BookFactory__epv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookListener" cname="POA_GNOME_Evolution_Addressbook_BookListener">
-+ <field name="Private" cname="_private" type="void*" />
-+ <field name="Vepv" cname="vepv" type="POA_GNOME_Evolution_Addressbook_BookListener__vepv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookListener_Epv" cname="POA_GNOME_Evolution_Addressbook_BookListener__epv">
-+ <field name="Private" cname="_private" type="void*" />
-+ <callback cname="notifyContactCreated">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyContactsRemoved">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyContactModified">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyProgress">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyBookOpened">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyBookRemoved">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyViewRequested">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyChangesRequested">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyContactRequested">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyContactListRequested">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifySupportedFields">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyRequiredFields">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyAuthenticationResult">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifySupportedAuthMethods">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyWritable">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyConnectionStatus">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyAuthRequired">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookListener_Vepv" cname="POA_GNOME_Evolution_Addressbook_BookListener__vepv">
-+ <field name="BaseEpv" cname="_base_epv" type="PortableServer_ServantBase__epv*" />
-+ <field name="Bonobo_UnknownEpv" cname="Bonobo_Unknown_epv" type="POA_Bonobo_Unknown__epv*" />
-+ <field name="GNOME_Evolution_Addressbook_BookListenerEpv" cname="GNOME_Evolution_Addressbook_BookListener_epv" type="POA_GNOME_Evolution_Addressbook_BookListener__epv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookView" cname="POA_GNOME_Evolution_Addressbook_BookView">
-+ <field name="Private" cname="_private" type="void*" />
-+ <field name="Vepv" cname="vepv" type="POA_GNOME_Evolution_Addressbook_BookView__vepv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookViewListener" cname="POA_GNOME_Evolution_Addressbook_BookViewListener">
-+ <field name="Private" cname="_private" type="void*" />
-+ <field name="Vepv" cname="vepv" type="POA_GNOME_Evolution_Addressbook_BookViewListener__vepv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookViewListener_Epv" cname="POA_GNOME_Evolution_Addressbook_BookViewListener__epv">
-+ <field name="Private" cname="_private" type="void*" />
-+ <callback cname="notifyContactsAdded">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyContactsRemoved">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyContactsChanged">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifySequenceComplete">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="notifyProgress">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookViewListener_Vepv" cname="POA_GNOME_Evolution_Addressbook_BookViewListener__vepv">
-+ <field name="BaseEpv" cname="_base_epv" type="PortableServer_ServantBase__epv*" />
-+ <field name="Bonobo_UnknownEpv" cname="Bonobo_Unknown_epv" type="POA_Bonobo_Unknown__epv*" />
-+ <field name="GNOME_Evolution_Addressbook_BookViewListenerEpv" cname="GNOME_Evolution_Addressbook_BookViewListener_epv" type="POA_GNOME_Evolution_Addressbook_BookViewListener__epv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookView_Epv" cname="POA_GNOME_Evolution_Addressbook_BookView__epv">
-+ <field name="Private" cname="_private" type="void*" />
-+ <callback cname="start">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="stop">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="dispose">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ </struct>
-+ <struct name="_Evolution_Addressbook_BookView_Vepv" cname="POA_GNOME_Evolution_Addressbook_BookView__vepv">
-+ <field name="BaseEpv" cname="_base_epv" type="PortableServer_ServantBase__epv*" />
-+ <field name="Bonobo_UnknownEpv" cname="Bonobo_Unknown_epv" type="POA_Bonobo_Unknown__epv*" />
-+ <field name="GNOME_Evolution_Addressbook_BookViewEpv" cname="GNOME_Evolution_Addressbook_BookView_epv" type="POA_GNOME_Evolution_Addressbook_BookView__epv*" />
-+ </struct>
-+ <struct name="_Evolution_Addressbook_Book_Epv" cname="POA_GNOME_Evolution_Addressbook_Book__epv">
-+ <field name="Private" cname="_private" type="void*" />
-+ <callback cname="open">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="remove">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getContact">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="authenticateUser">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="addContact">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="removeContacts">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="modifyContact">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getBookView">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getChanges">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getContactList">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getSupportedFields">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getRequiredFields">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getSupportedAuthMethods">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getStaticCapabilities">
-+ <return-type type="CORBA_string" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="getName">
-+ <return-type type="CORBA_string" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ <callback cname="cancelOperation">
-+ <return-type type="GNOME_Evolution_Addressbook_CallStatus" />
-+ <parameters>
-+ <parameter type="PortableServer_Servant" name="_servant," />
-+ </parameters>
-+ </callback>
-+ </struct>
-+ <struct name="_Evolution_Addressbook_Book_Vepv" cname="POA_GNOME_Evolution_Addressbook_Book__vepv">
-+ <field name="BaseEpv" cname="_base_epv" type="PortableServer_ServantBase__epv*" />
-+ <field name="Bonobo_UnknownEpv" cname="Bonobo_Unknown_epv" type="POA_Bonobo_Unknown__epv*" />
-+ <field name="GNOME_Evolution_Addressbook_BookEpv" cname="GNOME_Evolution_Addressbook_Book_epv" type="POA_GNOME_Evolution_Addressbook_Book__epv*" />
-+ </struct>
- </namespace>
- <namespace name="E" library="edataserver">
- <object name="Source" cname="ESource" parent="GObject">
-@@ -1682,6 +2048,9 @@
- <method name="GetType" cname="e_source_list_get_type" shared="true">
- <return-type type="GType" />
- </method>
-+ <method name="IsGconfUpdated" cname="e_source_list_is_gconf_updated">
-+ <return-type type="gboolean" />
-+ </method>
- <constructor cname="e_source_list_new" />
- <constructor cname="e_source_list_new_for_gconf">
- <parameters>
-@@ -1898,7 +2267,7 @@
- <method name="GetAlarmsForObject" cname="e_cal_get_alarms_for_object">
- <return-type type="gboolean" />
- <parameters>
-- <parameter type="const-char*" name="uid" />
-+ <parameter type="const-ECalComponentId*" name="id" />
- <parameter type="time_t" name="start" />
- <parameter type="time_t" name="end" />
- <parameter type="ECalComponentAlarms**" name="alarms" />
-@@ -2095,6 +2464,7 @@
- </parameters>
- </constructor>
- <constructor cname="e_cal_new_system_calendar" />
-+ <constructor cname="e_cal_new_system_memos" />
- <constructor cname="e_cal_new_system_tasks" />
- <method name="Open" cname="e_cal_open">
- <return-type type="gboolean" />
---- /dev/null 2006-01-19 18:09:05.748285250 +0530
-+++ evolution-sharp/evolution/evolution-api-1.3.5.raw 2005-08-31 02:44:16.000000000 +0530
-@@ -0,0 +1,2520 @@
-+<?xml version="1.0"?>
-+<api>
-+ <!--
-+
-+ This file was automatically generated.
-+ Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-+
-+-->
-+ <namespace name="E" library="ebook">
-+ <enum name="BookChangeType" cname="EBookChangeType" type="enum">
-+ <member cname="E_BOOK_CHANGE_CARD_ADDED" name="Added" />
-+ <member cname="E_BOOK_CHANGE_CARD_DELETED" name="Deleted" />
-+ <member cname="E_BOOK_CHANGE_CARD_MODIFIED" name="Modified" />
-+ </enum>
-+ <enum name="BookListenerOperation" cname="EBookListenerOperation" type="enum">
-+ <member cname="_OpenBookResponse" name="Openbookresponse" />
-+ <member cname="_RemoveBookResponse" name="Removebookresponse" />
-+ <member cname="_CreateContactResponse" name="Createcontactresponse" />
-+ <member cname="_RemoveContactResponse" name="Removecontactresponse" />
-+ <member cname="_ModifyContactResponse" name="Modifycontactresponse" />
-+ <member cname="_GetContactResponse" name="Getcontactresponse" />
-+ <member cname="_GetContactListResponse" name="Getcontactlistresponse" />
-+ <member cname="_GetBookViewResponse" name="Getbookviewresponse" />
-+ <member cname="_GetChangesResponse" name="Getchangesresponse" />
-+ <member cname="_AuthenticationResponse" name="Authenticationresponse" />
-+ <member cname="_GetSupportedFieldsResponse" name="Getsupportedfieldsresponse" />
-+ <member cname="_GetRequiredFieldsResponse" name="Getrequiredfieldsresponse" />
-+ <member cname="_GetSupportedAuthMethodsResponse" name="Getsupportedauthmethodsresponse" />
-+ <member cname="_LinkStatusEvent" name="Linkstatusevent" />
-+ <member cname="_WritableStatusEvent" name="Writablestatusevent" />
-+ <member cname="_AuthRequiredEvent" name="Authrequiredevent" />
-+ <member cname="_ProgressEvent" name="Progressevent" />
-+ </enum>
-+ <enum name="BookQueryTest" cname="EBookQueryTest" type="enum">
-+ <member cname="E_BOOK_QUERY_IS" name="Is" />
-+ <member cname="E_BOOK_QUERY_CONTAINS" name="Contains" />
-+ <member cname="E_BOOK_QUERY_BEGINS_WITH" name="BeginsWith" />
-+ <member cname="E_BOOK_QUERY_ENDS_WITH" name="EndsWith" />
-+ </enum>
-+ <enum name="BookStatus" cname="EBookStatus" type="enum">
-+ <member cname="E_BOOK_ERROR_OK" name="Ok" />
-+ <member cname="E_BOOK_ERROR_INVALID_ARG" name="InvalidArg" />
-+ <member cname="E_BOOK_ERROR_BUSY" name="Busy" />
-+ <member cname="E_BOOK_ERROR_REPOSITORY_OFFLINE" name="RepositoryOffline" />
-+ <member cname="E_BOOK_ERROR_NO_SUCH_BOOK" name="NoSuchBook" />
-+ <member cname="E_BOOK_ERROR_NO_SELF_CONTACT" name="NoSelfContact" />
-+ <member cname="E_BOOK_ERROR_SOURCE_NOT_LOADED" name="SourceNotLoaded" />
-+ <member cname="E_BOOK_ERROR_SOURCE_ALREADY_LOADED" name="SourceAlreadyLoaded" />
-+ <member cname="E_BOOK_ERROR_PERMISSION_DENIED" name="PermissionDenied" />
-+ <member cname="E_BOOK_ERROR_CONTACT_NOT_FOUND" name="ContactNotFound" />
-+ <member cname="E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS" name="ContactIdAlreadyExists" />
-+ <member cname="E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED" name="ProtocolNotSupported" />
-+ <member cname="E_BOOK_ERROR_CANCELLED" name="Cancelled" />
-+ <member cname="E_BOOK_ERROR_COULD_NOT_CANCEL" name="CouldNotCancel" />
-+ <member cname="E_BOOK_ERROR_AUTHENTICATION_FAILED" name="AuthenticationFailed" />
-+ <member cname="E_BOOK_ERROR_AUTHENTICATION_REQUIRED" name="AuthenticationRequired" />
-+ <member cname="E_BOOK_ERROR_TLS_NOT_AVAILABLE" name="TlsNotAvailable" />
-+ <member cname="E_BOOK_ERROR_CORBA_EXCEPTION" name="CorbaException" />
-+ <member cname="E_BOOK_ERROR_NO_SUCH_SOURCE" name="NoSuchSource" />
-+ <member cname="E_BOOK_ERROR_OFFLINE_UNAVAILABLE" name="OfflineUnavailable" />
-+ <member cname="E_BOOK_ERROR_OTHER_ERROR" name="OtherError" />
-+ <member cname="E_BOOK_ERROR_INVALID_SERVER_VERSION" name="InvalidServerVersion" />
-+ </enum>
-+ <enum name="BookViewListenerOperation" cname="EBookViewListenerOperation" type="enum">
-+ <member cname="_ContactsAddedEvent" name="Contactsaddedevent" />
-+ <member cname="_ContactsRemovedEvent" name="Contactsremovedevent" />
-+ <member cname="_ContactsModifiedEvent" name="Contactsmodifiedevent" />
-+ <member cname="_SequenceCompleteEvent" name="Sequencecompleteevent" />
-+ <member cname="_StatusMessageEvent" name="Statusmessageevent" />
-+ </enum>
-+ <enum name="BookViewStatus" cname="EBookViewStatus" type="enum">
-+ <member cname="E_BOOK_VIEW_STATUS_OK" name="StatusOk" />
-+ <member cname="E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED" name="StatusTimeLimitExceeded" />
-+ <member cname="E_BOOK_VIEW_STATUS_SIZE_LIMIT_EXCEEDED" name="StatusSizeLimitExceeded" />
-+ <member cname="E_BOOK_VIEW_ERROR_INVALID_QUERY" name="ErrorInvalidQuery" />
-+ <member cname="E_BOOK_VIEW_ERROR_QUERY_REFUSED" name="ErrorQueryRefused" />
-+ <member cname="E_BOOK_VIEW_ERROR_OTHER_ERROR" name="ErrorOtherError" />
-+ </enum>
-+ <enum name="ContactField" cname="EContactField" type="enum">
-+ <member cname="E_CONTACT_UID" name="Uid" value="1" />
-+ <member cname="E_CONTACT_FILE_AS" name="FileAs" />
-+ <member cname="E_CONTACT_BOOK_URI" name="BookUri" />
-+ <member cname="E_CONTACT_FULL_NAME" name="FullName" />
-+ <member cname="E_CONTACT_GIVEN_NAME" name="GivenName" />
-+ <member cname="E_CONTACT_FAMILY_NAME" name="FamilyName" />
-+ <member cname="E_CONTACT_NICKNAME" name="Nickname" />
-+ <member cname="E_CONTACT_EMAIL_1" name="Email1" />
-+ <member cname="E_CONTACT_EMAIL_2" name="Email2" />
-+ <member cname="E_CONTACT_EMAIL_3" name="Email3" />
-+ <member cname="E_CONTACT_EMAIL_4" name="Email4" />
-+ <member cname="E_CONTACT_MAILER" name="Mailer" />
-+ <member cname="E_CONTACT_ADDRESS_LABEL_HOME" name="AddressLabelHome" />
-+ <member cname="E_CONTACT_ADDRESS_LABEL_WORK" name="AddressLabelWork" />
-+ <member cname="E_CONTACT_ADDRESS_LABEL_OTHER" name="AddressLabelOther" />
-+ <member cname="E_CONTACT_PHONE_ASSISTANT" name="PhoneAssistant" />
-+ <member cname="E_CONTACT_PHONE_BUSINESS" name="PhoneBusiness" />
-+ <member cname="E_CONTACT_PHONE_BUSINESS_2" name="PhoneBusiness2" />
-+ <member cname="E_CONTACT_PHONE_BUSINESS_FAX" name="PhoneBusinessFax" />
-+ <member cname="E_CONTACT_PHONE_CALLBACK" name="PhoneCallback" />
-+ <member cname="E_CONTACT_PHONE_CAR" name="PhoneCar" />
-+ <member cname="E_CONTACT_PHONE_COMPANY" name="PhoneCompany" />
-+ <member cname="E_CONTACT_PHONE_HOME" name="PhoneHome" />
-+ <member cname="E_CONTACT_PHONE_HOME_2" name="PhoneHome2" />
-+ <member cname="E_CONTACT_PHONE_HOME_FAX" name="PhoneHomeFax" />
-+ <member cname="E_CONTACT_PHONE_ISDN" name="PhoneIsdn" />
-+ <member cname="E_CONTACT_PHONE_MOBILE" name="PhoneMobile" />
-+ <member cname="E_CONTACT_PHONE_OTHER" name="PhoneOther" />
-+ <member cname="E_CONTACT_PHONE_OTHER_FAX" name="PhoneOtherFax" />
-+ <member cname="E_CONTACT_PHONE_PAGER" name="PhonePager" />
-+ <member cname="E_CONTACT_PHONE_PRIMARY" name="PhonePrimary" />
-+ <member cname="E_CONTACT_PHONE_RADIO" name="PhoneRadio" />
-+ <member cname="E_CONTACT_PHONE_TELEX" name="PhoneTelex" />
-+ <member cname="E_CONTACT_PHONE_TTYTDD" name="PhoneTtytdd" />
-+ <member cname="E_CONTACT_ORG" name="Org" />
-+ <member cname="E_CONTACT_ORG_UNIT" name="OrgUnit" />
-+ <member cname="E_CONTACT_OFFICE" name="Office" />
-+ <member cname="E_CONTACT_TITLE" name="Title" />
-+ <member cname="E_CONTACT_ROLE" name="Role" />
-+ <member cname="E_CONTACT_MANAGER" name="Manager" />
-+ <member cname="E_CONTACT_ASSISTANT" name="Assistant" />
-+ <member cname="E_CONTACT_HOMEPAGE_URL" name="HomepageUrl" />
-+ <member cname="E_CONTACT_BLOG_URL" name="BlogUrl" />
-+ <member cname="E_CONTACT_CATEGORIES" name="Categories" />
-+ <member cname="E_CONTACT_CALENDAR_URI" name="CalendarUri" />
-+ <member cname="E_CONTACT_FREEBUSY_URL" name="FreebusyUrl" />
-+ <member cname="E_CONTACT_ICS_CALENDAR" name="IcsCalendar" />
-+ <member cname="E_CONTACT_VIDEO_URL" name="VideoUrl" />
-+ <member cname="E_CONTACT_SPOUSE" name="Spouse" />
-+ <member cname="E_CONTACT_NOTE" name="Note" />
-+ <member cname="E_CONTACT_IM_AIM_HOME_1" name="ImAimHome1" />
-+ <member cname="E_CONTACT_IM_AIM_HOME_2" name="ImAimHome2" />
-+ <member cname="E_CONTACT_IM_AIM_HOME_3" name="ImAimHome3" />
-+ <member cname="E_CONTACT_IM_AIM_WORK_1" name="ImAimWork1" />
-+ <member cname="E_CONTACT_IM_AIM_WORK_2" name="ImAimWork2" />
-+ <member cname="E_CONTACT_IM_AIM_WORK_3" name="ImAimWork3" />
-+ <member cname="E_CONTACT_IM_GROUPWISE_HOME_1" name="ImGroupwiseHome1" />
-+ <member cname="E_CONTACT_IM_GROUPWISE_HOME_2" name="ImGroupwiseHome2" />
-+ <member cname="E_CONTACT_IM_GROUPWISE_HOME_3" name="ImGroupwiseHome3" />
-+ <member cname="E_CONTACT_IM_GROUPWISE_WORK_1" name="ImGroupwiseWork1" />
-+ <member cname="E_CONTACT_IM_GROUPWISE_WORK_2" name="ImGroupwiseWork2" />
-+ <member cname="E_CONTACT_IM_GROUPWISE_WORK_3" name="ImGroupwiseWork3" />
-+ <member cname="E_CONTACT_IM_JABBER_HOME_1" name="ImJabberHome1" />
-+ <member cname="E_CONTACT_IM_JABBER_HOME_2" name="ImJabberHome2" />
-+ <member cname="E_CONTACT_IM_JABBER_HOME_3" name="ImJabberHome3" />
-+ <member cname="E_CONTACT_IM_JABBER_WORK_1" name="ImJabberWork1" />
-+ <member cname="E_CONTACT_IM_JABBER_WORK_2" name="ImJabberWork2" />
-+ <member cname="E_CONTACT_IM_JABBER_WORK_3" name="ImJabberWork3" />
-+ <member cname="E_CONTACT_IM_YAHOO_HOME_1" name="ImYahooHome1" />
-+ <member cname="E_CONTACT_IM_YAHOO_HOME_2" name="ImYahooHome2" />
-+ <member cname="E_CONTACT_IM_YAHOO_HOME_3" name="ImYahooHome3" />
-+ <member cname="E_CONTACT_IM_YAHOO_WORK_1" name="ImYahooWork1" />
-+ <member cname="E_CONTACT_IM_YAHOO_WORK_2" name="ImYahooWork2" />
-+ <member cname="E_CONTACT_IM_YAHOO_WORK_3" name="ImYahooWork3" />
-+ <member cname="E_CONTACT_IM_MSN_HOME_1" name="ImMsnHome1" />
-+ <member cname="E_CONTACT_IM_MSN_HOME_2" name="ImMsnHome2" />
-+ <member cname="E_CONTACT_IM_MSN_HOME_3" name="ImMsnHome3" />
-+ <member cname="E_CONTACT_IM_MSN_WORK_1" name="ImMsnWork1" />
-+ <member cname="E_CONTACT_IM_MSN_WORK_2" name="ImMsnWork2" />
-+ <member cname="E_CONTACT_IM_MSN_WORK_3" name="ImMsnWork3" />
-+ <member cname="E_CONTACT_IM_ICQ_HOME_1" name="ImIcqHome1" />
-+ <member cname="E_CONTACT_IM_ICQ_HOME_2" name="ImIcqHome2" />
-+ <member cname="E_CONTACT_IM_ICQ_HOME_3" name="ImIcqHome3" />
-+ <member cname="E_CONTACT_IM_ICQ_WORK_1" name="ImIcqWork1" />
-+ <member cname="E_CONTACT_IM_ICQ_WORK_2" name="ImIcqWork2" />
-+ <member cname="E_CONTACT_IM_ICQ_WORK_3" name="ImIcqWork3" />
-+ <member cname="E_CONTACT_REV" name="Rev" />
-+ <member cname="E_CONTACT_NAME_OR_ORG" name="NameOrOrg" />
-+ <member cname="E_CONTACT_ADDRESS" name="Address" />
-+ <member cname="E_CONTACT_ADDRESS_HOME" name="AddressHome" />
-+ <member cname="E_CONTACT_ADDRESS_WORK" name="AddressWork" />
-+ <member cname="E_CONTACT_ADDRESS_OTHER" name="AddressOther" />
-+ <member cname="E_CONTACT_CATEGORY_LIST" name="CategoryList" />
-+ <member cname="E_CONTACT_PHOTO" name="Photo" />
-+ <member cname="E_CONTACT_LOGO" name="Logo" />
-+ <member cname="E_CONTACT_NAME" name="Name" />
-+ <member cname="E_CONTACT_EMAIL" name="Email" />
-+ <member cname="E_CONTACT_IM_AIM" name="ImAim" />
-+ <member cname="E_CONTACT_IM_GROUPWISE" name="ImGroupwise" />
-+ <member cname="E_CONTACT_IM_JABBER" name="ImJabber" />
-+ <member cname="E_CONTACT_IM_YAHOO" name="ImYahoo" />
-+ <member cname="E_CONTACT_IM_MSN" name="ImMsn" />
-+ <member cname="E_CONTACT_IM_ICQ" name="ImIcq" />
-+ <member cname="E_CONTACT_WANTS_HTML" name="WantsHtml" />
-+ <member cname="E_CONTACT_IS_LIST" name="IsList" />
-+ <member cname="E_CONTACT_LIST_SHOW_ADDRESSES" name="ListShowAddresses" />
-+ <member cname="E_CONTACT_BIRTH_DATE" name="BirthDate" />
-+ <member cname="E_CONTACT_ANNIVERSARY" name="Anniversary" />
-+ <member cname="E_CONTACT_X509_CERT" name="X509Cert" />
-+ <member cname="E_CONTACT_FIELD_LAST" name="FieldLast" />
-+ <member cname="E_CONTACT_FIELD_FIRST" name="FieldFirst" />
-+ <member cname="E_CONTACT_LAST_SIMPLE_STRING" name="LastSimpleString" />
-+ <member cname="E_CONTACT_FIRST_PHONE_ID" name="FirstPhoneId" />
-+ <member cname="E_CONTACT_LAST_PHONE_ID" name="LastPhoneId" />
-+ <member cname="E_CONTACT_FIRST_EMAIL_ID" name="FirstEmailId" />
-+ <member cname="E_CONTACT_LAST_EMAIL_ID" name="LastEmailId" />
-+ <member cname="E_CONTACT_FIRST_ADDRESS_ID" name="FirstAddressId" />
-+ <member cname="E_CONTACT_LAST_ADDRESS_ID" name="LastAddressId" />
-+ <member cname="E_CONTACT_FIRST_LABEL_ID" name="FirstLabelId" />
-+ <member cname="E_CONTACT_LAST_LABEL_ID" name="LastLabelId" />
-+ </enum>
-+ <enum name="VCardFormat" cname="EVCardFormat" type="enum">
-+ <member cname="EVC_FORMAT_VCARD_21" name="Two1" />
-+ <member cname="EVC_FORMAT_VCARD_30" name="Three0" />
-+ </enum>
-+ <callback name="BookBookViewCallback" cname="EBookBookViewCallback">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="EBookStatus" name="status" />
-+ <parameter type="EBookView*" name="book_view" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </callback>
-+ <callback name="BookCallback" cname="EBookCallback">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="EBookStatus" name="status" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </callback>
-+ <callback name="BookContactCallback" cname="EBookContactCallback">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="EBookStatus" name="status" />
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </callback>
-+ <callback name="BookEListCallback" cname="EBookEListCallback">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="EBookStatus" name="status" />
-+ <parameter type="EList*" name="list" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </callback>
-+ <callback name="BookIdCallback" cname="EBookIdCallback">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="EBookStatus" name="status" />
-+ <parameter type="const-char*" name="id" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </callback>
-+ <callback name="BookListCallback" cname="EBookListCallback">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="EBookStatus" name="status" />
-+ <parameter type="GList*" name="list" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </callback>
-+ <callback name="BookOpenProgressCallback" cname="EBookOpenProgressCallback">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="const-char*" name="status_message" />
-+ <parameter type="short" name="percent" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </callback>
-+ <object name="Book" cname="EBook" parent="GObject">
-+ <field name="Priv" cname="priv" type="EBookPrivate*" />
-+ <signal name="WritableStatus" cname="writable_status" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="gboolean" name="writable" />
-+ </parameters>
-+ </signal>
-+ <signal name="ConnectionStatus" cname="connection_status" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ <parameter type="gboolean" name="connected" />
-+ </parameters>
-+ </signal>
-+ <signal name="AuthRequired" cname="auth_required" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ </parameters>
-+ </signal>
-+ <signal name="BackendDied" cname="backend_died" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ </parameters>
-+ </signal>
-+ <method name="AddContact" cname="e_book_add_contact">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncAddContact" cname="e_book_async_add_contact">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="EBookIdCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncAuthenticateUser" cname="e_book_async_authenticate_user">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="const-char*" name="user" />
-+ <parameter type="const-char*" name="passwd" />
-+ <parameter type="const-char*" name="auth_method" />
-+ <parameter type="EBookCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncCommitContact" cname="e_book_async_commit_contact">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="EBookCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncGetBookView" cname="e_book_async_get_book_view">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EBookQuery*" name="query" />
-+ <parameter type="GList*" name="requested_fields" />
-+ <parameter type="int" name="max_results" />
-+ <parameter type="EBookBookViewCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncGetChanges" cname="e_book_async_get_changes">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="char*" name="changeid" />
-+ <parameter type="EBookListCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncGetContact" cname="e_book_async_get_contact">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="const-char*" name="id" />
-+ <parameter type="EBookContactCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncGetContacts" cname="e_book_async_get_contacts">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EBookQuery*" name="query" />
-+ <parameter type="EBookListCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncGetRequiredFields" cname="e_book_async_get_required_fields">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EBookEListCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncGetSupportedAuthMethods" cname="e_book_async_get_supported_auth_methods">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EBookEListCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncGetSupportedFields" cname="e_book_async_get_supported_fields">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EBookEListCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncOpen" cname="e_book_async_open">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="gboolean" name="only_if_exists" />
-+ <parameter type="EBookCallback" name="open_response" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncRemove" cname="e_book_async_remove">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EBookCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncRemoveContact" cname="e_book_async_remove_contact">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="EBookCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncRemoveContactById" cname="e_book_async_remove_contact_by_id">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="const-char*" name="id" />
-+ <parameter type="EBookCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AsyncRemoveContacts" cname="e_book_async_remove_contacts">
-+ <return-type type="guint" />
-+ <parameters>
-+ <parameter type="GList*" name="id_list" />
-+ <parameter type="EBookCallback" name="cb" />
-+ <parameter type="gpointer" name="closure" />
-+ </parameters>
-+ </method>
-+ <method name="AuthenticateUser" cname="e_book_authenticate_user">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="user" />
-+ <parameter type="const-char*" name="passwd" />
-+ <parameter type="const-char*" name="auth_method" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="Cancel" cname="e_book_cancel">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="CheckStaticCapability" cname="e_book_check_static_capability">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="cap" />
-+ </parameters>
-+ </method>
-+ <method name="CommitContact" cname="e_book_commit_contact">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="ErrorQuark" cname="e_book_error_quark" shared="true">
-+ <return-type type="GQuark" />
-+ </method>
-+ <method name="FreeChangeList" cname="e_book_free_change_list" shared="true">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="GList*" name="change_list" />
-+ </parameters>
-+ </method>
-+ <method name="GetAddressbooks" cname="e_book_get_addressbooks" shared="true">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESourceList**" name="addressbook_sources" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetBookView" cname="e_book_get_book_view">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EBookQuery*" name="query" />
-+ <parameter type="GList*" name="requested_fields" />
-+ <parameter type="int" name="max_results" />
-+ <parameter type="EBookView**" name="book_view" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetChanges" cname="e_book_get_changes">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="char*" name="changeid" />
-+ <parameter type="GList**" name="changes" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetContact" cname="e_book_get_contact">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="id" />
-+ <parameter type="EContact**" name="contact" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetContacts" cname="e_book_get_contacts">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EBookQuery*" name="query" />
-+ <parameter type="GList**" name="contacts" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetRequiredFields" cname="e_book_get_required_fields">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GList**" name="fields" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetSelf" cname="e_book_get_self" shared="true">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EContact**" name="contact" />
-+ <parameter type="EBook**" name="book" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetSource" cname="e_book_get_source">
-+ <return-type type="ESource*" />
-+ </method>
-+ <method name="GetStaticCapabilities" cname="e_book_get_static_capabilities">
-+ <return-type type="const-char*" />
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetSupportedAuthMethods" cname="e_book_get_supported_auth_methods">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GList**" name="auth_methods" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetSupportedFields" cname="e_book_get_supported_fields">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GList**" name="fields" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetType" cname="e_book_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <method name="GetUri" cname="e_book_get_uri">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="IsOnline" cname="e_book_is_online">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="IsOpened" cname="e_book_is_opened">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="IsSelf" cname="e_book_is_self" shared="true">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ </parameters>
-+ </method>
-+ <method name="IsWritable" cname="e_book_is_writable">
-+ <return-type type="gboolean" />
-+ </method>
-+ <constructor cname="e_book_new">
-+ <parameters>
-+ <parameter type="ESource*" name="source" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_book_new_default_addressbook">
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_book_new_from_uri">
-+ <parameters>
-+ <parameter type="const-char*" name="uri" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_book_new_system_addressbook">
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </constructor>
-+ <method name="Open" cname="e_book_open">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="gboolean" name="only_if_exists" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="Remove" cname="e_book_remove">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveContact" cname="e_book_remove_contact">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="id" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveContacts" cname="e_book_remove_contacts">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GList*" name="ids" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="SetDefaultAddressbook" cname="e_book_set_default_addressbook">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="SetDefaultSource" cname="e_book_set_default_source" shared="true">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESource*" name="source" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="SetSelf" cname="e_book_set_self">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ </object>
-+ <object name="BookListener" cname="EBookListener" parent="BonoboObject">
-+ <field name="Priv" cname="priv" type="EBookListenerPrivate*" />
-+ <signal name="Response" cname="response" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBookListener*" name="listener" />
-+ <parameter type="EBookListenerResponse*" name="response" />
-+ </parameters>
-+ </signal>
-+ <method name="GetType" cname="e_book_listener_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_book_listener_new" />
-+ <method name="Stop" cname="e_book_listener_stop">
-+ <return-type type="void" />
-+ </method>
-+ </object>
-+ <object name="BookView" cname="EBookView" parent="GObject">
-+ <field name="Priv" cname="priv" type="EBookViewPrivate*" />
-+ <signal name="ContactsChanged" cname="contacts_changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBookView*" name="book_view" />
-+ <parameter type="const-GList*" name="contacts" />
-+ </parameters>
-+ </signal>
-+ <signal name="ContactsAdded" cname="contacts_added" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBookView*" name="book_view" />
-+ <parameter type="const-GList*" name="contacts" />
-+ </parameters>
-+ </signal>
-+ <signal name="ContactsRemoved" cname="contacts_removed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBookView*" name="book_view" />
-+ <parameter type="const-GList*" name="ids" />
-+ </parameters>
-+ </signal>
-+ <signal name="SequenceComplete" cname="sequence_complete" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBookView*" name="book_view" />
-+ <parameter type="EBookViewStatus" name="status" />
-+ </parameters>
-+ </signal>
-+ <signal name="StatusMessage" cname="status_message" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBookView*" name="book_view" />
-+ <parameter type="const-char*" name="message" />
-+ </parameters>
-+ </signal>
-+ <method name="GetType" cname="e_book_view_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_book_view_new">
-+ <parameters>
-+ <parameter type="GNOME_Evolution_Addressbook_BookView" name="corba_book_view" />
-+ <parameter type="EBookViewListener*" name="listener" />
-+ </parameters>
-+ </constructor>
-+ <method name="SetBook" cname="e_book_view_set_book">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="_EBook*" name="book" />
-+ </parameters>
-+ </method>
-+ <method name="Start" cname="e_book_view_start">
-+ <return-type type="void" />
-+ </method>
-+ <method name="Stop" cname="e_book_view_stop">
-+ <return-type type="void" />
-+ </method>
-+ </object>
-+ <object name="BookViewListener" cname="EBookViewListener" parent="BonoboObject">
-+ <field name="Priv" cname="priv" type="EBookViewListenerPrivate*" />
-+ <signal name="Response" cname="response" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBookViewListener*" name="listener" />
-+ <parameter type="EBookViewListenerResponse*" name="response" />
-+ </parameters>
-+ </signal>
-+ <method name="GetType" cname="e_book_view_listener_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_book_view_listener_new" />
-+ <method name="Start" cname="e_book_view_listener_start">
-+ <return-type type="void" />
-+ </method>
-+ <method name="Stop" cname="e_book_view_listener_stop">
-+ <return-type type="void" />
-+ </method>
-+ </object>
-+ <object name="Contact" cname="EContact" parent="EVCard">
-+ <field name="Priv" cname="priv" type="EContactPrivate*" />
-+ <property name="" cname="" type="" />
-+ <method name="Duplicate" cname="e_contact_duplicate">
-+ <return-type type="EContact*" />
-+ </method>
-+ <method name="FieldId" cname="e_contact_field_id" shared="true">
-+ <return-type type="EContactField" />
-+ <parameters>
-+ <parameter type="const-char*" name="field_name" />
-+ </parameters>
-+ </method>
-+ <method name="FieldName" cname="e_contact_field_name" shared="true">
-+ <return-type type="const-char*" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ </parameters>
-+ </method>
-+ <method name="Get" cname="e_contact_get">
-+ <return-type type="gpointer" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ </parameters>
-+ </method>
-+ <method name="GetAttributes" cname="e_contact_get_attributes">
-+ <return-type type="GList*" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ </parameters>
-+ </method>
-+ <method name="GetConst" cname="e_contact_get_const">
-+ <return-type type="gconst-pointer" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ </parameters>
-+ </method>
-+ <method name="GetType" cname="e_contact_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_contact_new" />
-+ <constructor cname="e_contact_new_from_vcard">
-+ <parameters>
-+ <parameter type="const-char*" name="vcard" />
-+ </parameters>
-+ </constructor>
-+ <method name="PrettyName" cname="e_contact_pretty_name" shared="true">
-+ <return-type type="const-char*" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ </parameters>
-+ </method>
-+ <method name="Set" cname="e_contact_set">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ <parameter type="gpointer" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="SetAttributes" cname="e_contact_set_attributes">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ <parameter type="GList*" name="attributes" />
-+ </parameters>
-+ </method>
-+ <method name="VcardAttribute" cname="e_contact_vcard_attribute" shared="true">
-+ <return-type type="const-char*" />
-+ <parameters>
-+ <parameter type="EContactField" name="field_id" />
-+ </parameters>
-+ </method>
-+ </object>
-+ <object name="Destination" cname="EDestination" parent="GObject">
-+ <field name="Priv" cname="priv" type="struct-_EDestinationPrivate*" />
-+ <signal name="Changed" cname="changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EDestination*" name="destination" />
-+ </parameters>
-+ </signal>
-+ <method name="Copy" cname="e_destination_copy">
-+ <return-type type="EDestination*" />
-+ </method>
-+ <method name="Empty" cname="e_destination_empty">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="Equal" cname="e_destination_equal">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-EDestination*" name="b" />
-+ </parameters>
-+ </method>
-+ <method name="Export" cname="e_destination_export">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="ExportToVcardAttribute" cname="e_destination_export_to_vcard_attribute">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttribute*" name="attr" />
-+ </parameters>
-+ </method>
-+ <method name="Exportv" cname="e_destination_exportv">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="Freev" cname="e_destination_freev">
-+ <return-type type="void" />
-+ </method>
-+ <method name="GetAddress" cname="e_destination_get_address">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetContact" cname="e_destination_get_contact">
-+ <return-type type="EContact*" />
-+ </method>
-+ <method name="GetContactUid" cname="e_destination_get_contact_uid">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetEmail" cname="e_destination_get_email">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetEmailNum" cname="e_destination_get_email_num">
-+ <return-type type="int" />
-+ </method>
-+ <method name="GetHtmlMailPref" cname="e_destination_get_html_mail_pref">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetName" cname="e_destination_get_name">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetSourceUid" cname="e_destination_get_source_uid">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetTextrep" cname="e_destination_get_textrep">
-+ <return-type type="const-char*" />
-+ <parameters>
-+ <parameter type="gboolean" name="include_email" />
-+ </parameters>
-+ </method>
-+ <method name="GetTextrepv" cname="e_destination_get_textrepv">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="GetType" cname="e_destination_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <method name="Import" cname="e_destination_import" shared="true">
-+ <return-type type="EDestination*" />
-+ <parameters>
-+ <parameter type="const-char*" name="str" />
-+ </parameters>
-+ </method>
-+ <method name="Importv" cname="e_destination_importv" shared="true">
-+ <return-type type="EDestination**" />
-+ <parameters>
-+ <parameter type="const-char*" name="str" />
-+ </parameters>
-+ </method>
-+ <method name="IsAutoRecipient" cname="e_destination_is_auto_recipient">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="IsEvolutionList" cname="e_destination_is_evolution_list">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="ListGetDests" cname="e_destination_list_get_dests">
-+ <return-type type="const-GList*" />
-+ </method>
-+ <method name="ListShowAddresses" cname="e_destination_list_show_addresses">
-+ <return-type type="gboolean" />
-+ </method>
-+ <constructor cname="e_destination_new" />
-+ <method name="SetAutoRecipient" cname="e_destination_set_auto_recipient">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="gboolean" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="SetBook" cname="e_destination_set_book">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EBook*" name="book" />
-+ </parameters>
-+ </method>
-+ <method name="SetContact" cname="e_destination_set_contact">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EContact*" name="contact" />
-+ <parameter type="int" name="email_num" />
-+ </parameters>
-+ </method>
-+ <method name="SetContactUid" cname="e_destination_set_contact_uid">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ <parameter type="gint" name="email_num" />
-+ </parameters>
-+ </method>
-+ <method name="SetEmail" cname="e_destination_set_email">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="email" />
-+ </parameters>
-+ </method>
-+ <method name="SetHtmlMailPref" cname="e_destination_set_html_mail_pref">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="gboolean" name="flag" />
-+ </parameters>
-+ </method>
-+ <method name="SetName" cname="e_destination_set_name">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="name" />
-+ </parameters>
-+ </method>
-+ <method name="SetRaw" cname="e_destination_set_raw">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="free_form_string" />
-+ </parameters>
-+ </method>
-+ </object>
-+ <object name="VCard" cname="EVCard" parent="GObject">
-+ <field name="Priv" cname="priv" type="EVCardPrivate*" />
-+ <method name="AddAttribute" cname="e_vcard_add_attribute">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttribute*" name="attr" />
-+ </parameters>
-+ </method>
-+ <method name="AddAttributeWithValue" cname="e_vcard_add_attribute_with_value">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttribute*" name="attr" />
-+ <parameter type="const-char*" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="AddAttributeWithValues" cname="e_vcard_add_attribute_with_values">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttribute*" name="attr" />
-+ <parameter ellipsis="true" />
-+ </parameters>
-+ </method>
-+ <method name="Construct" cname="e_vcard_construct">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="str" />
-+ </parameters>
-+ </method>
-+ <method name="DumpStructure" cname="e_vcard_dump_structure">
-+ <return-type type="void" />
-+ </method>
-+ <method name="EscapeString" cname="e_vcard_escape_string" shared="true">
-+ <return-type type="char*" />
-+ <parameters>
-+ <parameter type="const-char*" name="str" />
-+ </parameters>
-+ </method>
-+ <method name="GetAttributes" cname="e_vcard_get_attributes">
-+ <return-type type="GList*" />
-+ </method>
-+ <method name="GetType" cname="e_vcard_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_vcard_new" />
-+ <constructor cname="e_vcard_new_from_string">
-+ <parameters>
-+ <parameter type="const-char*" name="str" />
-+ </parameters>
-+ </constructor>
-+ <method name="RemoveAttribute" cname="e_vcard_remove_attribute">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttribute*" name="attr" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveAttributes" cname="e_vcard_remove_attributes">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="attr_group" />
-+ <parameter type="const-char*" name="attr_name" />
-+ </parameters>
-+ </method>
-+ <method name="ToString" cname="e_vcard_to_string">
-+ <return-type type="char*" />
-+ <parameters>
-+ <parameter type="EVCardFormat" name="format" />
-+ </parameters>
-+ </method>
-+ <method name="UnescapeString" cname="e_vcard_unescape_string" shared="true">
-+ <return-type type="char*" />
-+ <parameters>
-+ <parameter type="const-char*" name="str" />
-+ </parameters>
-+ </method>
-+ </object>
-+ <struct name="AddressWestern" cname="EAddressWestern">
-+ <field name="PoBox" cname="po_box" type="char*" />
-+ <field name="Extended" cname="extended" type="char*" />
-+ <field name="Street" cname="street" type="char*" />
-+ <field name="Locality" cname="locality" type="char*" />
-+ <field name="Region" cname="region" type="char*" />
-+ <field name="PostalCode" cname="postal_code" type="char*" />
-+ <field name="Country" cname="country" type="char*" />
-+ <method name="Free" cname="e_address_western_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="Parse" cname="e_address_western_parse" shared="true">
-+ <return-type type="EAddressWestern*" />
-+ <parameters>
-+ <parameter type="const-char*" name="address" />
-+ </parameters>
-+ </method>
-+ </struct>
-+ <struct name="BookChange" cname="EBookChange">
-+ <field name="ChangeType" cname="change_type" type="EBookChangeType" />
-+ <field name="Contact" cname="contact" type="EContact*" />
-+ </struct>
-+ <struct name="BookListenerResponse" cname="EBookListenerResponse">
-+ <field name="Op" cname="op" type="EBookListenerOperation" />
-+ <field name="Opid" cname="opid" type="guint32" />
-+ <field name="Status" cname="status" type="EBookStatus" />
-+ <field name="BookView" cname="book_view" type="GNOME_Evolution_Addressbook_BookView" />
-+ <field name="List" cname="list" type="GList*" />
-+ <field name="Msg" cname="msg" type="char*" />
-+ <field name="Percent" cname="percent" type="short" />
-+ <field name="Connected" cname="connected" type="gboolean" />
-+ <field name="Writable" cname="writable" type="gboolean" />
-+ <field name="Id" cname="id" type="char*" />
-+ <field name="Vcard" cname="vcard" type="char*" />
-+ </struct>
-+ <boxed name="BookQuery" cname="EBookQuery" opaque="true">
-+ <method name="And" cname="e_book_query_and" shared="true">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter type="int" name="nqs" />
-+ <parameter type="EBookQuery**" name="qs" />
-+ <parameter type="gboolean" name="unref" />
-+ </parameters>
-+ </method>
-+ <method name="Andv" cname="e_book_query_andv">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter ellipsis="true" />
-+ </parameters>
-+ </method>
-+ <method name="AnyFieldContains" cname="e_book_query_any_field_contains" shared="true">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter type="const-char*" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="Copy" cname="e_book_query_copy">
-+ <return-type type="EBookQuery*" />
-+ </method>
-+ <method name="FieldExists" cname="e_book_query_field_exists" shared="true">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter type="EContactField" name="field" />
-+ </parameters>
-+ </method>
-+ <method name="FieldTest" cname="e_book_query_field_test" shared="true">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter type="EContactField" name="field" />
-+ <parameter type="EBookQueryTest" name="test" />
-+ <parameter type="const-char*" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="FromString" cname="e_book_query_from_string" shared="true">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter type="const-char*" name="query_string" />
-+ </parameters>
-+ </method>
-+ <method name="GetType" cname="e_book_query_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <method name="Not" cname="e_book_query_not">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter type="gboolean" name="unref" />
-+ </parameters>
-+ </method>
-+ <method name="Or" cname="e_book_query_or" shared="true">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter type="int" name="nqs" />
-+ <parameter type="EBookQuery**" name="qs" />
-+ <parameter type="gboolean" name="unref" />
-+ </parameters>
-+ </method>
-+ <method name="Orv" cname="e_book_query_orv">
-+ <return-type type="EBookQuery*" />
-+ <parameters>
-+ <parameter ellipsis="true" />
-+ </parameters>
-+ </method>
-+ <method name="Ref" cname="e_book_query_ref">
-+ <return-type type="EBookQuery*" />
-+ </method>
-+ <method name="ToString" cname="e_book_query_to_string">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="Unref" cname="e_book_query_unref">
-+ <return-type type="void" />
-+ </method>
-+ </boxed>
-+ <struct name="BookViewListenerResponse" cname="EBookViewListenerResponse">
-+ <field name="Op" cname="op" type="EBookViewListenerOperation" />
-+ <field name="Status" cname="status" type="EBookViewStatus" />
-+ <field name="Ids" cname="ids" type="GList*" />
-+ <field name="Contacts" cname="contacts" type="GList*" />
-+ <field name="Message" cname="message" type="char*" />
-+ </struct>
-+ <boxed name="ContactAddress" cname="EContactAddress">
-+ <field name="AddressFormat" cname="address_format" type="char*" />
-+ <field name="Po" cname="po" type="char*" />
-+ <field name="Ext" cname="ext" type="char*" />
-+ <field name="Street" cname="street" type="char*" />
-+ <field name="Locality" cname="locality" type="char*" />
-+ <field name="Region" cname="region" type="char*" />
-+ <field name="Code" cname="code" type="char*" />
-+ <field name="Country" cname="country" type="char*" />
-+ <method name="Free" cname="e_contact_address_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="GetType" cname="e_contact_address_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ </boxed>
-+ <boxed name="ContactCert" cname="EContactCert">
-+ <field name="Length" cname="length" type="int" />
-+ <field name="Data" cname="data" type="char*" />
-+ <method name="Free" cname="e_contact_cert_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="GetType" cname="e_contact_cert_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ </boxed>
-+ <boxed name="ContactDate" cname="EContactDate">
-+ <field name="Year" cname="year" type="int" />
-+ <field name="Month" cname="month" type="int" />
-+ <field name="Day" cname="day" type="int" />
-+ <method name="Equal" cname="e_contact_date_equal">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="EContactDate*" name="dt2" />
-+ </parameters>
-+ </method>
-+ <method name="Free" cname="e_contact_date_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="FromString" cname="e_contact_date_from_string" shared="true">
-+ <return-type type="EContactDate*" />
-+ <parameters>
-+ <parameter type="const-char*" name="str" />
-+ </parameters>
-+ </method>
-+ <method name="GetType" cname="e_contact_date_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_contact_date_new" />
-+ <method name="ToString" cname="e_contact_date_to_string">
-+ <return-type type="char*" />
-+ </method>
-+ </boxed>
-+ <boxed name="ContactName" cname="EContactName">
-+ <field name="Family" cname="family" type="char*" />
-+ <field name="Given" cname="given" type="char*" />
-+ <field name="Additional" cname="additional" type="char*" />
-+ <field name="Prefixes" cname="prefixes" type="char*" />
-+ <field name="Suffixes" cname="suffixes" type="char*" />
-+ <method name="Copy" cname="e_contact_name_copy">
-+ <return-type type="EContactName*" />
-+ </method>
-+ <method name="Free" cname="e_contact_name_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="FromString" cname="e_contact_name_from_string" shared="true">
-+ <return-type type="EContactName*" />
-+ <parameters>
-+ <parameter type="const-char*" name="name_str" />
-+ </parameters>
-+ </method>
-+ <method name="GetType" cname="e_contact_name_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_contact_name_new" />
-+ <method name="ToString" cname="e_contact_name_to_string">
-+ <return-type type="char*" />
-+ </method>
-+ </boxed>
-+ <boxed name="ContactPhoto" cname="EContactPhoto">
-+ <field name="Length" cname="length" type="int" />
-+ <field name="Data" cname="data" type="char*" />
-+ <method name="Free" cname="e_contact_photo_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="GetType" cname="e_contact_photo_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ </boxed>
-+ <struct name="NameWestern" cname="ENameWestern">
-+ <field name="Prefix" cname="prefix" type="char*" />
-+ <field name="First" cname="first" type="char*" />
-+ <field name="Middle" cname="middle" type="char*" />
-+ <field name="Nick" cname="nick" type="char*" />
-+ <field name="Last" cname="last" type="char*" />
-+ <field name="Suffix" cname="suffix" type="char*" />
-+ <field name="Full" cname="full" type="char*" />
-+ <method name="Free" cname="e_name_western_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="Parse" cname="e_name_western_parse" shared="true">
-+ <return-type type="ENameWestern*" />
-+ <parameters>
-+ <parameter type="const-char*" name="full_name" />
-+ </parameters>
-+ </method>
-+ </struct>
-+ <struct name="VCardAttribute" cname="EVCardAttribute" opaque="true">
-+ <method name="AddParam" cname="e_vcard_attribute_add_param">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttributeParam*" name="param" />
-+ </parameters>
-+ </method>
-+ <method name="AddParamWithValue" cname="e_vcard_attribute_add_param_with_value">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttributeParam*" name="param" />
-+ <parameter type="const-char*" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="AddParamWithValues" cname="e_vcard_attribute_add_param_with_values">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EVCardAttributeParam*" name="param" />
-+ <parameter ellipsis="true" />
-+ </parameters>
-+ </method>
-+ <method name="AddValue" cname="e_vcard_attribute_add_value">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="AddValueDecoded" cname="e_vcard_attribute_add_value_decoded">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="value" />
-+ <parameter type="int" name="len" />
-+ </parameters>
-+ </method>
-+ <method name="AddValues" cname="e_vcard_attribute_add_values">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter ellipsis="true" />
-+ </parameters>
-+ </method>
-+ <method name="Copy" cname="e_vcard_attribute_copy">
-+ <return-type type="EVCardAttribute*" />
-+ </method>
-+ <method name="Free" cname="e_vcard_attribute_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="GetGroup" cname="e_vcard_attribute_get_group">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetName" cname="e_vcard_attribute_get_name">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetParams" cname="e_vcard_attribute_get_params">
-+ <return-type type="GList*" />
-+ </method>
-+ <method name="GetValue" cname="e_vcard_attribute_get_value">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="GetValueDecoded" cname="e_vcard_attribute_get_value_decoded">
-+ <return-type type="GString*" />
-+ </method>
-+ <method name="GetValues" cname="e_vcard_attribute_get_values">
-+ <return-type type="GList*" />
-+ </method>
-+ <method name="GetValuesDecoded" cname="e_vcard_attribute_get_values_decoded">
-+ <return-type type="GList*" />
-+ </method>
-+ <method name="HasType" cname="e_vcard_attribute_has_type">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="typestr" />
-+ </parameters>
-+ </method>
-+ <method name="IsSingleValued" cname="e_vcard_attribute_is_single_valued">
-+ <return-type type="gboolean" />
-+ </method>
-+ <constructor cname="e_vcard_attribute_new">
-+ <parameters>
-+ <parameter type="const-char*" name="attr_group" />
-+ <parameter type="const-char*" name="attr_name" />
-+ </parameters>
-+ </constructor>
-+ <method name="RemoveParams" cname="e_vcard_attribute_remove_params">
-+ <return-type type="void" />
-+ </method>
-+ <method name="RemoveValues" cname="e_vcard_attribute_remove_values">
-+ <return-type type="void" />
-+ </method>
-+ </struct>
-+ <struct name="VCardAttributeParam" cname="EVCardAttributeParam" opaque="true">
-+ <method name="AddValue" cname="e_vcard_attribute_param_add_value">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="AddValues" cname="e_vcard_attribute_param_add_values">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter ellipsis="true" />
-+ </parameters>
-+ </method>
-+ <method name="Copy" cname="e_vcard_attribute_param_copy">
-+ <return-type type="EVCardAttributeParam*" />
-+ </method>
-+ <method name="Free" cname="e_vcard_attribute_param_free">
-+ <return-type type="void" />
-+ </method>
-+ <method name="GetName" cname="e_vcard_attribute_param_get_name">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetValues" cname="e_vcard_attribute_param_get_values">
-+ <return-type type="GList*" />
-+ </method>
-+ <constructor cname="e_vcard_attribute_param_new">
-+ <parameters>
-+ <parameter type="const-char*" name="param_name" />
-+ </parameters>
-+ </constructor>
-+ <method name="RemoveValues" cname="e_vcard_attribute_param_remove_values">
-+ <return-type type="void" />
-+ </method>
-+ </struct>
-+ </namespace>
-+ <namespace name="E" library="edataserver">
-+ <object name="Source" cname="ESource" parent="GObject">
-+ <field name="Priv" cname="priv" type="ESourcePrivate*" />
-+ <signal name="Changed" cname="changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESource*" name="source" />
-+ </parameters>
-+ </signal>
-+ <method name="BuildAbsoluteUri" cname="e_source_build_absolute_uri">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="Copy" cname="e_source_copy">
-+ <return-type type="ESource*" />
-+ </method>
-+ <method name="DumpToXmlNode" cname="e_source_dump_to_xml_node">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="xmlNodePtr" name="parent_node" />
-+ </parameters>
-+ </method>
-+ <method name="Equal" cname="e_source_equal">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESource*" name="source_2" />
-+ </parameters>
-+ </method>
-+ <method name="ForeachProperty" cname="e_source_foreach_property">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="GHFunc" name="func" />
-+ <parameter type="gpointer" name="data" />
-+ </parameters>
-+ </method>
-+ <method name="GetColor" cname="e_source_get_color">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="guint32*" name="color_return" />
-+ </parameters>
-+ </method>
-+ <method name="GetProperty" cname="e_source_get_property">
-+ <return-type type="const-gchar*" />
-+ <parameters>
-+ <parameter type="const-gchar*" name="property" />
-+ </parameters>
-+ </method>
-+ <method name="GetReadonly" cname="e_source_get_readonly">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetType" cname="e_source_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <method name="GetUri" cname="e_source_get_uri">
-+ <return-type type="char*" />
-+ </method>
-+ <constructor cname="e_source_new">
-+ <parameters>
-+ <parameter type="const-char*" name="name" />
-+ <parameter type="const-char*" name="relative_uri" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_source_new_from_standalone_xml">
-+ <parameters>
-+ <parameter type="const-char*" name="xml" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_source_new_from_xml_node">
-+ <parameters>
-+ <parameter type="xmlNodePtr" name="node" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_source_new_with_absolute_uri">
-+ <parameters>
-+ <parameter type="const-char*" name="name" />
-+ <parameter type="const-char*" name="absolute_uri" />
-+ </parameters>
-+ </constructor>
-+ <method name="PeekAbsoluteUri" cname="e_source_peek_absolute_uri">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="PeekGroup" cname="e_source_peek_group">
-+ <return-type type="ESourceGroup*" />
-+ </method>
-+ <method name="PeekName" cname="e_source_peek_name">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="PeekRelativeUri" cname="e_source_peek_relative_uri">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="PeekUid" cname="e_source_peek_uid">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="SetAbsoluteUri" cname="e_source_set_absolute_uri">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="absolute_uri" />
-+ </parameters>
-+ </method>
-+ <method name="SetColor" cname="e_source_set_color">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="guint32" name="color" />
-+ </parameters>
-+ </method>
-+ <method name="SetGroup" cname="e_source_set_group">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESourceGroup*" name="group" />
-+ </parameters>
-+ </method>
-+ <method name="SetName" cname="e_source_set_name">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="name" />
-+ </parameters>
-+ </method>
-+ <method name="SetProperty" cname="e_source_set_property">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-gchar*" name="property" />
-+ <parameter type="const-gchar*" name="value" />
-+ </parameters>
-+ </method>
-+ <method name="SetReadonly" cname="e_source_set_readonly">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="gboolean" name="readonly" />
-+ </parameters>
-+ </method>
-+ <method name="SetRelativeUri" cname="e_source_set_relative_uri">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="relative_uri" />
-+ </parameters>
-+ </method>
-+ <method name="ToStandaloneXml" cname="e_source_to_standalone_xml">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="UidFromXmlNode" cname="e_source_uid_from_xml_node" shared="true">
-+ <return-type type="char*" />
-+ <parameters>
-+ <parameter type="xmlNodePtr" name="node" />
-+ </parameters>
-+ </method>
-+ <method name="UnsetColor" cname="e_source_unset_color">
-+ <return-type type="void" />
-+ </method>
-+ <method name="UpdateFromXmlNode" cname="e_source_update_from_xml_node">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="xmlNodePtr" name="node" />
-+ <parameter type="gboolean*" name="changed_return" />
-+ </parameters>
-+ </method>
-+ </object>
-+ <object name="SourceGroup" cname="ESourceGroup" parent="GObject">
-+ <field name="Priv" cname="priv" type="ESourceGroupPrivate*" />
-+ <signal name="Changed" cname="changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESourceGroup*" name="group" />
-+ </parameters>
-+ </signal>
-+ <signal name="SourceAdded" cname="source_added" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESourceGroup*" name="source_list" />
-+ <parameter type="ESource*" name="source" />
-+ </parameters>
-+ </signal>
-+ <signal name="SourceRemoved" cname="source_removed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESourceGroup*" name="source_list" />
-+ <parameter type="ESource*" name="source" />
-+ </parameters>
-+ </signal>
-+ <method name="AddSource" cname="e_source_group_add_source">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESource*" name="source" />
-+ <parameter type="int" name="position" />
-+ </parameters>
-+ </method>
-+ <method name="GetReadonly" cname="e_source_group_get_readonly">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetType" cname="e_source_group_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_source_group_new">
-+ <parameters>
-+ <parameter type="const-char*" name="name" />
-+ <parameter type="const-char*" name="base_uri" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_source_group_new_from_xml">
-+ <parameters>
-+ <parameter type="const-char*" name="xml" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_source_group_new_from_xmldoc">
-+ <parameters>
-+ <parameter type="xmlDocPtr" name="doc" />
-+ </parameters>
-+ </constructor>
-+ <method name="PeekBaseUri" cname="e_source_group_peek_base_uri">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="PeekName" cname="e_source_group_peek_name">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="PeekSourceByName" cname="e_source_group_peek_source_by_name">
-+ <return-type type="ESource*" />
-+ <parameters>
-+ <parameter type="const-char*" name="source_name" />
-+ </parameters>
-+ </method>
-+ <method name="PeekSourceByUid" cname="e_source_group_peek_source_by_uid">
-+ <return-type type="ESource*" />
-+ <parameters>
-+ <parameter type="const-char*" name="source_uid" />
-+ </parameters>
-+ </method>
-+ <method name="PeekSources" cname="e_source_group_peek_sources">
-+ <return-type type="GSList*" />
-+ </method>
-+ <method name="PeekUid" cname="e_source_group_peek_uid">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="RemoveSource" cname="e_source_group_remove_source">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESource*" name="source" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveSourceByUid" cname="e_source_group_remove_source_by_uid">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ </parameters>
-+ </method>
-+ <method name="SetBaseUri" cname="e_source_group_set_base_uri">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="base_uri" />
-+ </parameters>
-+ </method>
-+ <method name="SetName" cname="e_source_group_set_name">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="const-char*" name="name" />
-+ </parameters>
-+ </method>
-+ <method name="SetReadonly" cname="e_source_group_set_readonly">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="gboolean" name="readonly" />
-+ </parameters>
-+ </method>
-+ <method name="ToXml" cname="e_source_group_to_xml">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="UidFromXmldoc" cname="e_source_group_uid_from_xmldoc" shared="true">
-+ <return-type type="char*" />
-+ <parameters>
-+ <parameter type="xmlDocPtr" name="doc" />
-+ </parameters>
-+ </method>
-+ <method name="UpdateFromXml" cname="e_source_group_update_from_xml">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="xml" />
-+ <parameter type="gboolean*" name="changed_return" />
-+ </parameters>
-+ </method>
-+ <method name="UpdateFromXmldoc" cname="e_source_group_update_from_xmldoc">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="xmlDocPtr" name="doc" />
-+ <parameter type="gboolean*" name="changed_return" />
-+ </parameters>
-+ </method>
-+ </object>
-+ <object name="SourceList" cname="ESourceList" parent="GObject">
-+ <field name="Priv" cname="priv" type="ESourceListPrivate*" />
-+ <signal name="Changed" cname="changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESourceList*" name="source_list" />
-+ </parameters>
-+ </signal>
-+ <signal name="GroupRemoved" cname="group_removed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESourceList*" name="source_list" />
-+ <parameter type="ESourceGroup*" name="group" />
-+ </parameters>
-+ </signal>
-+ <signal name="GroupAdded" cname="group_added" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ESourceList*" name="source_list" />
-+ <parameter type="ESourceGroup*" name="group" />
-+ </parameters>
-+ </signal>
-+ <method name="AddGroup" cname="e_source_list_add_group">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESourceGroup*" name="group" />
-+ <parameter type="int" name="position" />
-+ </parameters>
-+ </method>
-+ <method name="GetType" cname="e_source_list_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_source_list_new" />
-+ <constructor cname="e_source_list_new_for_gconf">
-+ <parameters>
-+ <parameter type="GConfClient*" name="client" />
-+ <parameter type="const-char*" name="path" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_source_list_new_for_gconf_default">
-+ <parameters>
-+ <parameter type="const-char*" name="path" />
-+ </parameters>
-+ </constructor>
-+ <method name="PeekGroupByName" cname="e_source_list_peek_group_by_name">
-+ <return-type type="ESourceGroup*" />
-+ <parameters>
-+ <parameter type="const-char*" name="name" />
-+ </parameters>
-+ </method>
-+ <method name="PeekGroupByUid" cname="e_source_list_peek_group_by_uid">
-+ <return-type type="ESourceGroup*" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ </parameters>
-+ </method>
-+ <method name="PeekGroups" cname="e_source_list_peek_groups">
-+ <return-type type="GSList*" />
-+ </method>
-+ <method name="PeekSourceAny" cname="e_source_list_peek_source_any">
-+ <return-type type="ESource*" />
-+ </method>
-+ <method name="PeekSourceByUid" cname="e_source_list_peek_source_by_uid">
-+ <return-type type="ESource*" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveGroup" cname="e_source_list_remove_group">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESourceGroup*" name="group" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveGroupByUid" cname="e_source_list_remove_group_by_uid">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveSourceByUid" cname="e_source_list_remove_source_by_uid">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uidj" />
-+ </parameters>
-+ </method>
-+ <method name="Sync" cname="e_source_list_sync">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ </object>
-+ </namespace>
-+ <namespace name="E" library="ecal">
-+ <enum name="CalChangeType" cname="ECalChangeType" type="flags">
-+ <member cname="E_CAL_CHANGE_ADDED" name="Added" value="1 << 0" />
-+ <member cname="E_CAL_CHANGE_MODIFIED" name="Modified" value="1 << 1" />
-+ <member cname="E_CAL_CHANGE_DELETED" name="Deleted" value="1 << 2" />
-+ </enum>
-+ <enum name="CalLoadState" cname="ECalLoadState" type="enum">
-+ <member cname="E_CAL_LOAD_NOT_LOADED" name="NotLoaded" />
-+ <member cname="E_CAL_LOAD_AUTHENTICATING" name="Authenticating" />
-+ <member cname="E_CAL_LOAD_LOADING" name="Loading" />
-+ <member cname="E_CAL_LOAD_LOADED" name="Loaded" />
-+ </enum>
-+ <enum name="CalSetModeStatus" cname="ECalSetModeStatus" type="enum">
-+ <member cname="E_CAL_SET_MODE_SUCCESS" name="Success" />
-+ <member cname="E_CAL_SET_MODE_ERROR" name="Error" />
-+ <member cname="E_CAL_SET_MODE_NOT_SUPPORTED" name="NotSupported" />
-+ </enum>
-+ <enum name="CalSourceType" cname="ECalSourceType" type="enum">
-+ <member cname="E_CAL_SOURCE_TYPE_EVENT" name="Event" />
-+ <member cname="E_CAL_SOURCE_TYPE_TODO" name="Todo" />
-+ <member cname="E_CAL_SOURCE_TYPE_JOURNAL" name="Journal" />
-+ <member cname="E_CAL_SOURCE_TYPE_LAST" name="Last" />
-+ </enum>
-+ <enum name="CalendarStatus" cname="ECalendarStatus" type="enum">
-+ <member cname="E_CALENDAR_STATUS_OK" name="Ok" />
-+ <member cname="E_CALENDAR_STATUS_INVALID_ARG" name="InvalidArg" />
-+ <member cname="E_CALENDAR_STATUS_BUSY" name="Busy" />
-+ <member cname="E_CALENDAR_STATUS_REPOSITORY_OFFLINE" name="RepositoryOffline" />
-+ <member cname="E_CALENDAR_STATUS_NO_SUCH_CALENDAR" name="NoSuchCalendar" />
-+ <member cname="E_CALENDAR_STATUS_OBJECT_NOT_FOUND" name="ObjectNotFound" />
-+ <member cname="E_CALENDAR_STATUS_INVALID_OBJECT" name="InvalidObject" />
-+ <member cname="E_CALENDAR_STATUS_URI_NOT_LOADED" name="UriNotLoaded" />
-+ <member cname="E_CALENDAR_STATUS_URI_ALREADY_LOADED" name="UriAlreadyLoaded" />
-+ <member cname="E_CALENDAR_STATUS_PERMISSION_DENIED" name="PermissionDenied" />
-+ <member cname="E_CALENDAR_STATUS_UNKNOWN_USER" name="UnknownUser" />
-+ <member cname="E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS" name="ObjectIdAlreadyExists" />
-+ <member cname="E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED" name="ProtocolNotSupported" />
-+ <member cname="E_CALENDAR_STATUS_CANCELLED" name="Cancelled" />
-+ <member cname="E_CALENDAR_STATUS_COULD_NOT_CANCEL" name="CouldNotCancel" />
-+ <member cname="E_CALENDAR_STATUS_AUTHENTICATION_FAILED" name="AuthenticationFailed" />
-+ <member cname="E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED" name="AuthenticationRequired" />
-+ <member cname="E_CALENDAR_STATUS_CORBA_EXCEPTION" name="CorbaException" />
-+ <member cname="E_CALENDAR_STATUS_OTHER_ERROR" name="OtherError" />
-+ <member cname="E_CALENDAR_STATUS_INVALID_SERVER_VERSION" name="InvalidServerVersion" />
-+ </enum>
-+ <callback name="CalAuthFunc" cname="ECalAuthFunc">
-+ <return-type type="char*" />
-+ <parameters>
-+ <parameter type="ECal*" name="ecal" />
-+ <parameter type="const-char*" name="prompt" />
-+ <parameter type="const-char*" name="key" />
-+ <parameter type="gpointer" name="user_data" />
-+ </parameters>
-+ </callback>
-+ <object name="Cal" cname="ECal" parent="GObject">
-+ <field name="Priv" cname="priv" type="ECalPrivate*" />
-+ <signal name="CalOpened" cname="cal_opened" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECal*" name="ecal" />
-+ <parameter type="ECalendarStatus" name="status" />
-+ </parameters>
-+ </signal>
-+ <signal name="CalSetMode" cname="cal_set_mode" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECal*" name="ecal" />
-+ <parameter type="ECalSetModeStatus" name="status" />
-+ <parameter type="CalMode" name="mode" />
-+ </parameters>
-+ </signal>
-+ <signal name="BackendError" cname="backend_error" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECal*" name="ecal" />
-+ <parameter type="const-char*" name="message" />
-+ </parameters>
-+ </signal>
-+ <signal name="BackendDied" cname="backend_died" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECal*" name="ecal" />
-+ </parameters>
-+ </signal>
-+ <method name="AddTimezone" cname="e_cal_add_timezone">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="icaltimezone*" name="izone" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="CreateObject" cname="e_cal_create_object">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="icalcomponent*" name="icalcomp" />
-+ <parameter type="char**" name="uid" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="DiscardAlarm" cname="e_cal_discard_alarm">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ECalComponent*" name="comp" />
-+ <parameter type="const-char*" name="auid" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="FreeAlarms" cname="e_cal_free_alarms" shared="true">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="GSList*" name="comp_alarms" />
-+ </parameters>
-+ </method>
-+ <method name="FreeChangeList" cname="e_cal_free_change_list" shared="true">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="GList*" name="list" />
-+ </parameters>
-+ </method>
-+ <method name="FreeObjectList" cname="e_cal_free_object_list" shared="true">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="GList*" name="objects" />
-+ </parameters>
-+ </method>
-+ <method name="GenerateInstances" cname="e_cal_generate_instances">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="time_t" name="start" />
-+ <parameter type="time_t" name="end" />
-+ <parameter type="ECalRecurInstanceFn" name="cb" />
-+ <parameter type="gpointer" name="cb_data" />
-+ </parameters>
-+ </method>
-+ <method name="GenerateInstancesForObject" cname="e_cal_generate_instances_for_object">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="icalcomponent*" name="icalcomp" />
-+ <parameter type="time_t" name="start" />
-+ <parameter type="time_t" name="end" />
-+ <parameter type="ECalRecurInstanceFn" name="cb" />
-+ <parameter type="gpointer" name="cb_data" />
-+ </parameters>
-+ </method>
-+ <method name="GetAlarmEmailAddress" cname="e_cal_get_alarm_email_address">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="char**" name="alarm_address" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetAlarmsForObject" cname="e_cal_get_alarms_for_object">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ <parameter type="time_t" name="start" />
-+ <parameter type="time_t" name="end" />
-+ <parameter type="ECalComponentAlarms**" name="alarms" />
-+ </parameters>
-+ </method>
-+ <method name="GetAlarmsInRange" cname="e_cal_get_alarms_in_range">
-+ <return-type type="GSList*" />
-+ <parameters>
-+ <parameter type="time_t" name="start" />
-+ <parameter type="time_t" name="end" />
-+ </parameters>
-+ </method>
-+ <method name="GetAttachmentsForComp" cname="e_cal_get_attachments_for_comp">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ <parameter type="const-char*" name="rid" />
-+ <parameter type="GSList**" name="list" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetCalAddress" cname="e_cal_get_cal_address">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="char**" name="cal_address" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetChanges" cname="e_cal_get_changes">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="change_id" />
-+ <parameter type="GList**" name="changes" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetComponentAsString" cname="e_cal_get_component_as_string">
-+ <return-type type="char*" />
-+ <parameters>
-+ <parameter type="icalcomponent*" name="icalcomp" />
-+ </parameters>
-+ </method>
-+ <method name="GetDefaultObject" cname="e_cal_get_default_object">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="icalcomponent**" name="icalcomp" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetErrorMessage" cname="e_cal_get_error_message" shared="true">
-+ <return-type type="const-char*" />
-+ <parameters>
-+ <parameter type="ECalendarStatus" name="status" />
-+ </parameters>
-+ </method>
-+ <method name="GetFreeBusy" cname="e_cal_get_free_busy">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GList*" name="users" />
-+ <parameter type="time_t" name="start" />
-+ <parameter type="time_t" name="end" />
-+ <parameter type="GList**" name="freebusy" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetLdapAttribute" cname="e_cal_get_ldap_attribute">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="char**" name="ldap_attribute" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetLoadState" cname="e_cal_get_load_state">
-+ <return-type type="ECalLoadState" />
-+ </method>
-+ <method name="GetLocalAttachmentStore" cname="e_cal_get_local_attachment_store">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="GetObject" cname="e_cal_get_object">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ <parameter type="const-char*" name="rid" />
-+ <parameter type="icalcomponent**" name="icalcomp" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetObjectList" cname="e_cal_get_object_list">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="query" />
-+ <parameter type="GList**" name="objects" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetObjectListAsComp" cname="e_cal_get_object_list_as_comp">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="query" />
-+ <parameter type="GList**" name="objects" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetObjectsForUid" cname="e_cal_get_objects_for_uid">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ <parameter type="GList**" name="objects" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetOneAlarmOnly" cname="e_cal_get_one_alarm_only">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetOrganizerMustAccept" cname="e_cal_get_organizer_must_accept">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetOrganizerMustAttend" cname="e_cal_get_organizer_must_attend">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetQuery" cname="e_cal_get_query">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="sexp" />
-+ <parameter type="ECalView**" name="query" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetRecurrencesNoMaster" cname="e_cal_get_recurrences_no_master">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetSaveSchedules" cname="e_cal_get_save_schedules">
-+ <return-type type="gboolean" />
-+ </method>
-+ <method name="GetSource" cname="e_cal_get_source">
-+ <return-type type="ESource*" />
-+ </method>
-+ <method name="GetSourceType" cname="e_cal_get_source_type">
-+ <return-type type="ECalSourceType" />
-+ </method>
-+ <method name="GetSources" cname="e_cal_get_sources" shared="true">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESourceList**" name="sources" />
-+ <parameter type="ECalSourceType" name="type" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetStaticCapability" cname="e_cal_get_static_capability">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="cap" />
-+ </parameters>
-+ </method>
-+ <method name="GetTimezone" cname="e_cal_get_timezone">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="tzid" />
-+ <parameter type="icaltimezone**" name="zone" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="GetType" cname="e_cal_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <method name="GetUri" cname="e_cal_get_uri">
-+ <return-type type="const-char*" />
-+ </method>
-+ <method name="IsReadOnly" cname="e_cal_is_read_only">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="gboolean*" name="read_only" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="ModifyObject" cname="e_cal_modify_object">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="icalcomponent*" name="icalcomp" />
-+ <parameter type="CalObjModType" name="mod" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <constructor cname="e_cal_new">
-+ <parameters>
-+ <parameter type="ESource*" name="source" />
-+ <parameter type="ECalSourceType" name="type" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_cal_new_from_uri">
-+ <parameters>
-+ <parameter type="const-gchar*" name="uri" />
-+ <parameter type="ECalSourceType" name="type" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_cal_new_system_calendar" />
-+ <constructor cname="e_cal_new_system_tasks" />
-+ <method name="Open" cname="e_cal_open">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="gboolean" name="only_if_exists" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="OpenAsync" cname="e_cal_open_async">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="gboolean" name="only_if_exists" />
-+ </parameters>
-+ </method>
-+ <method name="OpenDefault" cname="e_cal_open_default">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ECalSourceType" name="type" />
-+ <parameter type="ECalAuthFunc" name="func" />
-+ <parameter type="gpointer" name="data" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="OpenStatusEnumGetType" cname="e_cal_open_status_enum_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <method name="ReceiveObjects" cname="e_cal_receive_objects">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="icalcomponent*" name="icalcomp" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="Remove" cname="e_cal_remove">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveObject" cname="e_cal_remove_object">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="RemoveObjectWithMod" cname="e_cal_remove_object_with_mod">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ <parameter type="const-char*" name="rid" />
-+ <parameter type="CalObjModType" name="mod" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="ResolveTzidCb" cname="e_cal_resolve_tzid_cb" shared="true">
-+ <return-type type="icaltimezone*" />
-+ <parameters>
-+ <parameter type="const-char*" name="tzid" />
-+ <parameter type="gpointer" name="data" />
-+ </parameters>
-+ </method>
-+ <method name="SendObjects" cname="e_cal_send_objects">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="icalcomponent*" name="icalcomp" />
-+ <parameter type="GList**" name="users" />
-+ <parameter type="icalcomponent**" name="modified_icalcomp" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="SetAuthFunc" cname="e_cal_set_auth_func">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECalAuthFunc" name="func" />
-+ <parameter type="gpointer" name="data" />
-+ </parameters>
-+ </method>
-+ <method name="SetDefault" cname="e_cal_set_default">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="SetDefaultSource" cname="e_cal_set_default_source" shared="true">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="ESource*" name="source" />
-+ <parameter type="ECalSourceType" name="type" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="SetDefaultTimezone" cname="e_cal_set_default_timezone">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="icaltimezone*" name="zone" />
-+ <parameter type="GError**" name="error" />
-+ </parameters>
-+ </method>
-+ <method name="SetMode" cname="e_cal_set_mode">
-+ <return-type type="gboolean" />
-+ <parameters>
-+ <parameter type="CalMode" name="mode" />
-+ </parameters>
-+ </method>
-+ <method name="UriList" cname="e_cal_uri_list">
-+ <return-type type="GList*" />
-+ <parameters>
-+ <parameter type="CalMode" name="mode" />
-+ </parameters>
-+ </method>
-+ </object>
-+ <object name="CalView" cname="ECalView" parent="GObject">
-+ <field name="Priv" cname="priv" type="ECalViewPrivate*" />
-+ <property name="" cname="" type="" />
-+ <property name="" cname="" type="" />
-+ <property name="" cname="" type="" />
-+ <signal name="ObjectsModified" cname="objects_modified" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECalView*" name="view" />
-+ <parameter type="GList*" name="objects" />
-+ </parameters>
-+ </signal>
-+ <signal name="ObjectsRemoved" cname="objects_removed" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECalView*" name="view" />
-+ <parameter type="GList*" name="uids" />
-+ </parameters>
-+ </signal>
-+ <signal name="ViewProgress" cname="view_progress" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECalView*" name="view" />
-+ <parameter type="char*" name="message" />
-+ <parameter type="int" name="percent" />
-+ </parameters>
-+ </signal>
-+ <signal name="ViewDone" cname="view_done" when="FIRST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECalView*" name="view" />
-+ <parameter type="ECalendarStatus" name="status" />
-+ </parameters>
-+ </signal>
-+ <virtual_method name="ObjectsAdded" cname="objects_added">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="ECalView*" name="view" />
-+ <parameter type="GList*" name="objects" />
-+ </parameters>
-+ </virtual_method>
-+ <method name="GetType" cname="e_cal_view_get_type" shared="true">
-+ <return-type type="GType" />
-+ </method>
-+ <constructor cname="e_cal_view_new">
-+ <parameters>
-+ <parameter type="GNOME_Evolution_Calendar_CalView" name="corba_view" />
-+ <parameter type="ECalViewListener*" name="listener" />
-+ <parameter type="_ECal*" name="client" />
-+ </parameters>
-+ </constructor>
-+ <method name="Start" cname="e_cal_view_start">
-+ <return-type type="void" />
-+ </method>
-+ </object>
-+ <struct name="CalChange" cname="ECalChange">
-+ <field name="Comp" cname="comp" type="ECalComponent*" />
-+ <field name="Type" cname="type" type="ECalChangeType" />
-+ </struct>
-+ <class name="Global" cname="EGlobal">
-+ <method name="CalendarErrorQuark" cname="e_calendar_error_quark" shared="true">
-+ <return-type type="GQuark" />
-+ </method>
-+ </class>
-+ </namespace>
-+ <namespace name="E" library="evolutionglue">
-+ <object name="MailRemoteGlue" cname="EMailRemoteGlue" parent="GObject">
-+ <field name="Priv" cname="priv" type="EMailRemoteGluePrivate*" />
-+ <signal name="SessionChangedAdded" cname="session_changed_added" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="added" />
-+ </parameters>
-+ </signal>
-+ <signal name="SessionChangedRemoved" cname="session_changed_removed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="removed" />
-+ </parameters>
-+ </signal>
-+ <signal name="SessionChangedChanged" cname="session_changed_changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="changed" />
-+ </parameters>
-+ </signal>
-+ <signal name="SessionShutdown" cname="session_shutdown" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="void*" name="data" />
-+ </parameters>
-+ </signal>
-+ <signal name="StoreChangedAdded" cname="store_changed_added" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="added" />
-+ </parameters>
-+ </signal>
-+ <signal name="StoreChangedRemoved" cname="store_changed_removed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="removed" />
-+ </parameters>
-+ </signal>
-+ <signal name="StoreChangedChanged" cname="store_changed_changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="changed" />
-+ </parameters>
-+ </signal>
-+ <signal name="FolderChangedAdded" cname="folder_changed_added" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="added" />
-+ </parameters>
-+ </signal>
-+ <signal name="FolderChangedRemoved" cname="folder_changed_removed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="removed" />
-+ </parameters>
-+ </signal>
-+ <signal name="FolderChangedChanged" cname="folder_changed_changed" when="LAST">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="EMailRemoteGlue*" name="emrg" />
-+ <parameter type="GSList*" name="changed" />
-+ </parameters>
-+ </signal>
-+ <method name="GetStores" cname="e_mail_remote_glue_get_stores">
-+ <return-type type="GSList*" />
-+ </method>
-+ <method name="LookupPluginAndInitialize" cname="e_mail_remote_glue_lookup_plugin_and_initialize">
-+ <return-type type="gboolean" />
-+ </method>
-+ <constructor cname="e_mail_remote_glue_new" />
-+ <method name="PeekFolderListener" cname="e_mail_remote_glue_peek_folder_listener">
-+ <return-type type="EvolutionMailFolderListener*" />
-+ </method>
-+ <method name="PeekSessionListener" cname="e_mail_remote_glue_peek_session_listener">
-+ <return-type type="EvolutionMailSessionListener*" />
-+ </method>
-+ <method name="PeekStoreListener" cname="e_mail_remote_glue_peek_store_listener">
-+ <return-type type="EvolutionMailStoreListener*" />
-+ </method>
-+ </object>
-+ <object name="MailRemoteGlueFolderChange" cname="EMailRemoteGlueFolderChange" parent="GObject">
-+ <field name="MsgInfos" cname="msg_infos" type="GSList*" />
-+ <method name="GetMessageInfoList" cname="e_mail_remote_glue_folderchange_get_message_info_list">
-+ <return-type type="GSList*" />
-+ </method>
-+ <constructor cname="e_mail_remote_glue_folderchange_new" />
-+ <constructor cname="e_mail_remote_glue_folderchange_new_clone">
-+ <parameters>
-+ <parameter type="EMailRemoteGlueFolderChange*" name="fchange" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_mail_remote_glue_folderchange_new_from_EMFolderChange">
-+ <parameters>
-+ <parameter type="Evolution_Mail_FolderChange" name="fchange" />
-+ </parameters>
-+ </constructor>
-+ </object>
-+ <object name="MailRemoteGlueFolderInfo" cname="EMailRemoteGlueFolderInfo" parent="GObject">
-+ <field name="Priv" cname="priv" type="EMailRemoteGlueFolderInfoPrivate*" />
-+ <method name="EMFolder" cname="e_mail_remote_glue_folderinfo_EMFolder">
-+ <return-type type="Evolution_Mail_Folder" />
-+ </method>
-+ <method name="GetMessage" cname="e_mail_remote_glue_folderinfo_get_message">
-+ <return-type type="EMailRemoteGlueMsgStream*" />
-+ <parameters>
-+ <parameter type="const-char*" name="uid" />
-+ </parameters>
-+ </method>
-+ <method name="GetMessages" cname="e_mail_remote_glue_folderinfo_get_messages">
-+ <return-type type="EMailRemoteGlueMsgIterator*" />
-+ </method>
-+ <constructor cname="e_mail_remote_glue_folderinfo_new" />
-+ <constructor cname="e_mail_remote_glue_folderinfo_new_clone">
-+ <parameters>
-+ <parameter type="EMailRemoteGlueFolderInfo*" name="info" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_mail_remote_glue_folderinfo_new_from_EMFolderInfo">
-+ <parameters>
-+ <parameter type="Evolution_Mail_FolderInfo" name="info" />
-+ </parameters>
-+ </constructor>
-+ <method name="PeekFullName" cname="e_mail_remote_glue_folderinfo_peek_full_name">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="PeekName" cname="e_mail_remote_glue_folderinfo_peek_name">
-+ <return-type type="char*" />
-+ </method>
-+ </object>
-+ <object name="MailRemoteGlueMessageInfo" cname="EMailRemoteGlueMessageInfo" parent="GObject">
-+ <field name="Priv" cname="priv" type="EMailRemoteGlueMessageInfoPrivate*" />
-+ <method name="FreeUserTagList" cname="e_mail_remote_glue_messageinfo_free_user_tag_list" shared="true">
-+ <return-type type="void" />
-+ <parameters>
-+ <parameter type="GSList*" name="user_tag_list" />
-+ </parameters>
-+ </method>
-+ <constructor cname="e_mail_remote_glue_messageinfo_new" />
-+ <constructor cname="e_mail_remote_glue_messageinfo_new_clone">
-+ <parameters>
-+ <parameter type="EMailRemoteGlueMessageInfo*" name="info" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_mail_remote_glue_messageinfo_new_from_EMMessageInfo">
-+ <parameters>
-+ <parameter type="Evolution_Mail_MessageInfo" name="info" />
-+ </parameters>
-+ </constructor>
-+ <method name="PeekFlags" cname="e_mail_remote_glue_messageinfo_peek_flags">
-+ <return-type type="long" />
-+ </method>
-+ <method name="PeekFrom" cname="e_mail_remote_glue_messageinfo_peek_from">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="PeekSubject" cname="e_mail_remote_glue_messageinfo_peek_subject">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="PeekTo" cname="e_mail_remote_glue_messageinfo_peek_to">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="PeekUid" cname="e_mail_remote_glue_messageinfo_peek_uid">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="PeekUserFlags" cname="e_mail_remote_glue_messageinfo_peek_user_flags">
-+ <return-type type="GSList*" />
-+ </method>
-+ <method name="PeekUserTags" cname="e_mail_remote_glue_messageinfo_peek_user_tags">
-+ <return-type type="GSList*" />
-+ </method>
-+ </object>
-+ <object name="MailRemoteGlueSessionChange" cname="EMailRemoteGlueSessionChange" parent="GObject">
-+ <field name="StoreInfos" cname="store_infos" type="GSList*" />
-+ <method name="GetStoreInfoList" cname="e_mail_remote_glue_sessionchange_get_store_info_list">
-+ <return-type type="GSList*" />
-+ </method>
-+ <constructor cname="e_mail_remote_glue_sessionchange_new" />
-+ <constructor cname="e_mail_remote_glue_sessionchange_new_clone">
-+ <parameters>
-+ <parameter type="EMailRemoteGlueSessionChange*" name="sess_change" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_mail_remote_glue_sessionchange_new_from_EMSessionChange">
-+ <parameters>
-+ <parameter type="Evolution_Mail_SessionChange" name="sess_change" />
-+ </parameters>
-+ </constructor>
-+ </object>
-+ <object name="MailRemoteGlueStoreChange" cname="EMailRemoteGlueStoreChange" parent="GObject">
-+ <field name="FolderInfos" cname="folder_infos" type="GSList*" />
-+ <method name="GetFolderInfoList" cname="e_mail_remote_glue_storechange_get_folder_info_list">
-+ <return-type type="GSList*" />
-+ </method>
-+ <constructor cname="e_mail_remote_glue_storechange_new" />
-+ <constructor cname="e_mail_remote_glue_storechange_new_clone">
-+ <parameters>
-+ <parameter type="EMailRemoteGlueStoreChange*" name="schange" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_mail_remote_glue_storechange_new_from_EMStoreChange">
-+ <parameters>
-+ <parameter type="Evolution_Mail_StoreChange" name="schange" />
-+ </parameters>
-+ </constructor>
-+ </object>
-+ <object name="MailRemoteGlueStoreInfo" cname="EMailRemoteGlueStoreInfo" parent="GObject">
-+ <field name="Priv" cname="priv" type="EMailRemoteGlueStoreInfoPrivate*" />
-+ <method name="GetFolders" cname="e_mail_remote_glue_storeinfo_get_folders">
-+ <return-type type="GSList*" />
-+ </method>
-+ <constructor cname="e_mail_remote_glue_storeinfo_new" />
-+ <constructor cname="e_mail_remote_glue_storeinfo_new_clone">
-+ <parameters>
-+ <parameter type="EMailRemoteGlueStoreInfo*" name="info" />
-+ </parameters>
-+ </constructor>
-+ <constructor cname="e_mail_remote_glue_storeinfo_new_from_EMStoreInfo">
-+ <parameters>
-+ <parameter type="Evolution_Mail_StoreInfo" name="info" />
-+ </parameters>
-+ </constructor>
-+ <method name="Peek_EMStore" cname="e_mail_remote_glue_storeinfo_peek_EMStore">
-+ <return-type type="Evolution_Mail_Store" />
-+ </method>
-+ <method name="PeekName" cname="e_mail_remote_glue_storeinfo_peek_name">
-+ <return-type type="char*" />
-+ </method>
-+ <method name="PeekUid" cname="e_mail_remote_glue_storeinfo_peek_uid">
-+ <return-type type="char*" />
-+ </method>
-+ </object>
-+ <struct name="MUserTag" cname="EMUserTag">
-+ <field name="Name" cname="name" type="char*" />
-+ <field name="Value" cname="value" type="char*" />
-+ </struct>
-+ </namespace>
-+</api>
-\ No newline at end of file
Deleted: evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch
===================================================================
--- evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch 2006-05-03 20:44:24 UTC (rev 2534)
+++ evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch 2006-05-03 22:01:50 UTC (rev 2535)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-glibsharpglue-dllimport.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad evolution-sharp-0.10.2~/evolution/src/GLibUtil.cs evolution-sharp-0.10.2/evolution/src/GLibUtil.cs
---- evolution-sharp-0.10.2~/evolution/src/GLibUtil.cs 2005-09-12 22:49:54.000000000 +0200
-+++ evolution-sharp-0.10.2/evolution/src/GLibUtil.cs 2006-04-23 18:26:01.000000000 +0200
-@@ -13,10 +13,10 @@
- [DllImport("libglib-2.0.so.0")]
- public static extern int g_slist_length (IntPtr slist);
-
-- [DllImport("glibsharpglue")]
-+ [DllImport("glibsharpglue-2")]
- public static extern IntPtr gtksharp_slist_get_data (IntPtr slist);
-
-- [DllImport("glibsharpglue")]
-+ [DllImport("glibsharpglue-2")]
- public static extern IntPtr gtksharp_slist_get_next (IntPtr slist);
-
- [DllImport("libglib-2.0.so.0")]
More information about the Pkg-mono-svn-commits
mailing list