r12706 - in /desktop/unstable/control-center/debian: changelog gnome-control-center.install patches/27_nobashizms.patch patches/70_relibtoolize.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Sep 22 09:40:31 UTC 2007
Author: slomo
Date: Sat Sep 22 09:40:31 2007
New Revision: 12706
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12706
Log:
* New upstream release:
+ debian/patches/27_nobashizms.patch:
- Dropped, merged upstream.
+ 70_relibtoolize.patch:
- Updated for the new version.
* Upload to unstable, drop check-dist include.
Removed:
desktop/unstable/control-center/debian/patches/27_nobashizms.patch
Modified:
desktop/unstable/control-center/debian/changelog
desktop/unstable/control-center/debian/gnome-control-center.install
desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
desktop/unstable/control-center/debian/rules
Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=12706&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog (original)
+++ desktop/unstable/control-center/debian/changelog Sat Sep 22 09:40:31 2007
@@ -1,10 +1,19 @@
-control-center (1:2.19.6-2) UNRELEASED; urgency=low
-
+control-center (1:2.20.0-1) unstable; urgency=low
+
+ [ Loic Minier ]
* Bump up gnome-icon-theme dep to >= 2.16 for applications-internet etc.
* Bump up libpango1.0-dev b-dep to >= 1.17 to help experimental's sbuild to
install libgtk2.0-dev >= 2.11.
- -- Loic Minier <lool at dooz.org> Sat, 04 Aug 2007 16:08:46 +0200
+ [ Sebastian Dröge ]
+ * New upstream release:
+ + debian/patches/27_nobashizms.patch:
+ - Dropped, merged upstream.
+ + 70_relibtoolize.patch:
+ - Updated for the new version.
+ * Upload to unstable, drop check-dist include.
+
+ -- Sebastian Dröge <slomo at debian.org> Sat, 22 Sep 2007 11:06:14 +0200
control-center (1:2.19.6-1) experimental; urgency=low
Modified: desktop/unstable/control-center/debian/gnome-control-center.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/gnome-control-center.install?rev=12706&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/gnome-control-center.install (original)
+++ desktop/unstable/control-center/debian/gnome-control-center.install Sat Sep 22 09:40:31 2007
@@ -2,5 +2,5 @@
debian/control-center2.xpm usr/share/pixmaps
debian/tmp/usr/bin
debian/tmp/usr/lib/gnome-vfs-2.0/modules/*.so
-debian/tmp/usr/lib/control-center/gnome-settings-daemon
+debian/tmp/usr/lib/gnome-control-center/gnome-settings-daemon
debian/tmp/usr/lib/nautilus/extensions-1.0/*.so
Modified: desktop/unstable/control-center/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/70_relibtoolize.patch?rev=12706&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/70_relibtoolize.patch (original)
+++ desktop/unstable/control-center/debian/patches/70_relibtoolize.patch Sat Sep 22 09:40:31 2007
@@ -1,15 +1,7 @@
-Typical autotools patch:
-
-libtoolize --force --copy
-aclocal-1.10 -I m4
-autoconf
-automake-1.10
-rm -rf autom4te.cache
-
-diff -Nur control-center-2.19.6/aclocal.m4 control-center-2.19.6.new/aclocal.m4
---- control-center-2.19.6/aclocal.m4 2007-07-30 23:12:35.000000000 +0200
-+++ control-center-2.19.6.new/aclocal.m4 2007-08-03 10:25:05.000000000 +0200
-@@ -11,6031 +11,5218 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/aclocal.m4 control-center-2.20.0/aclocal.m4
+--- control-center-2.20.0.old/aclocal.m4 2007-09-17 16:56:31.000000000 +0200
++++ control-center-2.20.0/aclocal.m4 2007-09-22 11:38:11.000000000 +0200
+@@ -11,4705 +11,4432 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -921,30 +913,42 @@
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
+ if test x$enable_debug = xyes ; then
+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+ [Enable additional debugging at the expense of performance and size])
+ fi
])
-
++
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
+dnl define DISABLE_DEPRECATED
+dnl
+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+[
+ AC_REQUIRE([AM_MAINTAINER_MODE])
-
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
++
+ if test $USE_MAINTAINER_MODE = yes; then
+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
+ else
+ DISABLE_DEPRECATED=""
+ fi
+ AC_SUBST(DISABLE_DEPRECATED)
-+])
+ ])
+
++dnl GNOME_COMPILE_WARNINGS
++dnl Turn on many useful compiler warnings
++dnl For now, only works on GCC
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++ dnl ******************************
++ dnl More compiler warnings
++ dnl ******************************
+
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
++ AC_ARG_ENABLE(compile-warnings,
++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Turn on compiler warnings]),,
++ [enable_compile_warnings="m4_default([$1],[yes])"])
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
@@ -961,23 +965,18 @@
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+dnl GNOME_COMPILE_WARNINGS
-+dnl Turn on many useful compiler warnings
-+dnl For now, only works on GCC
-+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-+ dnl ******************************
-+ dnl More compiler warnings
-+ dnl ******************************
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ AC_ARG_ENABLE(compile-warnings,
-+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-+ [Turn on compiler warnings]),,
-+ [enable_compile_warnings="m4_default([$1],[yes])"])
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
-# AM_PROG_INSTALL_SH
-# ------------------
@@ -986,20 +985,6 @@
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-+ warnCFLAGS=
-+ if test "x$GCC" != xyes; then
-+ enable_compile_warnings=no
-+ fi
-
--# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ warning_flags=
-+ realsave_CFLAGS="$CFLAGS"
-
--# serial 2
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
@@ -1041,25 +1026,17 @@
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
--# Check whether the underlying file-system supports filenames
--# with a leading dot. For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
-- am__leading_dot=.
--else
-- am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
+-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ AC_ARG_ENABLE(iso-c,
+ AC_HELP_STRING([--enable-iso-c],
+ [Try to warn if code is not ISO C ]),,
+ [enable_iso_c=no])
--# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
--# From Jim Meyering
+-# serial 2
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
@@ -1076,18 +1053,50 @@
+ fi
+ AC_MSG_RESULT($complCFLAGS)
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++ AC_SUBST(WARN_CFLAGS)
++])
+
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
++dnl For C++, do basically the same thing.
+
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+ AC_SUBST(WARN_CFLAGS)
-+])
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++ AC_ARG_ENABLE(cxx-warnings,
++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++ [Turn on compiler warnings.]),,
++ [enable_cxx_warnings="m4_default([$1],[minimum])"])
-# serial 4
-+dnl For C++, do basically the same thing.
++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++ warnCXXFLAGS=
++ if test "x$GXX" != xyes; then
++ enable_cxx_warnings=no
++ fi
++ if test "x$enable_cxx_warnings" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
++ esac
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@@ -1103,25 +1112,9 @@
- AC_SUBST(MAINT)dnl
-]
-)
-+AC_DEFUN([GNOME_CXX_WARNINGS],[
-+ AC_ARG_ENABLE(cxx-warnings,
-+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-+ [Turn on compiler warnings.]),,
-+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
+-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-+ warnCXXFLAGS=
-+ if test "x$GXX" != xyes; then
-+ enable_cxx_warnings=no
-+ fi
-+ if test "x$enable_cxx_warnings" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-Wall[\ \ ]*) ;;
-+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-+ esac
-
+-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
+ ## -W is not all that useful. And it cannot be controlled
+ ## with individual -Wno-xxx flags, unlike -Wall
@@ -1254,7 +1247,7 @@
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
-# AM_MISSING_HAS_RUN
@@ -2080,7 +2073,7 @@
- AC_CHECK_FUNCS(dcgettext)
- MSGFMT_OPTS=
- AC_MSG_CHECKING([if msgfmt accepts -c])
-- GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
+- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
@@ -2156,7 +2149,6 @@
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
-- fi
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
@@ -2167,9 +2159,7 @@
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
-
-- # We need to process the po/ directory.
-- POSUB=po
++
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
@@ -2179,14 +2169,12 @@
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ echo="$dir/echo"
+ break
-+ fi
+ fi
+ done
+ IFS="$lt_save_ifs"
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
+- # We need to process the po/ directory.
+- POSUB=po
+ if test "X$echo" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -2228,6 +2216,11 @@
+ # maybe with a smaller string...
+ prev=:
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
+-
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
@@ -2779,6 +2772,15 @@
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
- esac
+-
+- ## -W is not all that useful. And it cannot be controlled
+- ## with individual -Wno-xxx flags, unlike -Wall
+- if test "x$enable_cxx_warnings" = "xyes"; then
+- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+- fi
+- fi
+- fi
+- AC_MSG_RESULT($warnCXXFLAGS)
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
@@ -2788,14 +2790,10 @@
+ i=0
+ teststring="ABCD"
-- ## -W is not all that useful. And it cannot be controlled
-- ## with individual -Wno-xxx flags, unlike -Wall
-- if test "x$enable_cxx_warnings" = "xyes"; then
-- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-- fi
-- fi
-- fi
-- AC_MSG_RESULT($warnCXXFLAGS)
+- AC_ARG_ENABLE(iso-cxx,
+- AC_HELP_STRING([--enable-iso-cxx],
+- [Try to warn if code is not ISO C++ ]),,
+- [enable_iso_cxx=no])
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -2805,17 +2803,6 @@
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
-- AC_ARG_ENABLE(iso-cxx,
-- AC_HELP_STRING([--enable-iso-cxx],
-- [Try to warn if code is not ISO C++ ]),,
-- [enable_iso_cxx=no])
-+ gnu*)
-+ # Under GNU Hurd, this test is not required because there is
-+ # no limit to the length of command line arguments.
-+ # Libtool will interpret -1 as no limit whatsoever
-+ lt_cv_sys_max_cmd_len=-1;
-+ ;;
-
- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
- complCXXFLAGS=
- if test "x$enable_iso_cxx" != "xno"; then
@@ -2824,6 +2811,20 @@
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
- esac
++ gnu*)
++ # Under GNU Hurd, this test is not required because there is
++ # no limit to the length of command line arguments.
++ # Libtool will interpret -1 as no limit whatsoever
++ lt_cv_sys_max_cmd_len=-1;
++ ;;
+
+- case " $CXXFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+- esac
+- fi
+- fi
+- AC_MSG_RESULT($complCXXFLAGS)
+ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
@@ -2835,22 +2836,16 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-- case " $CXXFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-- esac
-- fi
-- fi
-- AC_MSG_RESULT($complCXXFLAGS)
+- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+- AC_SUBST(WARN_CXXFLAGS)
+-])
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-- AC_SUBST(WARN_CXXFLAGS)
--])
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
@@ -2865,13 +2860,12 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-# serial 48 AC_PROG_LIBTOOL
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
--# serial 48 AC_PROG_LIBTOOL
+ 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
@@ -2928,7 +2922,6 @@
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
@@ -2937,12 +2930,12 @@
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
-
-# AC_PROG_LIBTOOL
-# ---------------
@@ -2959,19 +2952,6 @@
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ---------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+ [$4]
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
@@ -2990,11 +2970,23 @@
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ---------------------------------------------------------------------
++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++ [$4]
++else
++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++ lt_status=$lt_dlunknown
++ cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
-
-+#include <stdio.h>
-# _AC_PROG_LIBTOOL
-# ----------------
@@ -3003,6 +2995,10 @@
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++#include <stdio.h>
+
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
@@ -3013,8 +3009,9 @@
+# endif
+#endif
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+/* 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
@@ -3037,30 +3034,18 @@
+# endif
+#endif
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
-
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+ else
-+ puts (dlerror ());
-# AC_LIBTOOL_SETUP
-# ----------------
@@ -3089,7 +3074,15 @@
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
--
++ if (self)
++ {
++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ /* dlclose (self); */
++ }
++ else
++ puts (dlerror ());
+
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
@@ -3255,21 +3248,19 @@
fi
- ;;
-esac
-
+-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
+
+-AC_ARG_ENABLE([libtool-lock],
+- [AC_HELP_STRING([--disable-libtool-lock],
+- [avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS="$CPPFLAGS"
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
--AC_ARG_ENABLE([libtool-lock],
-- [AC_HELP_STRING([--disable-libtool-lock],
-- [avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+ save_LDFLAGS="$LDFLAGS"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
@@ -3277,14 +3268,17 @@
- [pic_mode="$withval"],
- [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
++ save_LDFLAGS="$LDFLAGS"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
++ save_LIBS="$LIBS"
++ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ AC_CACHE_CHECK([whether a program can dlopen itself],
+ lt_cv_dlopen_self, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
@@ -3292,6 +3286,10 @@
+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+ ])
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
@@ -3302,25 +3300,24 @@
+ ])
+ fi
--# _LT_AC_SYS_COMPILER
--# -------------------
--AC_DEFUN([_LT_AC_SYS_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])dnl
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+ ;;
+ esac
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
@@ -3328,10 +3325,35 @@
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
--# Allow CC to be a program name with arguments.
--compiler=$CC
--])# _LT_AC_SYS_COMPILER
-
+
+-# _LT_CC_BASENAME(CC)
+-# -------------------
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-AC_DEFUN([_LT_CC_BASENAME],
+-[for cc_temp in $1""; 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-%%"`
+-])
+-
+-
+-# _LT_COMPILER_BOILERPLATE
+-# ------------------------
+-# Check for compiler boilerplate output or warnings with
+-# the simple compiler test code.
+-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[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*
+-])# _LT_COMPILER_BOILERPLATE
+-
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
@@ -3347,19 +3369,17 @@
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--# _LT_CC_BASENAME(CC)
--# -------------------
--# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
--AC_DEFUN([_LT_CC_BASENAME],
--[for cc_temp in $1""; 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-%%"`
+-# _LT_LINKER_BOILERPLATE
+-# ----------------------
+-# Check for linker boilerplate output or warnings with
+-# the simple link test code.
+-AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[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*
+-])# _LT_LINKER_BOILERPLATE
+ 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.
@@ -3393,36 +3413,10 @@
+ cd ..
+ rmdir conftest
+ $rm conftest*
- ])
++])
+])# AC_LIBTOOL_PROG_CC_C_O
--# _LT_COMPILER_BOILERPLATE
--# ------------------------
--# Check for compiler boilerplate output or warnings with
--# the simple compiler test code.
--AC_DEFUN([_LT_COMPILER_BOILERPLATE],
--[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*
--])# _LT_COMPILER_BOILERPLATE
--
--
--# _LT_LINKER_BOILERPLATE
--# ----------------------
--# Check for linker boilerplate output or warnings with
--# the simple link test code.
--AC_DEFUN([_LT_LINKER_BOILERPLATE],
--[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*
--])# _LT_LINKER_BOILERPLATE
--
--
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
@@ -3878,22 +3872,6 @@
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
-- ;;
-- *ELF-64*)
-- HPUX_IA64_MODE="64"
-- ;;
-- esac
-- fi
-- rm -rf conftest*
-- ;;
--*-*-irix6*)
-- # Find out which ABI we are using.
-- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-- if AC_TRY_EVAL(ac_compile); then
-- if test "$lt_cv_prog_gnu_ld" = yes; then
-- case `/usr/bin/file conftest.$ac_objext` in
-- *32-bit*)
-- LD="${LD-ld} -melf32bsmip"
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
@@ -3915,8 +3893,8 @@
+ 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"
;;
-- *N32*)
-- LD="${LD-ld} -melf32bmipn32"
+- *ELF-64*)
+- HPUX_IA64_MODE="64"
+ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -3932,14 +3910,40 @@
+ else
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
- ;;
-- *64-bit*)
-- LD="${LD-ld} -melf64bmip"
++ ;;
+ 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
+- fi
+- rm -rf conftest*
++ ;;
++
++ *)
++ 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
+ ;;
+-*-*-irix6*)
+- # Find out which ABI we are using.
+- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *32-bit*)
+- LD="${LD-ld} -melf32bsmip"
+- ;;
+- *N32*)
+- LD="${LD-ld} -melf32bmipn32"
+- ;;
+- *64-bit*)
+- LD="${LD-ld} -melf64bmip"
+- ;;
+- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
@@ -3955,15 +3959,20 @@
- fi
- fi
- rm -rf conftest*
-+ ;;
+
-+ *)
-+ 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`'
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
@@ -4006,19 +4015,13 @@
- esac
- fi
- rm -rf conftest*
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
++dgux*)
++ version_type=linux
+ 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`'
-+ m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ 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
;;
-*-*-sco3.2v5*)
@@ -4033,13 +4036,8 @@
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
-+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
;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
@@ -4052,10 +4050,6 @@
- *) LD="${LD-ld} -64" ;;
- esac
- ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
@@ -4118,9 +4112,9 @@
;;
- ])
-esac
-
+-
-need_locks="$enable_libtool_lock"
--
+
-])# _LT_AC_LOCK
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
@@ -4776,11 +4770,7 @@
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+ then
-+ AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+ fi
-
+-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
@@ -4800,7 +4790,11 @@
- lt_cv_dlopen_self=yes
- ])
- ;;
--
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++ then
++ AC_MSG_ERROR([tag name \"$tagname\" already exists])
++ fi
+
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
@@ -5058,12 +5052,12 @@
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
--
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
@@ -5074,26 +5068,6 @@
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-- # We can hardcode non-existant directories.
-- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != 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, $1)" != no &&
-- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-- # Linking always hardcodes the temporary library directory.
-- _LT_AC_TAGVAR(hardcode_action, $1)=relink
-- else
-- # We can link without hardcoding, and we can hardcode nonexisting dirs.
-- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-- fi
--else
-- # We cannot hardcode anything, or else we can only hardcode existing
-- # directories.
-- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
--fi
--AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
@@ -5123,6 +5097,26 @@
+ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+- # We can hardcode non-existant directories.
+- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != 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, $1)" != no &&
+- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+- # Linking always hardcodes the temporary library directory.
+- _LT_AC_TAGVAR(hardcode_action, $1)=relink
+- else
+- # We can link without hardcoding, and we can hardcode nonexisting dirs.
+- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+- fi
+-else
+- # We cannot hardcode anything, or else we can only hardcode existing
+- # directories.
+- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+-fi
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
@@ -5132,7 +5126,6 @@
- enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
@@ -5140,6 +5133,7 @@
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
@@ -5168,7 +5162,6 @@
- esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
@@ -5197,6 +5190,7 @@
+ esac],
+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
@@ -5232,10 +5226,6 @@
-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
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
@@ -5244,15 +5234,15 @@
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+-# 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'
-- ;;
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
@@ -5261,6 +5251,10 @@
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+- # 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
@@ -5305,12 +5299,6 @@
- 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'
-- ;;
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
@@ -5325,24 +5313,16 @@
+ AC_SUBST([EGREP])
+])])
+-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
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
@@ -5377,12 +5357,52 @@
+ else
+ cat <<EOF 1>&2
+-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
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such. This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem. Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
++
++EOF
++ fi ;;
++ esac
++ fi
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++ AC_MSG_RESULT($MAGIC_CMD)
++else
++ AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
+
-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'
@@ -5397,14 +5417,19 @@
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognize a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++ if test -n "$ac_tool_prefix"; then
++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++ else
++ MAGIC_CMD=:
++ fi
++fi
++])# AC_PATH_MAGIC
- case $host_os in
- cygwin*)
@@ -5426,118 +5451,12 @@
- 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"`
-+EOF
-+ fi ;;
-+ esac
- fi
+- 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
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ AC_MSG_RESULT($MAGIC_CMD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+])# AC_PATH_TOOL_PREFIX
-
--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"`
+
-+# AC_PATH_MAGIC
-+# -------------
-+# find a file program which can recognize a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+ if test -n "$ac_tool_prefix"; then
-+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+ MAGIC_CMD=:
- 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
-- ;;
-+fi
-+])# AC_PATH_MAGIC
-
--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.
-- 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
-- ;;
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
@@ -5561,20 +5480,7 @@
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- 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
++ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]]* | ?:[[\\/]]*)
@@ -5585,50 +5491,23 @@
+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
-+ ;;
+ ;;
+- esac
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
;;
-- freebsd*) # from 4.6 on
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-+ *)
+-
+ *)
+- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
;;
esac
+- dynamic_linker='Win32 ld.exe'
+- # FIXME: first we should search . and the directory the executable is in
+- shlibpath_var=PATH
- ;;
--
--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"
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
@@ -5653,9 +5532,256 @@
+ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
++else
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++ AC_MSG_RESULT($LD)
++else
++ AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
+
+-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
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# 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
+ ;;
+-
+-freebsd1*)
+- dynamic_linker=no
++*)
++ lt_cv_prog_gnu_ld=no
+ ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
+
+-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'
++
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++# -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++ lt_cv_ld_reload_flag,
++ [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
++
++
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++# -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-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`
++beos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++bsdi[[45]]*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++ lt_cv_file_magic_cmd='/usr/bin/file -L'
++ lt_cv_file_magic_test_file=/shlib/libc.so
++ ;;
++
++cygwin*)
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ ;;
++
++mingw* | pw32*)
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+- case $host_os in
+- freebsd[[123]]*) objformat=aout ;;
+- *) objformat=elf ;;
+- esac
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ 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
++ ;;
++
++darwin* | rhapsody*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++freebsd* | dragonfly*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++ case $host_cpu in
++ i*86 )
++ # Not sure whether the presence of OpenBSD here was a mistake.
++ # Let's accept both of them until this is cleared up.
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+- 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
++ esac
++ else
++ lt_cv_deplibs_check_method=pass_all
++ fi
+ ;;
+
+ 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
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-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
++hpux10.20* | hpux11*)
++ lt_cv_file_magic_cmd=/usr/bin/file
+ 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
-- ;;
++ 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
+ ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
@@ -5674,25 +5800,18 @@
- 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
++ hppa*64*)
++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++ ;;
++ *)
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
-- ;;
-+ done
-+ IFS="$lt_save_ifs"
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])# AC_PROG_LD
+ ;;
-interix3*)
- version_type=linux
@@ -5704,9 +5823,12 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-- ;;
-
--irix5* | irix6* | nonstopux*)
++interix[[3-9]]*)
++ # 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 $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
@@ -5735,32 +5857,27 @@
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
-- esac
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
+ 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
-+# AC_PROG_LD_GNU
-+# --------------
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# 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
++ lt_cv_deplibs_check_method=pass_all
;;
--
+
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
-+*)
-+ lt_cv_prog_gnu_ld=no
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ lt_cv_deplibs_check_method=pass_all
;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# AC_PROG_LD_GNU
-# This must be Linux ELF.
-linux*)
@@ -5776,7 +5893,7 @@
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
+-
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
@@ -5789,39 +5906,17 @@
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
-+# AC_PROG_LD_RELOAD_FLAG
-+# ----------------------
-+# find reload flag for linker
-+# -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+ lt_cv_ld_reload_flag,
-+ [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ darwin*)
-+ if test "$GCC" = yes; then
-+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+ else
-+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
+- fi
- rm -rf conftest*
- ;;
+- ;;
- esac
-+esac
-+])# AC_PROG_LD_RELOAD_FLAG
-
+-
- # 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${libsuff} /usr/lib${libsuff} $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,
@@ -5829,32 +5924,8 @@
- # 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'
-+# AC_DEPLIBS_CHECK_METHOD
-+# -----------------------
-+# how to check for library dependencies
-+# -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognize dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
+- ;;
+-
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
@@ -5865,10 +5936,8 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
-+beos*)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
+- ;;
+-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
@@ -5877,31 +5946,14 @@
- 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'
-+bsdi[[45]]*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+ lt_cv_file_magic_cmd='/usr/bin/file -L'
-+ lt_cv_file_magic_test_file=/shlib/libc.so
-+ ;;
-+
-+cygwin*)
-+ # func_win32_libid is a shell function defined in ltmain.sh
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ ;;
-+
-+mingw* | pw32*)
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
++netbsd* | netbsdelf*-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
- 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'
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
@@ -5913,11 +5965,13 @@
- 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
-+darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
++newos6*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
--nto-qnx*)
+ nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
@@ -5925,23 +5979,10 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
-+freebsd* | dragonfly*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+ # Not sure whether the presence of OpenBSD here was a mistake.
-+ # Let's accept both of them until this is cleared up.
-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+ ;;
-+ esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
-+ fi
++ lt_cv_deplibs_check_method=unknown
;;
--openbsd*)
+ openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
@@ -5949,30 +5990,11 @@
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
-+gnu*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+hpux10.20* | hpux11*)
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ 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
-+ ;;
-+ hppa*64*)
-+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+ ;;
-+ *)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+ ;;
- esac
+- 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
+ 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
@@ -5981,9 +6003,11 @@
- shlibpath_overrides_runpath=yes
- ;;
- esac
-- else
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
- shlibpath_overrides_runpath=yes
-- fi
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
;;
-os2*)
@@ -5993,12 +6017,9 @@
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
-+interix[[3-9]]*)
-+ # 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)$'
- ;;
-
--osf3* | osf4* | osf5*)
+- ;;
+-
+ osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
@@ -6007,13 +6028,6 @@
- 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"
-+irix5* | irix6* | nonstopux*)
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
-+ esac
+ lt_cv_deplibs_check_method=pass_all
;;
@@ -6028,8 +6042,7 @@
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
++rdos*)
+ lt_cv_deplibs_check_method=pass_all
;;
@@ -6041,21 +6054,18 @@
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
-+netbsd* | netbsdelf*-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
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
- fi
+- fi
- need_version=yes
++solaris*)
++ lt_cv_deplibs_check_method=pass_all
;;
--sysv4 | sysv4.3*)
+ 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
+ case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
@@ -6071,80 +6081,6 @@
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
-- esac
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
--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
-+nto-qnx*)
-+ lt_cv_deplibs_check_method=unknown
- ;;
-
--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
-+openbsd*)
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
- 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
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- 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}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
--*)
-- dynamic_linker=no
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
--esac
--AC_MSG_RESULT([$dynamic_linker])
--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
--])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
-+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]]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
@@ -6167,9 +6103,63 @@
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-+ esac
-+ ;;
-
+ 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
+- 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}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-*)
+- dynamic_linker=no
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+-AC_MSG_RESULT([$dynamic_linker])
+-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
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-
+-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -6177,10 +6167,6 @@
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
@@ -7191,6 +7177,10 @@
- hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+- ;;
+- *)
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+- lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
@@ -7213,10 +7203,23 @@
+ fi
+ fi
;;
-- *)
-- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-- lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+
+- 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;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -7226,13 +7229,11 @@
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
- ;;
-- 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)$'
++ ;;
+
+-# This must be Linux ELF.
+-linux*)
+- lt_cv_deplibs_check_method=pass_all
- ;;
+ chorus*)
+ case $cc_basename in
@@ -7243,14 +7244,12 @@
+ esac
+ ;;
--irix5* | irix6* | nonstopux*)
-- case $LD in
-- *-32|*"-32 ") libmagic=32-bit;;
-- *-n32|*"-n32 ") libmagic=N32;;
-- *-64|*"-64 ") libmagic=64-bit;;
-- *) libmagic=never-match;;
-- esac
-- lt_cv_deplibs_check_method=pass_all
+-netbsd*)
+- 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
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+- fi
- ;;
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
@@ -7260,9 +7259,10 @@
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--# This must be Linux ELF.
--linux*)
-- lt_cv_deplibs_check_method=pass_all
+-newos6*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
@@ -7305,20 +7305,6 @@
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--netbsd*)
-- 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
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-- fi
-- ;;
--
--newos6*)
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=/usr/lib/libnls.so
-- ;;
--
-nto-qnx*)
- lt_cv_deplibs_check_method=unknown
- ;;
@@ -7678,6 +7664,14 @@
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
+-
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
+-
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -7730,12 +7724,12 @@
+ # SGI C++
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--# _LT_AC_LANG_F77
--# ---------------
--AC_DEFUN([_LT_AC_LANG_F77],
--[AC_REQUIRE([AC_PROG_F77])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
--])# _LT_AC_LANG_F77
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -7776,12 +7770,17 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--# AC_LIBTOOL_GCJ
--# --------------
--# enable support for GCJ libraries
--AC_DEFUN([AC_LIBTOOL_GCJ],
--[AC_REQUIRE([_LT_AC_LANG_GCJ])
--])# AC_LIBTOOL_GCJ
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -7819,17 +7818,13 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--# _LT_AC_LANG_GCJ
--# ---------------
--AC_DEFUN([_LT_AC_LANG_GCJ],
--[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
--])# _LT_AC_LANG_GCJ
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
@@ -7843,15 +7838,6 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# AC_LIBTOOL_RC
--# -------------
--# enable support for Windows resource files
--AC_DEFUN([AC_LIBTOOL_RC],
--[AC_REQUIRE([LT_AC_PROG_RC])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
--])# AC_LIBTOOL_RC
--
--
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
@@ -8052,27 +8038,28 @@
;;
-esac
-AC_MSG_RESULT([$enable_shared])
+-
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+ osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
+-AC_LIBTOOL_CONFIG($1)
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--AC_LIBTOOL_CONFIG($1)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Archives containing C++ object files must be created using
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
@@ -8090,9 +8077,6 @@
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ $rm $lib.exp'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
@@ -8103,20 +8087,8 @@
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+ # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -8137,8 +8109,20 @@
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++ # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ ;;
++ *)
++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
@@ -8146,20 +8130,77 @@
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
--
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
-# Source file extension for C++ test sources.
-ac_ext=cpp
--
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
-# Code to be used in simple compile tests
-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'
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+-
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+-
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
+- $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
+- $as_unset lt_cv_path_LD
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-else
+- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-fi
+-
+-if test "$GXX" = yes; then
+- # Set up default GNU C++ configuration
+-
+- AC_PROG_LD
+-
+- # Check if GNU C++ uses GNU ld as the underlying linker, since the
+- # archiving commands below assume that GNU ld is being used.
+- if test "$with_gnu_ld" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8199,8 +8240,10 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+- # If archive_cmds runs LD, not CC, wlarc should be empty
+- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+- # investigate it a little bit more. (MM)
+- wlarc='${wl}'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
@@ -8214,13 +8257,25 @@
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+- grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
+- else
+- with_gnu_ld=no
+- wlarc=
+ output_verbose_link_cmd='echo'
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+- # A generic and very simple default shared library creation
+- # command for GNU C++ for the case where it uses the native
+- # linker, instead of GNU ld. If possible, this setting should
+- # overridden to take advantage of the native linker features on
+- # the platform it is being used on.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- fi
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -8231,28 +8286,10 @@
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--# Allow CC to be a program name with arguments.
--lt_save_CC=$CC
--lt_save_LD=$LD
--lt_save_GCC=$GCC
--GCC=$GXX
--lt_save_with_gnu_ld=$with_gnu_ld
--lt_save_path_LD=$lt_cv_path_LD
--if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
--else
-- $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
-- $as_unset lt_cv_path_LD
--fi
--test -z "${LDCXX+set}" || LD=$LDCXX
--CC=${CXX-"c++"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ # The C++ compiler must be used to create the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
@@ -8265,12 +8302,10 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--# We don't want -fno-exception wen compiling C++ code, so set the
--# no_builtin_flag separately
--if test "$GXX" = yes; then
-- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+- GXX=no
+- with_gnu_ld=no
+- wlarc=
-fi
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
@@ -8283,24 +8318,59 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--if test "$GXX" = yes; then
-- # Set up default GNU C++ configuration
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+- aix3*)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=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
+- aix_use_runtimelinking=no
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ fi
-- AC_PROG_LD
+- # 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
+- case $ld_flag in
+- *-brtl*)
+- aix_use_runtimelinking=yes
+- break
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
+ ;;
+ esac
+- done
+ fi
-+ ;;
+ ;;
+- esac
+-
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+-
+- # 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.
+ esac
+ ;;
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
@@ -8309,11 +8379,8 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
-- # Check if GNU C++ uses GNU ld as the underlying linker, since the
-- # archiving commands below assume that GNU ld is being used.
-- if test "$with_gnu_ld" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- _LT_AC_TAGVAR(archive_cmds, $1)=''
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -8346,346 +8413,10 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
-
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ case $cc_basename in
-+ CC*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ ;;
-+ tandem*)
-+ case $cc_basename in
-+ NCC*)
-+ # NonStop-UX NCC 3.20
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+ vxworks*)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+esac
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-- # If archive_cmds runs LD, not CC, wlarc should be empty
-- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-- # investigate it a little bit more. (MM)
-- wlarc='${wl}'
-+_LT_AC_TAGVAR(GCC, $1)="$GXX"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-
-- # ancient GNU ld didn't support --whole-archive et. al.
-- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-- grep 'no-whole-archive' > /dev/null; then
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-- else
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-- fi
-- else
-- with_gnu_ld=no
-- wlarc=
-+AC_LIBTOOL_POSTDEP_PREDEP($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-- # A generic and very simple default shared library creation
-- # command for GNU C++ for the case where it uses the native
-- # linker, instead of GNU ld. If possible, this setting should
-- # overridden to take advantage of the native linker features on
-- # the platform it is being used on.
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- fi
-+AC_LIBTOOL_CONFIG($1)
-
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+AC_LANG_POP
-+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
-+])# AC_LIBTOOL_LANG_CXX_CONFIG
-+
-+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-+# ------------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library. It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-+int a;
-+void foo (void) { a = 0; }
-+EOF
-+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-+class Foo
-+{
-+public:
-+ Foo (void) { a = 0; }
-+private:
-+ int a;
-+};
-+EOF
-+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-+ subroutine foo
-+ implicit none
-+ integer*4 a
-+ a=0
-+ return
-+ end
-+EOF
-+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-+public class foo {
-+ private int a;
-+ public void bar (void) {
-+ a = 0;
-+ }
-+};
-+EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+ # Parse the compiler output and extract the necessary
-+ # objects, libraries and library flags.
-+
-+ # Sentinel used to keep track of whether or not we are before
-+ # the conftest object file.
-+ pre_test_object_deps_done=no
-+
-+ # 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"`
-+
-+ for p in `eval $output_verbose_link_cmd`; do
-+ case $p in
-+
-+ -L* | -R* | -l*)
-+ # Some compilers place space between "-{L,R}" and the path.
-+ # Remove the space.
-+ if test $p = "-L" \
-+ || test $p = "-R"; then
-+ prev=$p
-+ continue
-+ else
-+ prev=
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ case $p in
-+ -L* | -R*)
-+ # Internal compiler library paths should come after those
-+ # provided the user. The postdeps already come after the
-+ # user supplied libs so there is no need to process them.
-+ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+ else
-+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+ fi
-+ ;;
-+ # The "-l" case would never come before the object being
-+ # linked, so don't bother handling this case.
-+ esac
-+ else
-+ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-+ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-+ else
-+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-+ fi
-+ fi
-+ ;;
-+
-+ *.$objext)
-+ # This assumes that the test object file only shows up
-+ # once in the compiler output.
-+ if test "$p" = "conftest.$objext"; then
-+ pre_test_object_deps_done=yes
-+ continue
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-+ _LT_AC_TAGVAR(predep_objects, $1)="$p"
-+ else
-+ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-+ fi
-+ else
-+ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-+ _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-+ else
-+ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-+ fi
-+ fi
-+ ;;
-+
-+ *) ;; # Ignore the rest.
-
-+ esac
-+ done
-+
-+ # Clean up.
-+ rm -f a.out a.exe
- else
-- GXX=no
-- with_gnu_ld=no
-- wlarc=
-+ echo "libtool.m4: error: problem compiling $1 test program"
- fi
-
--# PORTME: fill in a description of your system's C++ link characteristics
--AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--_LT_AC_TAGVAR(ld_shlibs, $1)=yes
--case $host_os in
-- aix3*)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+$rm -f confest.$objext
-+
-+# PORTME: override above test on systems where it is broken
-+ifelse([$1],[CXX],
-+[case $host_os in
-+interix[[3-9]]*)
-+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+ # hack all around it, let's just trust "g++" to DTRT.
-+ _LT_AC_TAGVAR(predep_objects,$1)=
-+ _LT_AC_TAGVAR(postdep_objects,$1)=
-+ _LT_AC_TAGVAR(postdeps,$1)=
-+ ;;
-+
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ 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=""
-- else
-- aix_use_runtimelinking=no
-+ esac
-+ ;;
-
-- # 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
-- case $ld_flag in
-- *-brtl*)
-- aix_use_runtimelinking=yes
-- break
-- ;;
-- esac
-- done
-- ;;
-- esac
-+solaris*)
-+ case $cc_basename in
-+ CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-+ # Adding this requires a known-good setup of shared libraries for
-+ # Sun compiler versions before 5.6, else PIC objects from an old
-+ # archive will be linked into the output, leading to subtle bugs.
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
-+ ;;
-+ esac
-+ ;;
-+esac
-+])
-
-- # 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.
-+case " $_LT_AC_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+])# AC_LIBTOOL_POSTDEP_PREDEP
-
-- _LT_AC_TAGVAR(archive_cmds, $1)=''
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+# AC_LIBTOOL_LANG_F77_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-+[AC_REQUIRE([AC_PROG_F77])
-+AC_LANG_PUSH(Fortran 77)
- if test "$GXX" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -8727,25 +8458,7 @@
- fi
- fi
- fi
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
+-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
@@ -8756,9 +8469,7 @@
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+# Source file extension for f77 test sources.
-+ac_ext=f
-
+-
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
@@ -8781,10 +8492,7 @@
- fi
- fi
- ;;
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-
+-
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -8795,27 +8503,22 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
+-
- chorus*)
-- case $cc_basename in
-- *)
+ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
+ *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- esac
-- ;;
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
@@ -8823,9 +8526,7 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-
+-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
@@ -8840,33 +8541,7 @@
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# 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
- ;;
+- ;;
- darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
@@ -8893,14 +8568,7 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+aix4* | aix5*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-
+-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
@@ -8936,32 +8604,31 @@
- esac
- fi
- ;;
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-
+-
- dgux*)
-- case $cc_basename in
++ tandem*)
+ case $cc_basename in
- ec++*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- ghcx*)
- # Green Hills C++ Compiler
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- *)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- esac
-- ;;
++ NCC*)
++ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -4719,603 +4446,332 @@
+ ;;
+ esac
+ ;;
- freebsd[[12]]*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
++ vxworks*)
++ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
- freebsd-elf*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
@@ -8971,7 +8638,10 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- ;;
- gnu*)
-- ;;
++ *)
++ # FIXME: insert proper C++ library support
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
- hpux9*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -8980,8 +8650,9 @@
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-+_LT_AC_TAGVAR(GCC, $1)="$G77"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
++esac
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
- case $cc_basename in
- CC*)
@@ -9014,12 +8685,8 @@
- if test $with_gnu_ld = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++_LT_AC_TAGVAR(GCC, $1)="$GXX"
++_LT_AC_TAGVAR(LD, $1)="$LD"
- case $host_cpu in
- hppa*64*|ia64*)
@@ -9042,7 +8709,13 @@
- # location of the library.
- ;;
- esac
-+AC_LIBTOOL_CONFIG($1)
++AC_LIBTOOL_POSTDEP_PREDEP($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
- case $cc_basename in
- CC*)
@@ -9112,9 +8785,7 @@
- CC*)
- # SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_F77_CONFIG
++AC_LIBTOOL_CONFIG($1)
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -9140,6 +8811,18 @@
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
++AC_LANG_POP
++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
++])# AC_LIBTOOL_LANG_CXX_CONFIG
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
@@ -9155,19 +8838,59 @@
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+# AC_LIBTOOL_LANG_GCJ_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-+[AC_LANG_SAVE
++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
++# ------------------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library. It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
++int a;
++void foo (void) { a = 0; }
++EOF
++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++ Foo (void) { a = 0; }
++private:
++ int a;
++};
++EOF
++],[$1],[F77],[cat > conftest.$ac_ext <<EOF
++ subroutine foo
++ implicit none
++ integer*4 a
++ a=0
++ return
++ end
++EOF
++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
++public class foo {
++ private int a;
++ public void bar (void) {
++ a = 0;
++ }
++};
++EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++ # Parse the compiler output and extract the necessary
++ # objects, libraries and library flags.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+# Source file extension for Java test sources.
-+ac_ext=java
++ # Sentinel used to keep track of whether or not we are before
++ # the conftest object file.
++ pre_test_object_deps_done=no
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -9202,9 +8925,10 @@
- # Portland Group C++ compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
++ # 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"`
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -9214,14 +8938,71 @@
- # Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
++ for p in `eval $output_verbose_link_cmd`; do
++ case $p in
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
++ -L* | -R* | -l*)
++ # Some compilers place space between "-{L,R}" and the path.
++ # Remove the space.
++ if test $p = "-L" \
++ || test $p = "-R"; then
++ prev=$p
++ continue
++ else
++ prev=
++ fi
++
++ if test "$pre_test_object_deps_done" = no; then
++ case $p in
++ -L* | -R*)
++ # Internal compiler library paths should come after those
++ # provided the user. The postdeps already come after the
++ # user supplied libs so there is no need to process them.
++ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++ else
++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++ fi
++ ;;
++ # The "-l" case would never come before the object being
++ # linked, so don't bother handling this case.
++ esac
++ else
++ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
++ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
++ else
++ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
++ fi
++ fi
++ ;;
++
++ *.$objext)
++ # This assumes that the test object file only shows up
++ # once in the compiler output.
++ if test "$p" = "conftest.$objext"; then
++ pre_test_object_deps_done=yes
++ continue
++ fi
++
++ if test "$pre_test_object_deps_done" = no; then
++ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
++ _LT_AC_TAGVAR(predep_objects, $1)="$p"
++ else
++ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
++ fi
++ else
++ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
++ _LT_AC_TAGVAR(postdep_objects, $1)="$p"
++ else
++ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
++ fi
++ fi
++ ;;
++
++ *) ;; # Ignore the rest.
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
@@ -9233,7 +9014,7 @@
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-- esac
+ esac
- ;;
- lynxos*)
- # FIXME: insert proper C++ library support
@@ -9253,7 +9034,41 @@
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- esac
++ done
++
++ # Clean up.
++ rm -f a.out a.exe
++else
++ echo "libtool.m4: error: problem compiling $1 test program"
++fi
++
++$rm -f confest.$objext
++
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++ # Interix 3.5 installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ _LT_AC_TAGVAR(predep_objects,$1)=
++ _LT_AC_TAGVAR(postdep_objects,$1)=
++ _LT_AC_TAGVAR(postdeps,$1)=
++ ;;
++
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
+ esac
- ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -9262,14 +9077,16 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- fi
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
+ ;;
- openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -9279,30 +9096,81 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-- fi
++ esac
++ ;;
++
++solaris*)
++ case $cc_basename in
++ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
- output_verbose_link_cmd='echo'
-- ;;
+ ;;
- osf3*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
--
++ esac
++ ;;
++esac
++])
+
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
++case " $_LT_AC_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++])# AC_LIBTOOL_POSTDEP_PREDEP
+
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
++# AC_LIBTOOL_LANG_F77_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined. Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
++AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
++[AC_REQUIRE([AC_PROG_F77])
++AC_LANG_PUSH(Fortran 77)
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- ;;
- RCC*)
@@ -9313,17 +9181,14 @@
- cxx*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
++# Source file extension for f77 test sources.
++ac_ext=f
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
@@ -9339,23 +9204,27 @@
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++# Code to be used in simple link tests
++lt_simple_link_test_code="\
++ program t
++ end
++"
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+AC_LIBTOOL_CONFIG($1)
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
- else
- # FIXME: insert proper C++ library support
@@ -9368,25 +9237,25 @@
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_GCJ_CONFIG
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# AC_LIBTOOL_LANG_RC_CONFIG
-+# -------------------------
-+# Ensure that the configuration vars for the Windows resource compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-+[AC_LANG_SAVE
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
@@ -9404,15 +9273,10 @@
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- $rm $lib.exp'
-+# Source file extension for RC test sources.
-+ac_ext=rc
-
+-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-
+-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
@@ -9427,21 +9291,15 @@
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
+-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-
+-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-
+-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -9480,10 +9338,7 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-
+-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
@@ -9501,17 +9356,9 @@
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
+-
- output_verbose_link_cmd='echo'
-+AC_LIBTOOL_CONFIG($1)
-
+-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
@@ -9521,10 +9368,7 @@
- gcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_RC_CONFIG
-
+-
- # The C++ compiler must be used to create the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- ;;
@@ -9536,7 +9380,7 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
+-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
@@ -9553,103 +9397,18 @@
- # linking a shared library.
- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
-+# AC_LIBTOOL_CONFIG([TAGNAME])
-+# ----------------------------
-+# If TAGNAME is not passed, then create an initial libtool script
-+# with a default configuration from the untagged config vars. Otherwise
-+# add code to config.status for appending the configuration named by
-+# TAGNAME from the matching tagged config vars.
-+AC_DEFUN([AC_LIBTOOL_CONFIG],
-+[# 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 \
-+ _LT_AC_TAGVAR(compiler, $1) \
-+ _LT_AC_TAGVAR(CC, $1) \
-+ _LT_AC_TAGVAR(LD, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-+ _LT_AC_TAGVAR(old_archive_cmds, $1) \
-+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-+ _LT_AC_TAGVAR(predep_objects, $1) \
-+ _LT_AC_TAGVAR(postdep_objects, $1) \
-+ _LT_AC_TAGVAR(predeps, $1) \
-+ _LT_AC_TAGVAR(postdeps, $1) \
-+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+ _LT_AC_TAGVAR(archive_cmds, $1) \
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
-+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-+ _LT_AC_TAGVAR(no_undefined_flag, $1) \
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-+ _LT_AC_TAGVAR(hardcode_automatic, $1) \
-+ _LT_AC_TAGVAR(module_cmds, $1) \
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
-+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
-+ _LT_AC_TAGVAR(include_expsyms, $1); do
-
+-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- fi
- ;;
-+ case $var in
-+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-+ _LT_AC_TAGVAR(archive_cmds, $1) | \
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-+ _LT_AC_TAGVAR(module_cmds, $1) | \
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-+ 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
+- esac
- ;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-+ done
-
+-
- case $cc_basename in
- CC*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9660,10 +9419,7 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
-+ case $lt_echo in
-+ *'\[$]0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
- ;;
+- ;;
- 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
@@ -9689,7 +9445,8 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-+ esac
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
- case $cc_basename in
- CC*)
@@ -9723,63 +9480,43 @@
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
--esac
++# 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
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+ifelse([$1], [],
-+ [cfgfile="${ofile}T"
-+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+ $rm -f "$cfgfile"
-+ AC_MSG_NOTICE([creating $ofile])],
-+ [cfgfile="$ofile"])
++AC_MSG_RESULT([$enable_shared])
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
--_LT_AC_TAGVAR(LD, $1)="$LD"
-+ cat <<__EOF__ >> "$cfgfile"
-+ifelse([$1], [],
-+[#! $SHELL
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++_LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
-AC_LIBTOOL_POSTDEP_PREDEP($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-
--AC_LIBTOOL_CONFIG($1)
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-
--AC_LANG_POP
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+@@ -5326,278 +4782,8 @@
+ AC_LIBTOOL_CONFIG($1)
+
+ AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
@@ -9791,9 +9528,7 @@
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="$SED -e 1s/^X//"
-
+-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
@@ -9845,22 +9580,15 @@
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
+-
- # 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"`
-+# The names of the tagged configurations supported by this script.
-+available_tags=
-
+-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
-+# ### BEGIN LIBTOOL CONFIG],
-+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
+-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
@@ -9871,8 +9599,7 @@
- else
- prev=
- fi
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
+-
- if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
@@ -9896,9 +9623,7 @@
- fi
- fi
- ;;
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-
+-
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
@@ -9906,9 +9631,7 @@
- pre_test_object_deps_done=yes
- continue
- fi
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-
+-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
- _LT_AC_TAGVAR(predep_objects, $1)="$p"
@@ -9923,32 +9646,20 @@
- fi
- fi
- ;;
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-
+-
- *) ;; # Ignore the rest.
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
+-
- esac
- done
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
+-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-
+-
-$rm -f confest.$objext
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-
+-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
@@ -9959,11 +9670,7 @@
- _LT_AC_TAGVAR(postdep_objects,$1)=
- _LT_AC_TAGVAR(postdeps,$1)=
- ;;
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-
+-
-solaris*)
- case $cc_basename in
- CC*)
@@ -9976,17 +9683,12 @@
- ;;
-esac
-])
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-
+-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-
+-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
@@ -9996,9 +9698,7 @@
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-+# A C compiler.
-+LTCC=$lt_LTCC
-
+-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
@@ -10017,60 +9717,40 @@
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-
+-
-# Source file extension for f77 test sources.
-ac_ext=f
-+# A language-specific compiler.
-+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
+-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-+# Is the compiler the GNU C compiler?
-+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
+-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-
+-
-# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
-+# The linker used to build libraries.
-+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
+-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-
+-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-
+-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-
+-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-
+-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-
+-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
@@ -10088,21 +9768,15 @@
- ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-
+-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-+# Used on cygwin: assembler.
-+AS="$AS"
-
+-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-
+-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
@@ -10111,528 +9785,54 @@
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-
+-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-+# How to pass a linker flag through the compiler.
-+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-
--# AC_LIBTOOL_LANG_GCJ_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
--[AC_LANG_SAVE
-+# Old archive suffix (normally "a").
-+libext="$libext"
-
--# Source file extension for Java test sources.
--ac_ext=java
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-
--# Code to be used in simple compile tests
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+ # AC_LIBTOOL_LANG_GCJ_CONFIG
+@@ -5617,10 +4803,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+pic_mode=$pic_mode
-
--# Code to be used in simple link tests
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+# Do we need a version for libraries?
-+need_version=$need_version
-
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-
--AC_LIBTOOL_CONFIG($1)
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_GCJ_CONFIG
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
--# AC_LIBTOOL_LANG_RC_CONFIG
--# -------------------------
--# Ensure that the configuration vars for the Windows resource compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
--[AC_LANG_SAVE
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
--# Source file extension for RC test sources.
--ac_ext=rc
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
--# Code to be used in simple compile tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -5673,7 +4859,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+# Library versioning type.
-+version_type=$version_type
-
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
-+# 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
-
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
--AC_LIBTOOL_CONFIG($1)
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_RC_CONFIG
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-
--# AC_LIBTOOL_CONFIG([TAGNAME])
--# ----------------------------
--# If TAGNAME is not passed, then create an initial libtool script
--# with a default configuration from the untagged config vars. Otherwise
--# add code to config.status for appending the configuration named by
--# TAGNAME from the matching tagged config vars.
--AC_DEFUN([AC_LIBTOOL_CONFIG],
--[# 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 \
-- _LT_AC_TAGVAR(compiler, $1) \
-- _LT_AC_TAGVAR(CC, $1) \
-- _LT_AC_TAGVAR(LD, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-- _LT_AC_TAGVAR(old_archive_cmds, $1) \
-- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-- _LT_AC_TAGVAR(predep_objects, $1) \
-- _LT_AC_TAGVAR(postdep_objects, $1) \
-- _LT_AC_TAGVAR(predeps, $1) \
-- _LT_AC_TAGVAR(postdeps, $1) \
-- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-- _LT_AC_TAGVAR(archive_cmds, $1) \
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-- _LT_AC_TAGVAR(postinstall_cmds, $1) \
-- _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-- _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-- _LT_AC_TAGVAR(no_undefined_flag, $1) \
-- _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-- _LT_AC_TAGVAR(hardcode_automatic, $1) \
-- _LT_AC_TAGVAR(module_cmds, $1) \
-- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-- _LT_AC_TAGVAR(exclude_expsyms, $1) \
-- _LT_AC_TAGVAR(include_expsyms, $1); do
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-- case $var in
-- _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-- _LT_AC_TAGVAR(archive_cmds, $1) | \
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-- _LT_AC_TAGVAR(module_cmds, $1) | \
-- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-- 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
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-
-- case $lt_echo in
-- *'\[$]0 --fallback-echo"')
-- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-- ;;
-- esac
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
--ifelse([$1], [],
-- [cfgfile="${ofile}T"
-- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-- $rm -f "$cfgfile"
-- AC_MSG_NOTICE([creating $ofile])],
-- [cfgfile="$ofile"])
--
-- cat <<__EOF__ >> "$cfgfile"
--ifelse([$1], [],
--[#! $SHELL
--
--# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -5762,6 +4948,7 @@
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+@@ -5808,7 +4995,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
--#
--# This file is part of GNU Libtool:
--# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# A sed program that does not truncate output.
--SED=$lt_SED
--
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e 1s/^X//"
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
--# The names of the tagged configurations supported by this script.
--available_tags=
--
--# ### BEGIN LIBTOOL CONFIG],
--[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
--
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
--
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
--
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
--
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
--
--# 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
--
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
--
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
--
--# A language-specific compiler.
--CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
--
--# Is the compiler the GNU C compiler?
--with_gcc=$_LT_AC_TAGVAR(GCC, $1)
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
--
--# A BSD-compatible nm program.
--NM=$lt_NM
--
--# A symbol stripping program
--STRIP=$lt_STRIP
--
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
--
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
--
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
--
--# Used on cygwin: assembler.
--AS="$AS"
--
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--pic_mode=$pic_mode
--
--# 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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
--
--# 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
--
--# Do we need a version for libraries?
--need_version=$need_version
--
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
--
--# 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
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
--
--# Library versioning type.
--version_type=$version_type
--
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
--
--# 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
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
--archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
--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_[]_LT_AC_TAGVAR(module_cmds, $1)
--module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
--
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
- # Dependencies to place before the objects being linked to create a
- # shared library.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
@@ -6133,7 +5320,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -10727,15 +9927,25 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6708,1452 +5906,2442 @@
- 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+@@ -6699,1462 +5897,2451 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+- case $host_os in
+- aix*)
+- # All AIX code is PIC.
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $host_os in
++ aix*)
++ # All AIX code is PIC.
++ if test "$host_cpu" = ia64; then
++ # AIX 5 now supports IA64 processor
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ fi
++ ;;
++
+ amigaos*)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
@@ -11645,9 +10855,14 @@
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
-+ fi
-+ ;;
-+
+ 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$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'
@@ -11658,8 +10873,10 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+- # PIC is the default for these OSes.
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -11669,8 +10886,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
+ ;;
+
+- 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ newsos6)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -11679,8 +10900,10 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -11707,10 +10930,9 @@
+ fi
;;
-- 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+- interix3*)
+- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+- # Instead, we relocate shared libraries at runtime.
+ os2*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -11719,10 +10941,11 @@
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
-- darwin* | rhapsody*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+- msdosdjgpp*)
+- # Just because we use GCC doesn't mean we suddenly get shared libraries
+- # on systems that don't support them.
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+- enable_shared=no
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -11735,9 +10958,9 @@
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
-- 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_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -11751,15 +10974,17 @@
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ fi
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
-- msdosdjgpp*)
-- # Just because we use GCC doesn't mean we suddenly get shared libraries
-- # on systems that don't support them.
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-- enable_shared=no
+- 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
+- ;;
+ solaris*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+ if test "$GCC" = yes; then
@@ -11777,7 +11002,8 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
+ *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
@@ -11787,64 +11013,145 @@
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
-+ ;;
-+ esac
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- esac
+- else
+- # PORTME Check for flag to pass linker flags through the system compiler.
+- case $host_os in
+- aix*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 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.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
+ else
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
+- ;;
+- darwin*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- case $cc_basename in
+- xlc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
-- hpux*)
+- hpux9* | hpux10* | hpux11*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-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_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ sysv4)
+ case $host_vendor in
+ sni)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- esac
+- # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+- ;;
+-
+- irix5* | irix6* | nonstopux*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # PIC (with -KPIC) is the default.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
+-
+- newsos6)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+-
+- linux*)
+- case $cc_basename in
+- icc* | ecc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- pgcc* | pgf77* | pgf90* | pgf95*)
+- # Portland Group compilers (*not* the Pentium gcc compiler,
+- # which looks to be a dead project)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+- ccc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # All Alpha code is PIC.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ siemens)
+ ## LD is ld it makes a PLAMLIB
+ ## CC just makes a GrossModule.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ ;;
+ ;;
+ motorola)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
- ;;
++ ;;
esac
+ runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
+ ;;
+
+- osf3* | osf4* | osf5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # All OSF/1 code is PIC.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
+-
+- solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- case $cc_basename in
+- f77* | f90* | f95*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+- esac
+ sysv4.3*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+ ;;
-+
+ ;;
+
+- sunos4*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -11853,23 +11160,37 @@
+ hardcode_runpath_var=yes
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+ fi
-+ ;;
-+
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
-+
+
+- sysv4*MP*)
+- if test -d /usr/nec ;then
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+ 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
@@ -11886,7 +11207,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
-+
+
+- unicos*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -11894,35 +11218,50 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
-+ ;;
-+
-+ uts4*)
+ ;;
+
+ uts4*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
esac
-- else
-- # PORTME Check for flag to pass linker flags through the system compiler.
-- case $host_os in
-- aix*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+])
+ fi
+ ])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+#
+
+ #
+-# Check to make sure the PIC flag actually works.
+# Do we need to explicitly link libc?
-+#
+ #
+-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+- "" | " "*) ;;
+- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+- esac],
+- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+-fi
+-case $host_os in
+- # For platforms which do not support PIC, -DPIC is meaningless:
+- *djgpp*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+- ;;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+- ;;
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+ # Assume -lc should be added
@@ -11962,50 +11301,19 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++ else
+ cat conftest.err 1>&5
- fi
++ fi
+ $rm conftest*
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
- ;;
-- darwin*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- case $cc_basename in
-- xlc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- ;;
-- esac
-- ;;
++ ;;
+ esac
+ fi
+ ;;
-+esac
+ esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-- 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-- ;;
-
-- hpux9* | hpux10* | hpux11*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-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_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-- ;;
-- esac
-- # Is there a better lt_prog_compiler_static that works with the bundled CC?
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-- ;;
++
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
@@ -12015,13 +11323,21 @@
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
-+#
+ #
+-# Check to make sure the static flag actually works.
+# #ifndef __CYGWIN__
+# # ifdef __CYGWIN32__
+# # define __CYGWIN__ __CYGWIN32__
+# # endif
+# #endif
-+#
+ #
+-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+- $lt_tmp_static_flag,
+- [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-])
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
@@ -12045,292 +11361,6 @@
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
-- irix5* | irix6* | nonstopux*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # PIC (with -KPIC) is the default.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-- ;;
-
-- newsos6)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-- linux*)
-- case $cc_basename in
-- icc* | ecc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-- ;;
-- pgcc* | pgf77* | pgf90* | pgf95*)
-- # Portland Group compilers (*not* the Pentium gcc compiler,
-- # which looks to be a dead project)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-- ccc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # All Alpha code is PIC.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-- ;;
-- esac
-- ;;
-
-- osf3* | osf4* | osf5*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # All OSF/1 code is PIC.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-- ;;
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-
-- solaris*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- case $cc_basename in
-- f77* | f90* | f95*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-- esac
-- ;;
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-
-- sunos4*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-+AC_DEFUN([LT_AC_PROG_GCJ],
-+[AC_CHECK_TOOL(GCJ, gcj, no)
-+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+ AC_SUBST(GCJFLAGS)
-+])
-
-- sysv4 | sysv4.2uw2* | sysv4.3*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
-
-- sysv4*MP*)
-- if test -d /usr/nec ;then
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- fi
-- ;;
-
-- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-- unicos*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-- ;;
-+# _AS_TEST_PREPARE
-+# ----------------
-+m4_ifndef([_AS_TEST_PREPARE],
-+[m4_defun([_AS_TEST_PREPARE],
-+[if test -x / >/dev/null 2>&1; then
-+ as_executable_p='test -x'
-+else
-+ as_executable_p='test -f'
-+fi
-+])])# _AS_TEST_PREPARE
-
-- uts4*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-+# AS_EXECUTABLE_P
-+# ---------------
-+# Check whether a file is executable.
-+m4_ifndef([AS_EXECUTABLE_P],
-+[m4_defun([AS_EXECUTABLE_P],
-+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-+$as_executable_p $1[]dnl
-+])])# AS_EXECUTABLE_P
-
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-- ;;
-- esac
-+# NOTE: This macro has been submitted for inclusion into #
-+# GNU Autoconf as AC_PROG_SED. When it is available in #
-+# a released version of Autoconf we should remove this #
-+# macro and use it instead. #
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible. Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for lt_ac_prog in sed gsed; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
-+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+ fi
-+ done
-+ done
-+done
-+IFS=$as_save_IFS
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+ test ! -f $lt_ac_sed && continue
-+ cat /dev/null > conftest.in
-+ lt_ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+ # Check for GNU sed and select it if it is found.
-+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+ lt_cv_path_SED=$lt_ac_sed
-+ break
- fi
-+ while true; do
-+ cat conftest.in conftest.in >conftest.tmp
-+ mv conftest.tmp conftest.in
-+ cp conftest.in conftest.nl
-+ echo >>conftest.nl
-+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+ cmp -s conftest.out conftest.nl || break
-+ # 10000 chars as input seems more than enough
-+ test $lt_ac_count -gt 10 && break
-+ lt_ac_count=`expr $lt_ac_count + 1`
-+ if test $lt_ac_count -gt $lt_ac_max; then
-+ lt_ac_max=$lt_ac_count
-+ lt_cv_path_SED=$lt_ac_sed
-+ fi
-+ done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_SUBST([SED])
-+AC_MSG_RESULT([$SED])
- ])
--AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+#
-+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
- #
--# Check to make sure the PIC flag actually works.
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
--if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-- "" | " "*) ;;
-- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-- esac],
-- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- fi
--case $host_os in
-- # For platforms which do not support PIC, -DPIC is meaningless:
-- *djgpp*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-- ;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-- ;;
--esac
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
- #
--# Check to make sure the static flag actually works.
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
- #
--wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
--AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-- $lt_tmp_static_flag,
-- [],
-- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
--])
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
@@ -12345,13 +11375,7 @@
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
- else
+- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
@@ -12421,12 +11445,15 @@
- with_gnu_ld=no
- ;;
- esac
--
++# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
++# ---------------------------------
++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
- _LT_AC_TAGVAR(ld_shlibs, $1)=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.
@@ -12438,10 +11465,7 @@
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
- fi
+- fi
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
@@ -12450,7 +11474,15 @@
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
--
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
+
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
@@ -12458,25 +11490,31 @@
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
--
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
+
-*** 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.
--
++AC_DEFUN([LT_AC_PROG_GCJ],
++[AC_CHECK_TOOL(GCJ, gcj, no)
++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++ AC_SUBST(GCJFLAGS)
++])
+
-EOF
- fi
- ;;
--
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
+
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$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)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
@@ -12486,6 +11524,204 @@
- # them.
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+- beos*)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+- # support --undefined. This deserves some investigation. FIXME
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
++# NOTE: This macro has been submitted for inclusion into #
++# GNU Autoconf as AC_PROG_SED. When it is available in #
++# a released version of Autoconf we should remove this #
++# macro and use it instead. #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible. Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for lt_ac_prog in sed gsed; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+- ;;
++ done
++ done
++done
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++ test ! -f $lt_ac_sed && continue
++ cat /dev/null > conftest.in
++ lt_ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++ # Check for GNU sed and select it if it is found.
++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++ lt_cv_path_SED=$lt_ac_sed
++ break
++ fi
++ while true; do
++ cat conftest.in conftest.in >conftest.tmp
++ mv conftest.tmp conftest.in
++ cp conftest.in conftest.nl
++ echo >>conftest.nl
++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++ cmp -s conftest.out conftest.nl || break
++ # 10000 chars as input seems more than enough
++ test $lt_ac_count -gt 10 && break
++ lt_ac_count=`expr $lt_ac_count + 1`
++ if test $lt_ac_count -gt $lt_ac_max; then
++ lt_ac_max=$lt_ac_count
++ lt_cv_path_SED=$lt_ac_sed
++ fi
++ done
++done
++])
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
++AC_MSG_RESULT([$SED])
++])
+
+- cygwin* | mingw* | pw32*)
+- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+- # as there is no search path for DLLs.
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
+- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+
+- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$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...
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- cp $export_symbols $output_objdir/$soname.def;
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
+ 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
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
@@ -12496,26 +11732,8 @@
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
-
-- beos*)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-- # support --undefined. This deserves some investigation. FIXME
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
-
-- cygwin* | mingw* | pw32*)
-- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-- # as there is no search path for DLLs.
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- _LT_AC_TAGVAR(always_export_symbols, $1)=no
-- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
@@ -12531,24 +11749,6 @@
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$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...
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-
- interix3*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -12563,8 +11763,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12585,9 +11785,8 @@
- tmp_addflag=' -nofor_main' ;;
- esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
@@ -12597,6 +11796,19 @@
- fi
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
+
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+- wlarc=
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
+if test $pkg_failed = yes; then
@@ -12609,23 +11821,12 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-- wlarc=
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- fi
-- ;;
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
-
- solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-+$$1_PKG_ERRORS
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
@@ -12633,8 +11834,7 @@
-*** 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.
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++$$1_PKG_ERRORS
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12644,6 +11844,14 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+- case `$LD -v 2>&1` in
+- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- cat <<_LT_EOF 1>&2
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
@@ -12654,28 +11862,13 @@
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
-- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-- case `$LD -v 2>&1` in
-- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- cat <<_LT_EOF 1>&2
-+_PKG_TEXT
-
-*** 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.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+ [$4])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
++_PKG_TEXT
-_LT_EOF
- ;;
@@ -12690,11 +11883,15 @@
- ;;
- esac
- ;;
-+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -12702,6 +11899,21 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
++# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- *)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+- esac
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -12714,22 +11926,6 @@
+m4_if([$1], [1.10], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
-
-- *)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
-- esac
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
@@ -12753,13 +11949,12 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.10])dnl
-+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
@@ -12777,7 +11972,13 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++[AM_AUTOMAKE_VERSION([1.10])dnl
++_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -12791,15 +11992,22 @@
- done
- ;;
- esac
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
+- # 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.
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -12838,23 +12046,16 @@
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
-- # 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.
+- _LT_AC_TAGVAR(archive_cmds, $1)=''
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
-
-- _LT_AC_TAGVAR(archive_cmds, $1)=''
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+# AM_CONDITIONAL -*- Autoconf -*-
- if test "$GCC" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -12896,12 +12097,7 @@
- fi
- fi
- fi
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++# AM_CONDITIONAL -*- Autoconf -*-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
@@ -12935,7 +12131,12 @@
- fi
- fi
- ;;
-+# serial 8
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$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)'
@@ -12943,6 +12144,11 @@
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
++# serial 8
+
+- bsdi[[45]]*)
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
@@ -12968,16 +12174,6 @@
+Usually this means the macro was only invoked conditionally.]])
+fi])])
-- bsdi[[45]]*)
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-- ;;
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
@@ -12998,7 +12194,12 @@
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-+# serial 9
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- darwin* | rhapsody*)
- case $host_os in
@@ -13049,20 +12250,32 @@
- esac
- fi
- ;;
++# serial 9
+
+- dgux*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-- dgux*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-
- freebsd1*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=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*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
@@ -13080,14 +12293,11 @@
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
-- # 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*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
@@ -13097,11 +12307,11 @@
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
-- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | kfreebsd*-gnu | dragonfly*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
+AC_CACHE_CHECK([dependency style of $depcc],
@@ -13125,13 +12335,9 @@
+ # directory.
+ mkdir sub
-- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
+- hpux9*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$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'
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
@@ -13152,10 +12358,7 @@
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- hpux9*)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$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'
++
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
@@ -13910,7 +13113,7 @@
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
-
++
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
@@ -13918,11 +13121,11 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
++# serial 5
+
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-+# serial 5
-
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
@@ -13948,6 +13151,8 @@
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
@@ -13956,10 +13161,6 @@
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--# This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
@@ -13967,15 +13168,14 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
++# serial 5
+
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)
--])
-+# serial 5
-
--AC_DEFUN([LT_AC_PROG_RC],
--[AC_CHECK_TOOL(RC, windres, no)
-])
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
@@ -13983,6 +13183,10 @@
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
+-])
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
@@ -14043,7 +13247,6 @@
-])
-SED=$lt_cv_path_SED
-AC_MSG_RESULT([$SED])
-+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
@@ -14419,7 +13622,8 @@
-_PKG_TEXT
-])],
-- [$4])
+- [AC_MSG_RESULT([no])
+- $4])
-elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old. Make sure it
@@ -14460,9 +13664,249 @@
m4_include([m4/gnome-doc-utils.m4])
m4_include([m4/intltool.m4])
-diff -Nur control-center-2.19.6/capplets/about-me/Makefile.in control-center-2.19.6.new/capplets/about-me/Makefile.in
---- control-center-2.19.6/capplets/about-me/Makefile.in 2007-07-30 23:12:42.000000000 +0200
-+++ control-center-2.19.6.new/capplets/about-me/Makefile.in 2007-08-03 10:25:09.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/about-me/Makefile.in control-center-2.20.0/capplets/about-me/Makefile.in
+--- control-center-2.20.0.old/capplets/about-me/Makefile.in 2007-09-17 16:56:37.000000000 +0200
++++ control-center-2.20.0/capplets/about-me/Makefile.in 2007-09-22 11:38:22.000000000 +0200
+@@ -215,8 +215,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -246,8 +244,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/accessibility/at-properties/Makefile.in control-center-2.20.0/capplets/accessibility/at-properties/Makefile.in
+--- control-center-2.20.0.old/capplets/accessibility/at-properties/Makefile.in 2007-09-17 16:56:37.000000000 +0200
++++ control-center-2.20.0/capplets/accessibility/at-properties/Makefile.in 2007-09-22 11:38:24.000000000 +0200
+@@ -213,8 +213,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -244,8 +242,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/accessibility/keyboard/Makefile.in control-center-2.20.0/capplets/accessibility/keyboard/Makefile.in
+--- control-center-2.20.0.old/capplets/accessibility/keyboard/Makefile.in 2007-09-17 16:56:38.000000000 +0200
++++ control-center-2.20.0/capplets/accessibility/keyboard/Makefile.in 2007-09-22 11:38:27.000000000 +0200
+@@ -222,8 +222,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -253,8 +251,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/accessibility/Makefile.in control-center-2.20.0/capplets/accessibility/Makefile.in
+--- control-center-2.20.0.old/capplets/accessibility/Makefile.in 2007-09-17 16:56:37.000000000 +0200
++++ control-center-2.20.0/capplets/accessibility/Makefile.in 2007-09-22 11:38:24.000000000 +0200
+@@ -184,8 +184,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -215,8 +213,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/appearance/data/Makefile.in control-center-2.20.0/capplets/appearance/data/Makefile.in
+--- control-center-2.20.0.old/capplets/appearance/data/Makefile.in 2007-09-17 16:56:38.000000000 +0200
++++ control-center-2.20.0/capplets/appearance/data/Makefile.in 2007-09-22 11:38:28.000000000 +0200
+@@ -194,8 +194,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -225,8 +223,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/appearance/Makefile.in control-center-2.20.0/capplets/appearance/Makefile.in
+--- control-center-2.20.0.old/capplets/appearance/Makefile.in 2007-09-17 16:56:38.000000000 +0200
++++ control-center-2.20.0/capplets/appearance/Makefile.in 2007-09-22 11:38:27.000000000 +0200
+@@ -220,8 +220,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -251,8 +249,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/common/Makefile.in control-center-2.20.0/capplets/common/Makefile.in
+--- control-center-2.20.0.old/capplets/common/Makefile.in 2007-09-17 16:56:38.000000000 +0200
++++ control-center-2.20.0/capplets/common/Makefile.in 2007-09-22 11:38:29.000000000 +0200
+@@ -204,8 +204,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -235,8 +233,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/default-applications/Makefile.in control-center-2.20.0/capplets/default-applications/Makefile.in
+--- control-center-2.20.0.old/capplets/default-applications/Makefile.in 2007-09-17 16:56:38.000000000 +0200
++++ control-center-2.20.0/capplets/default-applications/Makefile.in 2007-09-22 11:38:29.000000000 +0200
+@@ -222,8 +222,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -253,8 +251,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/display/Makefile.in control-center-2.20.0/capplets/display/Makefile.in
+--- control-center-2.20.0.old/capplets/display/Makefile.in 2007-09-17 16:56:39.000000000 +0200
++++ control-center-2.20.0/capplets/display/Makefile.in 2007-09-22 11:38:29.000000000 +0200
+@@ -223,8 +223,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -254,8 +252,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/keybindings/Makefile.in control-center-2.20.0/capplets/keybindings/Makefile.in
+--- control-center-2.20.0.old/capplets/keybindings/Makefile.in 2007-09-17 16:56:39.000000000 +0200
++++ control-center-2.20.0/capplets/keybindings/Makefile.in 2007-09-22 11:38:30.000000000 +0200
+@@ -214,8 +214,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -245,8 +243,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/keyboard/Makefile.in control-center-2.20.0/capplets/keyboard/Makefile.in
+--- control-center-2.20.0.old/capplets/keyboard/Makefile.in 2007-09-17 16:56:39.000000000 +0200
++++ control-center-2.20.0/capplets/keyboard/Makefile.in 2007-09-22 11:38:30.000000000 +0200
@@ -218,8 +218,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -14484,10 +13928,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/accessibility/at-properties/Makefile.in control-center-2.19.6.new/capplets/accessibility/at-properties/Makefile.in
---- control-center-2.19.6/capplets/accessibility/at-properties/Makefile.in 2007-07-30 23:12:43.000000000 +0200
-+++ control-center-2.19.6.new/capplets/accessibility/at-properties/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -216,8 +216,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/Makefile.in control-center-2.20.0/capplets/Makefile.in
+--- control-center-2.20.0.old/capplets/Makefile.in 2007-09-17 16:56:36.000000000 +0200
++++ control-center-2.20.0/capplets/Makefile.in 2007-09-22 11:38:21.000000000 +0200
+@@ -186,8 +186,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -14496,7 +13940,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -247,8 +245,11 @@
+@@ -217,8 +215,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -14508,9 +13952,57 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/accessibility/keyboard/Makefile.in control-center-2.19.6.new/capplets/accessibility/keyboard/Makefile.in
---- control-center-2.19.6/capplets/accessibility/keyboard/Makefile.in 2007-07-30 23:12:43.000000000 +0200
-+++ control-center-2.19.6.new/capplets/accessibility/keyboard/Makefile.in 2007-08-03 10:25:10.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/mouse/Makefile.in control-center-2.20.0/capplets/mouse/Makefile.in
+--- control-center-2.20.0.old/capplets/mouse/Makefile.in 2007-09-17 16:56:39.000000000 +0200
++++ control-center-2.20.0/capplets/mouse/Makefile.in 2007-09-22 11:38:31.000000000 +0200
+@@ -208,8 +208,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -239,8 +237,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/network/Makefile.in control-center-2.20.0/capplets/network/Makefile.in
+--- control-center-2.20.0.old/capplets/network/Makefile.in 2007-09-17 16:56:39.000000000 +0200
++++ control-center-2.20.0/capplets/network/Makefile.in 2007-09-22 11:38:32.000000000 +0200
+@@ -221,8 +221,6 @@
+ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
+-LIBSLAB_LIBS = @LIBSLAB_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -252,8 +250,11 @@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
+ SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
++SLAB_CFLAGS = @SLAB_CFLAGS@
++SLAB_LIBS = @SLAB_LIBS@
+ SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
+ SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
+ STRIP = @STRIP@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/sound/Makefile.in control-center-2.20.0/capplets/sound/Makefile.in
+--- control-center-2.20.0.old/capplets/sound/Makefile.in 2007-09-17 16:56:39.000000000 +0200
++++ control-center-2.20.0/capplets/sound/Makefile.in 2007-09-22 11:38:33.000000000 +0200
@@ -225,8 +225,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
@@ -14532,10 +14024,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/accessibility/Makefile.in control-center-2.19.6.new/capplets/accessibility/Makefile.in
---- control-center-2.19.6/capplets/accessibility/Makefile.in 2007-07-30 23:12:43.000000000 +0200
-+++ control-center-2.19.6.new/capplets/accessibility/Makefile.in 2007-08-03 10:25:09.000000000 +0200
-@@ -187,8 +187,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/capplets/windows/Makefile.in control-center-2.20.0/capplets/windows/Makefile.in
+--- control-center-2.20.0.old/capplets/windows/Makefile.in 2007-09-22 11:37:15.000000000 +0200
++++ control-center-2.20.0/capplets/windows/Makefile.in 2007-09-22 11:38:33.000000000 +0200
+@@ -210,8 +210,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -14544,7 +14036,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -218,8 +216,11 @@
+@@ -241,8 +239,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -14556,302 +14048,14 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/appearance/data/Makefile.in control-center-2.19.6.new/capplets/appearance/data/Makefile.in
---- control-center-2.19.6/capplets/appearance/data/Makefile.in 2007-07-30 23:12:43.000000000 +0200
-+++ control-center-2.19.6.new/capplets/appearance/data/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -197,8 +197,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -228,8 +226,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/appearance/Makefile.in control-center-2.19.6.new/capplets/appearance/Makefile.in
---- control-center-2.19.6/capplets/appearance/Makefile.in 2007-07-30 23:12:43.000000000 +0200
-+++ control-center-2.19.6.new/capplets/appearance/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -223,8 +223,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -254,8 +252,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/common/Makefile.in control-center-2.19.6.new/capplets/common/Makefile.in
---- control-center-2.19.6/capplets/common/Makefile.in 2007-07-30 23:12:44.000000000 +0200
-+++ control-center-2.19.6.new/capplets/common/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -207,8 +207,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -238,8 +236,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/default-applications/Makefile.in control-center-2.19.6.new/capplets/default-applications/Makefile.in
---- control-center-2.19.6/capplets/default-applications/Makefile.in 2007-07-30 23:12:44.000000000 +0200
-+++ control-center-2.19.6.new/capplets/default-applications/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -225,8 +225,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -256,8 +254,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/display/Makefile.in control-center-2.19.6.new/capplets/display/Makefile.in
---- control-center-2.19.6/capplets/display/Makefile.in 2007-07-30 23:12:44.000000000 +0200
-+++ control-center-2.19.6.new/capplets/display/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -226,8 +226,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -257,8 +255,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/keybindings/Makefile.in control-center-2.19.6.new/capplets/keybindings/Makefile.in
---- control-center-2.19.6/capplets/keybindings/Makefile.in 2007-07-30 23:12:44.000000000 +0200
-+++ control-center-2.19.6.new/capplets/keybindings/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -217,8 +217,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -248,8 +246,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/keyboard/Makefile.in control-center-2.19.6.new/capplets/keyboard/Makefile.in
---- control-center-2.19.6/capplets/keyboard/Makefile.in 2007-07-30 23:12:45.000000000 +0200
-+++ control-center-2.19.6.new/capplets/keyboard/Makefile.in 2007-08-03 10:25:10.000000000 +0200
-@@ -221,8 +221,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -252,8 +250,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/Makefile.in control-center-2.19.6.new/capplets/Makefile.in
---- control-center-2.19.6/capplets/Makefile.in 2007-07-30 23:12:42.000000000 +0200
-+++ control-center-2.19.6.new/capplets/Makefile.in 2007-08-03 10:25:09.000000000 +0200
-@@ -189,8 +189,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -220,8 +218,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/mouse/Makefile.in control-center-2.19.6.new/capplets/mouse/Makefile.in
---- control-center-2.19.6/capplets/mouse/Makefile.in 2007-07-30 23:12:45.000000000 +0200
-+++ control-center-2.19.6.new/capplets/mouse/Makefile.in 2007-08-03 10:25:11.000000000 +0200
-@@ -211,8 +211,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -242,8 +240,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/network/Makefile.in control-center-2.19.6.new/capplets/network/Makefile.in
---- control-center-2.19.6/capplets/network/Makefile.in 2007-07-30 23:12:45.000000000 +0200
-+++ control-center-2.19.6.new/capplets/network/Makefile.in 2007-08-03 10:25:11.000000000 +0200
-@@ -224,8 +224,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -255,8 +253,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/sound/Makefile.in control-center-2.19.6.new/capplets/sound/Makefile.in
---- control-center-2.19.6/capplets/sound/Makefile.in 2007-07-30 23:12:45.000000000 +0200
-+++ control-center-2.19.6.new/capplets/sound/Makefile.in 2007-08-03 10:25:11.000000000 +0200
-@@ -228,8 +228,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -259,8 +257,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/capplets/windows/Makefile.in control-center-2.19.6.new/capplets/windows/Makefile.in
---- control-center-2.19.6/capplets/windows/Makefile.in 2007-08-03 10:24:52.000000000 +0200
-+++ control-center-2.19.6.new/capplets/windows/Makefile.in 2007-08-03 10:25:11.000000000 +0200
-@@ -213,8 +213,6 @@
- LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBSLAB_CFLAGS = @LIBSLAB_CFLAGS@
--LIBSLAB_LIBS = @LIBSLAB_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -244,8 +242,11 @@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
- SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
-+SLAB_CFLAGS = @SLAB_CFLAGS@
-+SLAB_LIBS = @SLAB_LIBS@
- SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
- SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
- STRIP = @STRIP@
-diff -Nur control-center-2.19.6/configure control-center-2.19.6.new/configure
---- control-center-2.19.6/configure 2007-07-30 23:12:40.000000000 +0200
-+++ control-center-2.19.6.new/configure 2007-08-03 10:25:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/configure control-center-2.20.0/configure
+--- control-center-2.20.0.old/configure 2007-09-17 16:56:35.000000000 +0200
++++ control-center-2.20.0/configure 2007-09-22 11:38:17.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gnome-control-center 2.19.6.
-+# Generated by GNU Autoconf 2.61 for gnome-control-center 2.19.6.
+-# Generated by GNU Autoconf 2.60 for gnome-control-center 2.20.0.
++# Generated by GNU Autoconf 2.61 for gnome-control-center 2.20.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=control-center>.
#
@@ -15034,7 +14238,7 @@
LN_S
ECHO
AR
-@@ -921,10 +937,6 @@
+@@ -918,10 +934,6 @@
TYPING_BREAK
SCREENSAVER_LIBS
XF86MISC_LIBS
@@ -15045,7 +14249,7 @@
CAPPLET_CFLAGS
CAPPLET_LIBS
GNOMECC_CFLAGS
-@@ -947,6 +959,8 @@
+@@ -944,6 +956,8 @@
DEFAULT_APPLICATIONS_CAPPLET_LIBS
METACITY_CFLAGS
METACITY_LIBS
@@ -15054,7 +14258,7 @@
TYPING_CFLAGS
TYPING_LIBS
HAVE_XINPUT_TRUE
-@@ -1033,6 +1047,7 @@
+@@ -1030,6 +1044,7 @@
CC
CFLAGS
LDFLAGS
@@ -15062,7 +14266,7 @@
CPPFLAGS
CPP
CXX
-@@ -1043,8 +1058,6 @@
+@@ -1040,8 +1055,6 @@
FFLAGS
PKG_CONFIG
XMKMF
@@ -15071,7 +14275,7 @@
CAPPLET_CFLAGS
CAPPLET_LIBS
GNOMECC_CFLAGS
-@@ -1067,6 +1080,8 @@
+@@ -1064,6 +1077,8 @@
DEFAULT_APPLICATIONS_CAPPLET_LIBS
METACITY_CFLAGS
METACITY_LIBS
@@ -15080,7 +14284,7 @@
TYPING_CFLAGS
TYPING_LIBS
FONT_CAPPLET_CFLAGS
-@@ -1214,10 +1229,10 @@
+@@ -1211,10 +1226,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -15093,7 +14297,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1233,10 +1248,10 @@
+@@ -1230,10 +1245,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -15106,7 +14310,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1430,19 +1445,19 @@
+@@ -1427,19 +1442,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -15130,7 +14334,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1737,6 +1752,7 @@
+@@ -1734,6 +1749,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -15138,7 +14342,7 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
-@@ -1747,10 +1763,6 @@
+@@ -1744,10 +1760,6 @@
FFLAGS Fortran 77 compiler flags
PKG_CONFIG path to pkg-config utility
XMKMF Path to xmkmf, Makefile generator for X Window System
@@ -15149,7 +14353,7 @@
CAPPLET_CFLAGS
C compiler flags for CAPPLET, overriding pkg-config
CAPPLET_LIBS
-@@ -1793,6 +1805,8 @@
+@@ -1790,6 +1802,8 @@
C compiler flags for METACITY, overriding pkg-config
METACITY_LIBS
linker flags for METACITY, overriding pkg-config
@@ -15158,25 +14362,25 @@
TYPING_CFLAGS
C compiler flags for TYPING, overriding pkg-config
TYPING_LIBS linker flags for TYPING, overriding pkg-config
-@@ -1934,7 +1948,7 @@
+@@ -1931,7 +1945,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- gnome-control-center configure 2.19.6
+ gnome-control-center configure 2.20.0
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1948,7 +1962,7 @@
+@@ -1945,7 +1959,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gnome-control-center $as_me 2.19.6, which was
+ It was created by gnome-control-center $as_me 2.20.0, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2301,14 +2315,6 @@
+@@ -2298,14 +2312,6 @@
@@ -15191,7 +14395,7 @@
ac_config_headers="$ac_config_headers config.h"
-@@ -2383,7 +2389,7 @@
+@@ -2380,7 +2386,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15200,7 +14404,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2511,7 +2517,7 @@
+@@ -2508,7 +2514,7 @@
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15209,7 +14413,7 @@
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
-@@ -2564,7 +2570,7 @@
+@@ -2561,7 +2567,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15218,7 +14422,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2703,7 +2709,7 @@
+@@ -2700,7 +2706,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15227,7 +14431,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2743,7 +2749,7 @@
+@@ -2740,7 +2746,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15236,7 +14440,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2985,7 +2991,7 @@
+@@ -2982,7 +2988,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15245,7 +14449,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3025,7 +3031,7 @@
+@@ -3022,7 +3028,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15254,7 +14458,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3082,7 +3088,7 @@
+@@ -3079,7 +3085,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15263,7 +14467,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3123,7 +3129,7 @@
+@@ -3120,7 +3126,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15272,7 +14476,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -3181,7 +3187,7 @@
+@@ -3178,7 +3184,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15281,7 +14485,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3225,7 +3231,7 @@
+@@ -3222,7 +3228,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15290,7 +14494,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3366,7 +3372,7 @@
+@@ -3363,7 +3369,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -15299,7 +14503,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3394,6 +3400,12 @@
+@@ -3391,6 +3397,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -15312,7 +14516,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3405,8 +3417,6 @@
+@@ -3402,8 +3414,6 @@
fi
ac_exeext=$ac_cv_exeext
@@ -15321,7 +14525,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3584,27 +3594,10 @@
+@@ -3581,27 +3591,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15353,7 +14557,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3659,27 +3652,10 @@
+@@ -3656,27 +3649,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15385,7 +14589,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3714,27 +3690,10 @@
+@@ -3711,27 +3687,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15417,7 +14621,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3770,27 +3729,10 @@
+@@ -3767,27 +3726,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15449,7 +14653,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3906,27 +3848,10 @@
+@@ -3903,27 +3845,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15481,7 +14685,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -4120,27 +4045,11 @@
+@@ -4117,27 +4042,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15514,7 +14718,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -4149,7 +4058,7 @@
+@@ -4146,7 +4055,7 @@
fi
@@ -15523,7 +14727,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -4193,7 +4102,7 @@
+@@ -4190,7 +4099,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15532,7 +14736,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4233,7 +4142,7 @@
+@@ -4230,7 +4139,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15541,7 +14745,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4290,7 +4199,7 @@
+@@ -4287,7 +4196,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15550,7 +14754,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4331,7 +4240,7 @@
+@@ -4328,7 +4237,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15559,7 +14763,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -4389,7 +4298,7 @@
+@@ -4386,7 +4295,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15568,7 +14772,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4433,7 +4342,7 @@
+@@ -4430,7 +4339,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15577,7 +14781,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4553,27 +4462,10 @@
+@@ -4550,27 +4459,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15609,7 +14813,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4628,27 +4520,10 @@
+@@ -4625,27 +4517,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15641,7 +14845,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4683,27 +4558,10 @@
+@@ -4680,27 +4555,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15673,7 +14877,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4739,27 +4597,10 @@
+@@ -4736,27 +4594,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15705,7 +14909,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4875,27 +4716,10 @@
+@@ -4872,27 +4713,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15737,7 +14941,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -5218,17 +5042,10 @@
+@@ -5215,17 +5039,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15759,7 +14963,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5262,17 +5079,10 @@
+@@ -5259,17 +5076,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15781,7 +14985,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5337,17 +5147,10 @@
+@@ -5334,17 +5144,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15803,7 +15007,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5381,17 +5184,10 @@
+@@ -5378,17 +5181,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15825,7 +15029,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5446,7 +5242,7 @@
+@@ -5443,7 +5239,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -15834,7 +15038,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
-@@ -5528,7 +5324,7 @@
+@@ -5525,7 +5321,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -15843,7 +15047,7 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
-@@ -5624,27 +5420,10 @@
+@@ -5621,27 +5417,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15875,7 +15079,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5947,12 +5726,13 @@
+@@ -5944,12 +5723,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15890,7 +15094,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -5987,6 +5767,7 @@
+@@ -5984,6 +5764,7 @@
fi
SED=$lt_cv_path_SED
@@ -15898,7 +15102,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -6186,8 +5967,8 @@
+@@ -6183,8 +5964,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -15909,7 +15113,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6228,16 +6009,22 @@
+@@ -6225,16 +6006,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -15936,7 +15140,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -6275,7 +6062,7 @@
+@@ -6272,7 +6059,7 @@
esac
;;
@@ -15945,7 +15149,7 @@
# 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)$'
;;
-@@ -6291,11 +6078,11 @@
+@@ -6288,11 +6075,11 @@
;;
# This must be Linux ELF.
@@ -15959,7 +15163,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6325,6 +6112,10 @@
+@@ -6322,6 +6109,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -15970,16 +15174,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6411,7 +6202,7 @@
+@@ -6408,7 +6199,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6414 "configure"' > conftest.$ac_ext
-+ echo '#line 6205 "configure"' > conftest.$ac_ext
+- echo '#line 6411 "configure"' > conftest.$ac_ext
++ echo '#line 6202 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6446,7 +6237,8 @@
+@@ -6443,7 +6234,8 @@
rm -rf conftest*
;;
@@ -15989,7 +15193,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6457,6 +6249,9 @@
+@@ -6454,6 +6246,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -15999,7 +15203,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -6473,6 +6268,9 @@
+@@ -6470,6 +6265,9 @@
;;
*64-bit*)
case $host in
@@ -16009,7 +15213,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -6535,27 +6333,11 @@
+@@ -6532,27 +6330,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16042,7 +15246,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6564,7 +6346,7 @@
+@@ -6561,7 +6343,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -16051,7 +15255,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -6648,27 +6430,10 @@
+@@ -6645,27 +6427,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16083,7 +15287,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -6731,27 +6496,10 @@
+@@ -6728,27 +6493,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16115,7 +15319,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6787,17 +6535,10 @@
+@@ -6784,17 +6532,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16137,7 +15341,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6889,7 +6630,7 @@
+@@ -6886,7 +6627,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16146,7 +15350,7 @@
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6933,7 +6674,7 @@
+@@ -6930,7 +6671,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16155,7 +15359,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7046,27 +6787,10 @@
+@@ -7043,27 +6784,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16187,7 +15391,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7121,27 +6845,10 @@
+@@ -7118,27 +6842,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16219,7 +15423,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7176,27 +6883,10 @@
+@@ -7173,27 +6880,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16251,7 +15455,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7232,27 +6922,10 @@
+@@ -7229,27 +6919,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16283,7 +15487,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7454,17 +7127,10 @@
+@@ -7451,17 +7124,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16305,7 +15509,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7498,17 +7164,10 @@
+@@ -7495,17 +7161,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16327,7 +15531,7 @@
# Broken: success on invalid input.
continue
else
-@@ -7573,17 +7232,10 @@
+@@ -7570,17 +7229,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16349,7 +15553,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -7617,17 +7269,10 @@
+@@ -7614,17 +7266,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16371,7 +15575,7 @@
# Broken: success on invalid input.
continue
else
-@@ -7668,7 +7313,7 @@
+@@ -7665,7 +7310,7 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -16380,7 +15584,7 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -7686,7 +7331,7 @@
+@@ -7683,7 +7328,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16389,7 +15593,7 @@
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7712,7 +7357,7 @@
+@@ -7709,7 +7354,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -16398,7 +15602,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -7730,7 +7375,7 @@
+@@ -7727,7 +7372,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16407,7 +15611,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7837,27 +7482,10 @@
+@@ -7834,27 +7479,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16439,7 +15643,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7900,27 +7528,10 @@
+@@ -7897,27 +7525,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16471,7 +15675,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8047,24 +7658,27 @@
+@@ -8044,24 +7655,27 @@
fi
;;
*)
@@ -16516,7 +15720,7 @@
;;
esac
-@@ -8081,6 +7695,7 @@
+@@ -8078,6 +7692,7 @@
@@ -16524,7 +15728,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -8118,7 +7733,7 @@
+@@ -8115,7 +7730,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -16533,7 +15737,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -8375,7 +7990,7 @@
+@@ -8372,7 +7987,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16542,7 +15746,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8415,7 +8030,7 @@
+@@ -8412,7 +8027,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16551,7 +15755,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8471,7 +8086,7 @@
+@@ -8468,7 +8083,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16560,7 +15764,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8511,7 +8126,7 @@
+@@ -8508,7 +8123,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16569,7 +15773,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8567,7 +8182,7 @@
+@@ -8564,7 +8179,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16578,7 +15782,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8607,7 +8222,7 @@
+@@ -8604,7 +8219,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16587,7 +15791,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8669,7 +8284,7 @@
+@@ -8666,7 +8281,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -16596,7 +15800,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -8869,10 +8484,10 @@
+@@ -8866,10 +8481,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -16609,7 +15813,7 @@
# If no C compiler was specified, use CC.
-@@ -8887,13 +8502,13 @@
+@@ -8884,13 +8499,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -16625,7 +15829,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -8913,7 +8528,7 @@
+@@ -8910,7 +8525,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -16634,21 +15838,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8924,11 +8539,11 @@
+@@ -8921,11 +8536,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8927: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8542: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8924: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8539: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8931: \$? = $ac_status" >&5
-+ echo "$as_me:8546: \$? = $ac_status" >&5
+- echo "$as_me:8928: \$? = $ac_status" >&5
++ echo "$as_me:8543: \$? = $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.
-@@ -8979,13 +8594,15 @@
+@@ -8976,13 +8591,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -16666,7 +15870,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -8995,7 +8612,7 @@
+@@ -8992,7 +8609,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -16675,7 +15879,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -9053,7 +8670,7 @@
+@@ -9050,7 +8667,7 @@
esac
;;
@@ -16684,7 +15888,7 @@
# 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='-DDLL_EXPORT'
-@@ -9086,7 +8703,7 @@
+@@ -9083,7 +8700,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -16693,7 +15897,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -9105,6 +8722,22 @@
+@@ -9102,6 +8719,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -16716,7 +15920,7 @@
esac
;;
-@@ -9114,6 +8747,10 @@
+@@ -9111,6 +8744,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -16727,7 +15931,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9181,7 +8818,7 @@
+@@ -9178,7 +8815,7 @@
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -16736,21 +15940,21 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9192,11 +8829,11 @@
+@@ -9189,11 +8826,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9195: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8832: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9192: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8829: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9199: \$? = $ac_status" >&5
-+ echo "$as_me:8836: \$? = $ac_status" >&5
+- echo "$as_me:9196: \$? = $ac_status" >&5
++ echo "$as_me:8833: \$? = $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.
-@@ -9245,7 +8882,7 @@
+@@ -9242,7 +8879,7 @@
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -16759,7 +15963,7 @@
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
-@@ -9285,7 +8922,7 @@
+@@ -9282,7 +8919,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -16768,21 +15972,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9296,11 +8933,11 @@
+@@ -9293,11 +8930,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9299: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8936: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9296: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8933: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9303: \$? = $ac_status" >&5
-+ echo "$as_me:8940: \$? = $ac_status" >&5
+- echo "$as_me:9300: \$? = $ac_status" >&5
++ echo "$as_me:8937: \$? = $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
-@@ -9492,7 +9129,7 @@
+@@ -9489,7 +9126,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -16791,7 +15995,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9510,7 +9147,7 @@
+@@ -9507,7 +9144,7 @@
fi
;;
@@ -16800,7 +16004,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9525,7 +9162,7 @@
+@@ -9522,7 +9159,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -16809,7 +16013,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -9543,20 +9180,30 @@
+@@ -9540,20 +9177,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -16843,7 +16047,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9708,7 +9355,7 @@
+@@ -9705,7 +9352,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -16852,7 +16056,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -9776,33 +9423,24 @@
+@@ -9773,33 +9420,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16903,7 +16107,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9810,7 +9448,7 @@
+@@ -9807,7 +9445,7 @@
fi
@@ -16912,7 +16116,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9851,33 +9489,24 @@
+@@ -9848,33 +9486,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -16963,7 +16167,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9885,7 +9514,7 @@
+@@ -9882,7 +9511,7 @@
fi
@@ -16972,7 +16176,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9931,7 +9560,7 @@
+@@ -9928,7 +9557,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -16981,7 +16185,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -9973,10 +9602,10 @@
+@@ -9970,10 +9599,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -16994,7 +16198,7 @@
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}'
;;
*)
-@@ -10016,7 +9645,7 @@
+@@ -10013,7 +9642,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17003,7 +16207,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -10118,7 +9747,7 @@
+@@ -10115,7 +9744,7 @@
link_all_deplibs=yes
;;
@@ -17012,7 +16216,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10138,24 +9767,28 @@
+@@ -10135,24 +9764,28 @@
;;
openbsd*)
@@ -17058,7 +16262,7 @@
fi
;;
-@@ -10214,17 +9847,16 @@
+@@ -10211,17 +9844,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -17085,7 +16289,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10281,7 +9913,7 @@
+@@ -10278,7 +9910,7 @@
fi
;;
@@ -17094,7 +16298,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -10358,7 +9990,7 @@
+@@ -10355,7 +9987,7 @@
{ 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*
@@ -17103,7 +16307,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -10416,17 +10048,55 @@
+@@ -10413,17 +10045,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17163,7 +16367,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10586,12 +10256,8 @@
+@@ -10583,12 +10253,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -17178,7 +16382,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -10608,18 +10274,6 @@
+@@ -10605,18 +10271,6 @@
dynamic_linker=no
;;
@@ -17197,7 +16401,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10657,7 +10311,7 @@
+@@ -10654,7 +10308,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -17206,7 +16410,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10720,7 +10374,7 @@
+@@ -10717,7 +10371,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -17215,7 +16419,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10775,7 +10429,7 @@
+@@ -10772,7 +10426,7 @@
;;
# This must be Linux ELF.
@@ -17224,7 +16428,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10789,31 +10443,10 @@
+@@ -10786,31 +10440,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -17232,7 +16436,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 10796 "configure"' > conftest.$ac_ext
+- echo '#line 10793 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -17258,7 +16462,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10825,7 +10458,7 @@
+@@ -10822,7 +10455,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17267,7 +16471,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10834,7 +10467,7 @@
+@@ -10831,7 +10464,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -17276,7 +16480,7 @@
;;
netbsd*)
-@@ -10918,6 +10551,10 @@
+@@ -10915,6 +10548,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -17287,7 +16491,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11071,6 +10708,7 @@
+@@ -11068,6 +10705,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -17295,7 +16499,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -11154,27 +10792,11 @@
+@@ -11151,27 +10789,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17328,7 +16532,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11183,7 +10805,7 @@
+@@ -11180,7 +10802,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -17337,7 +16541,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11265,27 +10887,11 @@
+@@ -11262,27 +10884,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17370,7 +16574,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11294,7 +10900,7 @@
+@@ -11291,7 +10897,7 @@
ac_cv_func_shl_load=no
fi
@@ -17379,7 +16583,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -11344,27 +10950,11 @@
+@@ -11341,27 +10947,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17412,7 +16616,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11373,7 +10963,7 @@
+@@ -11370,7 +10960,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -17421,7 +16625,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11445,27 +11035,11 @@
+@@ -11442,27 +11032,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17454,7 +16658,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11474,7 +11048,7 @@
+@@ -11471,7 +11045,7 @@
ac_cv_func_dlopen=no
fi
@@ -17463,7 +16667,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -11524,27 +11098,11 @@
+@@ -11521,27 +11095,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17496,7 +16700,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11553,7 +11111,7 @@
+@@ -11550,7 +11108,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -17505,7 +16709,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11604,27 +11162,11 @@
+@@ -11601,27 +11159,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17538,7 +16742,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11633,7 +11175,7 @@
+@@ -11630,7 +11172,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -17547,7 +16751,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11684,27 +11226,11 @@
+@@ -11681,27 +11223,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17580,7 +16784,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11713,7 +11239,7 @@
+@@ -11710,7 +11236,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -17589,25 +16793,25 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -11769,7 +11295,7 @@
+@@ -11766,7 +11292,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11772 "configure"
-+#line 11298 "configure"
+-#line 11769 "configure"
++#line 11295 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11869,7 +11395,7 @@
+@@ -11866,7 +11392,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11872 "configure"
-+#line 11398 "configure"
+-#line 11869 "configure"
++#line 11395 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12067,6 +11593,7 @@
+@@ -12064,6 +11590,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -17615,7 +16819,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -12111,7 +11638,7 @@
+@@ -12108,7 +11635,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -17624,7 +16828,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12435,7 +11962,7 @@
+@@ -12432,7 +11959,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -17633,7 +16837,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -12604,10 +12131,10 @@
+@@ -12601,10 +12128,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -17646,7 +16850,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -12623,13 +12150,13 @@
+@@ -12620,13 +12147,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -17662,7 +16866,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -12888,7 +12415,7 @@
+@@ -12885,7 +12412,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -17671,7 +16875,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -12956,33 +12483,24 @@
+@@ -12953,33 +12480,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17722,7 +16926,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12990,7 +12508,7 @@
+@@ -12987,7 +12505,7 @@
fi
@@ -17731,7 +16935,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13032,33 +12550,24 @@
+@@ -13029,33 +12547,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17782,7 +16986,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13066,7 +12575,7 @@
+@@ -13063,7 +12572,7 @@
fi
@@ -17791,7 +16995,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13177,10 +12686,10 @@
+@@ -13174,10 +12683,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -17804,7 +17008,7 @@
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}'
;;
*)
-@@ -13214,7 +12723,7 @@
+@@ -13211,7 +12720,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -17813,7 +17017,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13263,9 +12772,7 @@
+@@ -13260,9 +12769,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -17824,7 +17028,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -13333,7 +12840,7 @@
+@@ -13330,7 +12837,7 @@
;;
esac
;;
@@ -17833,7 +17037,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13373,7 +12880,7 @@
+@@ -13370,7 +12877,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17842,7 +17046,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13453,6 +12960,29 @@
+@@ -13450,6 +12957,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -17872,7 +17076,7 @@
esac
;;
lynxos*)
-@@ -13475,7 +13005,7 @@
+@@ -13472,7 +13002,7 @@
;;
esac
;;
@@ -17881,7 +17085,7 @@
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=
-@@ -13491,16 +13021,20 @@
+@@ -13488,16 +13018,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -17911,7 +17115,7 @@
;;
osf3*)
case $cc_basename in
-@@ -13662,15 +13196,10 @@
+@@ -13659,15 +13193,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -17930,7 +17134,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -13717,6 +13246,12 @@
+@@ -13714,6 +13243,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -17943,7 +17147,7 @@
fi
;;
esac
-@@ -13908,7 +13443,7 @@
+@@ -13905,7 +13440,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -17952,7 +17156,7 @@
# 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=
-@@ -13916,13 +13451,46 @@
+@@ -13913,13 +13448,46 @@
postdeps_CXX=
;;
@@ -18000,7 +17204,7 @@
;;
esac
;;
-@@ -13959,12 +13527,14 @@
+@@ -13956,12 +13524,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -18017,7 +17221,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -13976,7 +13546,7 @@
+@@ -13973,7 +13543,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18026,7 +17230,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14042,7 +13612,7 @@
+@@ -14039,7 +13609,7 @@
;;
esac
;;
@@ -18035,7 +17239,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -14085,7 +13655,7 @@
+@@ -14082,7 +13652,7 @@
;;
esac
;;
@@ -18044,7 +17248,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -14112,6 +13682,14 @@
+@@ -14109,6 +13679,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -18059,7 +17263,7 @@
;;
esac
;;
-@@ -14128,7 +13706,7 @@
+@@ -14125,7 +13703,7 @@
;;
esac
;;
@@ -18068,7 +17272,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14226,7 +13804,7 @@
+@@ -14223,7 +13801,7 @@
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -18077,21 +17281,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14237,11 +13815,11 @@
+@@ -14234,11 +13812,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14240: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13818: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14237: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13815: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14244: \$? = $ac_status" >&5
-+ echo "$as_me:13822: \$? = $ac_status" >&5
+- echo "$as_me:14241: \$? = $ac_status" >&5
++ echo "$as_me:13819: \$? = $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.
-@@ -14290,7 +13868,7 @@
+@@ -14287,7 +13865,7 @@
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -18100,7 +17304,7 @@
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
-@@ -14330,7 +13908,7 @@
+@@ -14327,7 +13905,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -18109,21 +17313,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14341,11 +13919,11 @@
+@@ -14338,11 +13916,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14344: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13922: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14341: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13919: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14348: \$? = $ac_status" >&5
-+ echo "$as_me:13926: \$? = $ac_status" >&5
+- echo "$as_me:14345: \$? = $ac_status" >&5
++ echo "$as_me:13923: \$? = $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
-@@ -14411,7 +13989,10 @@
+@@ -14408,7 +13986,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18135,7 +17339,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14442,7 +14023,7 @@
+@@ -14439,7 +14020,7 @@
{ 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*
@@ -18144,7 +17348,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14500,20 +14081,7 @@
+@@ -14497,20 +14078,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18166,7 +17370,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14670,12 +14238,7 @@
+@@ -14667,12 +14235,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18180,7 +17384,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14692,18 +14255,6 @@
+@@ -14689,18 +14252,6 @@
dynamic_linker=no
;;
@@ -18199,7 +17403,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14741,7 +14292,7 @@
+@@ -14738,7 +14289,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -18208,7 +17412,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14804,7 +14355,7 @@
+@@ -14801,7 +14352,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18217,7 +17421,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14859,7 +14410,7 @@
+@@ -14856,7 +14407,7 @@
;;
# This must be Linux ELF.
@@ -18226,7 +17430,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14873,31 +14424,10 @@
+@@ -14870,31 +14421,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -18234,7 +17438,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 14880 "configure"' > conftest.$ac_ext
+- echo '#line 14877 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -18260,7 +17464,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14909,7 +14439,7 @@
+@@ -14906,7 +14436,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18269,7 +17473,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14918,7 +14448,7 @@
+@@ -14915,7 +14445,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -18278,7 +17482,7 @@
;;
netbsd*)
-@@ -15002,6 +14532,10 @@
+@@ -14999,6 +14529,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18289,7 +17493,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -15196,6 +14730,7 @@
+@@ -15193,6 +14727,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -18297,7 +17501,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -15516,7 +15051,7 @@
+@@ -15513,7 +15048,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18306,7 +17510,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -15607,10 +15142,17 @@
+@@ -15604,10 +15139,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -18326,7 +17530,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -15626,13 +15168,13 @@
+@@ -15623,13 +15165,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -18342,7 +17546,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -15719,13 +15261,15 @@
+@@ -15716,13 +15258,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -18360,7 +17564,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -15735,7 +15279,7 @@
+@@ -15732,7 +15276,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -18369,7 +17573,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -15793,7 +15337,7 @@
+@@ -15790,7 +15334,7 @@
esac
;;
@@ -18378,7 +17582,7 @@
# 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'
-@@ -15826,7 +15370,7 @@
+@@ -15823,7 +15367,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -18387,7 +17591,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15845,6 +15389,22 @@
+@@ -15842,6 +15386,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -18410,7 +17614,7 @@
esac
;;
-@@ -15854,6 +15414,10 @@
+@@ -15851,6 +15411,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -18421,7 +17625,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -15921,7 +15485,7 @@
+@@ -15918,7 +15482,7 @@
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -18430,21 +17634,21 @@
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.
-@@ -15932,11 +15496,11 @@
+@@ -15929,11 +15493,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15935: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15499: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15932: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15496: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15939: \$? = $ac_status" >&5
-+ echo "$as_me:15503: \$? = $ac_status" >&5
+- echo "$as_me:15936: \$? = $ac_status" >&5
++ echo "$as_me:15500: \$? = $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.
-@@ -15985,7 +15549,7 @@
+@@ -15982,7 +15546,7 @@
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -18453,7 +17657,7 @@
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
-@@ -16025,7 +15589,7 @@
+@@ -16022,7 +15586,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -18462,21 +17666,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -16036,11 +15600,11 @@
+@@ -16033,11 +15597,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16039: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15603: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16036: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15600: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16043: \$? = $ac_status" >&5
-+ echo "$as_me:15607: \$? = $ac_status" >&5
+- echo "$as_me:16040: \$? = $ac_status" >&5
++ echo "$as_me:15604: \$? = $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
-@@ -16232,7 +15796,7 @@
+@@ -16229,7 +15793,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -18485,7 +17689,7 @@
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'
-@@ -16250,7 +15814,7 @@
+@@ -16247,7 +15811,7 @@
fi
;;
@@ -18494,7 +17698,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -16265,7 +15829,7 @@
+@@ -16262,7 +15826,7 @@
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'
;;
@@ -18503,7 +17707,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16283,20 +15847,30 @@
+@@ -16280,20 +15844,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -18537,7 +17741,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16448,7 +16022,7 @@
+@@ -16445,7 +16019,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -18546,7 +17750,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -16506,33 +16080,24 @@
+@@ -16503,33 +16077,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18597,7 +17801,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16540,7 +16105,7 @@
+@@ -16537,7 +16102,7 @@
fi
@@ -18606,7 +17810,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16571,33 +16136,24 @@
+@@ -16568,33 +16133,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18657,7 +17861,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16605,7 +16161,7 @@
+@@ -16602,7 +16158,7 @@
fi
@@ -18666,7 +17870,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16651,7 +16207,7 @@
+@@ -16648,7 +16204,7 @@
# 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.
@@ -18675,7 +17879,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -16693,10 +16249,10 @@
+@@ -16690,10 +16246,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -18688,7 +17892,7 @@
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}'
;;
*)
-@@ -16736,7 +16292,7 @@
+@@ -16733,7 +16289,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18697,7 +17901,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -16838,7 +16394,7 @@
+@@ -16835,7 +16391,7 @@
link_all_deplibs_F77=yes
;;
@@ -18706,7 +17910,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16858,24 +16414,28 @@
+@@ -16855,24 +16411,28 @@
;;
openbsd*)
@@ -18752,7 +17956,7 @@
fi
;;
-@@ -16934,17 +16494,16 @@
+@@ -16931,17 +16491,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -18779,7 +17983,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17001,7 +16560,7 @@
+@@ -16998,7 +16557,7 @@
fi
;;
@@ -18788,7 +17992,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -17078,7 +16637,7 @@
+@@ -17075,7 +16634,7 @@
{ 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*
@@ -18797,7 +18001,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -17136,20 +16695,7 @@
+@@ -17133,20 +16692,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18819,7 +18023,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17306,12 +16852,7 @@
+@@ -17303,12 +16849,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18833,7 +18037,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17328,18 +16869,6 @@
+@@ -17325,18 +16866,6 @@
dynamic_linker=no
;;
@@ -18852,7 +18056,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17377,7 +16906,7 @@
+@@ -17374,7 +16903,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -18861,7 +18065,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17440,7 +16969,7 @@
+@@ -17437,7 +16966,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18870,7 +18074,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17495,7 +17024,7 @@
+@@ -17492,7 +17021,7 @@
;;
# This must be Linux ELF.
@@ -18879,7 +18083,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17509,31 +17038,10 @@
+@@ -17506,31 +17035,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -18887,7 +18091,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 17516 "configure"' > conftest.$ac_ext
+- echo '#line 17513 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -18913,7 +18117,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17545,7 +17053,7 @@
+@@ -17542,7 +17050,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18922,7 +18126,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17554,7 +17062,7 @@
+@@ -17551,7 +17059,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -18931,7 +18135,7 @@
;;
netbsd*)
-@@ -17638,6 +17146,10 @@
+@@ -17635,6 +17143,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18942,7 +18146,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17832,6 +17344,7 @@
+@@ -17829,6 +17341,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -18950,7 +18154,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -18152,7 +17665,7 @@
+@@ -18149,7 +17662,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18959,7 +18163,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -18210,10 +17723,10 @@
+@@ -18207,10 +17720,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -18972,7 +18176,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18229,13 +17742,13 @@
+@@ -18226,13 +17739,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -18988,7 +18192,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -18276,7 +17789,7 @@
+@@ -18273,7 +17786,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -18997,21 +18201,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18287,11 +17800,11 @@
+@@ -18284,11 +17797,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18290: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17803: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18287: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17800: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18294: \$? = $ac_status" >&5
-+ echo "$as_me:17807: \$? = $ac_status" >&5
+- echo "$as_me:18291: \$? = $ac_status" >&5
++ echo "$as_me:17804: \$? = $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.
-@@ -18342,13 +17855,15 @@
+@@ -18339,13 +17852,15 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -19029,7 +18233,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -18358,7 +17873,7 @@
+@@ -18355,7 +17870,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -19038,7 +18242,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -18416,7 +17931,7 @@
+@@ -18413,7 +17928,7 @@
esac
;;
@@ -19047,7 +18251,7 @@
# 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_GCJ='-DDLL_EXPORT'
-@@ -18449,7 +17964,7 @@
+@@ -18446,7 +17961,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -19056,7 +18260,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18468,6 +17983,22 @@
+@@ -18465,6 +17980,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -19079,7 +18283,7 @@
esac
;;
-@@ -18477,6 +18008,10 @@
+@@ -18474,6 +18005,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -19090,7 +18294,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18544,7 +18079,7 @@
+@@ -18541,7 +18076,7 @@
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -19099,21 +18303,21 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18555,11 +18090,11 @@
+@@ -18552,11 +18087,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18558: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18093: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18555: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18090: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18562: \$? = $ac_status" >&5
-+ echo "$as_me:18097: \$? = $ac_status" >&5
+- echo "$as_me:18559: \$? = $ac_status" >&5
++ echo "$as_me:18094: \$? = $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.
-@@ -18608,7 +18143,7 @@
+@@ -18605,7 +18140,7 @@
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -19122,7 +18326,7 @@
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
-@@ -18648,7 +18183,7 @@
+@@ -18645,7 +18180,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -19131,21 +18335,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -18659,11 +18194,11 @@
+@@ -18656,11 +18191,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18662: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18197: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18659: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18194: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18666: \$? = $ac_status" >&5
-+ echo "$as_me:18201: \$? = $ac_status" >&5
+- echo "$as_me:18663: \$? = $ac_status" >&5
++ echo "$as_me:18198: \$? = $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
-@@ -18855,7 +18390,7 @@
+@@ -18852,7 +18387,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -19154,7 +18358,7 @@
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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -18873,7 +18408,7 @@
+@@ -18870,7 +18405,7 @@
fi
;;
@@ -19163,7 +18367,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18888,7 +18423,7 @@
+@@ -18885,7 +18420,7 @@
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'
;;
@@ -19172,7 +18376,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18906,20 +18441,30 @@
+@@ -18903,20 +18438,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -19206,7 +18410,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19071,7 +18616,7 @@
+@@ -19068,7 +18613,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -19215,7 +18419,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -19139,33 +18684,24 @@
+@@ -19136,33 +18681,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19266,7 +18470,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19173,7 +18709,7 @@
+@@ -19170,7 +18706,7 @@
fi
@@ -19275,7 +18479,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19214,33 +18750,24 @@
+@@ -19211,33 +18747,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19326,7 +18530,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19248,7 +18775,7 @@
+@@ -19245,7 +18772,7 @@
fi
@@ -19335,7 +18539,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19294,7 +18821,7 @@
+@@ -19291,7 +18818,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -19344,7 +18548,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -19336,10 +18863,10 @@
+@@ -19333,10 +18860,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -19357,7 +18561,7 @@
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}'
;;
*)
-@@ -19379,7 +18906,7 @@
+@@ -19376,7 +18903,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -19366,7 +18570,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -19481,7 +19008,7 @@
+@@ -19478,7 +19005,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -19375,7 +18579,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19501,24 +19028,28 @@
+@@ -19498,24 +19025,28 @@
;;
openbsd*)
@@ -19421,7 +18625,7 @@
fi
;;
-@@ -19577,17 +19108,16 @@
+@@ -19574,17 +19105,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -19448,7 +18652,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19644,7 +19174,7 @@
+@@ -19641,7 +19171,7 @@
fi
;;
@@ -19457,7 +18661,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -19721,7 +19251,7 @@
+@@ -19718,7 +19248,7 @@
{ 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*
@@ -19466,7 +18670,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -19779,20 +19309,7 @@
+@@ -19776,20 +19306,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19488,7 +18692,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19949,12 +19466,7 @@
+@@ -19946,12 +19463,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -19502,7 +18706,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -19971,18 +19483,6 @@
+@@ -19968,18 +19480,6 @@
dynamic_linker=no
;;
@@ -19521,7 +18725,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -20020,7 +19520,7 @@
+@@ -20017,7 +19517,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -19530,7 +18734,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -20083,7 +19583,7 @@
+@@ -20080,7 +19580,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19539,7 +18743,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20138,7 +19638,7 @@
+@@ -20135,7 +19635,7 @@
;;
# This must be Linux ELF.
@@ -19548,7 +18752,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20152,31 +19652,10 @@
+@@ -20149,31 +19649,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -19556,7 +18760,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 20159 "configure"' > conftest.$ac_ext
+- echo '#line 20156 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -19582,7 +18786,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20188,7 +19667,7 @@
+@@ -20185,7 +19664,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19591,7 +18795,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20197,7 +19676,7 @@
+@@ -20194,7 +19673,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -19600,7 +18804,7 @@
;;
netbsd*)
-@@ -20281,6 +19760,10 @@
+@@ -20278,6 +19757,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19611,7 +18815,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20475,6 +19958,7 @@
+@@ -20472,6 +19955,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -19619,7 +18823,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -20795,7 +20279,7 @@
+@@ -20792,7 +20276,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -19628,7 +18832,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -20852,7 +20336,7 @@
+@@ -20849,7 +20333,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -19637,7 +18841,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20871,13 +20355,13 @@
+@@ -20868,13 +20352,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -19653,7 +18857,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -20955,6 +20439,7 @@
+@@ -20952,6 +20436,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -19661,7 +18865,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -21275,7 +20760,7 @@
+@@ -21272,7 +20757,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -19670,7 +18874,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -21398,7 +20883,7 @@
+@@ -21395,7 +20880,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19679,7 +18883,7 @@
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
-@@ -21441,7 +20926,7 @@
+@@ -21438,7 +20923,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19688,7 +18892,7 @@
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
-@@ -21687,7 +21172,7 @@
+@@ -21686,7 +21171,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19697,43 +18901,7 @@
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21750,7 +21235,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -21791,7 +21276,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -21832,7 +21317,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -21873,7 +21358,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -21932,27 +21417,11 @@
+@@ -21766,27 +21251,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19766,7 +18934,7 @@
DATADIRNAME=share
else
echo "$as_me: failed program was:" >&5
-@@ -22023,27 +21492,11 @@
+@@ -21857,27 +21326,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19799,7 +18967,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22052,7 +21505,7 @@
+@@ -21886,7 +21339,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -19808,7 +18976,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -22070,7 +21523,7 @@
+@@ -21904,7 +21357,7 @@
esac
fi
@@ -19817,7 +18985,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -22131,27 +21584,10 @@
+@@ -21965,27 +21418,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19849,7 +19017,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22187,17 +21623,10 @@
+@@ -22021,17 +21457,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19871,7 +19039,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22295,27 +21724,11 @@
+@@ -22129,27 +21558,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19904,7 +19072,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22324,7 +21737,7 @@
+@@ -22158,7 +21571,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -19913,7 +19081,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -22380,27 +21793,10 @@
+@@ -22214,27 +21627,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19945,7 +19113,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22436,17 +21832,10 @@
+@@ -22270,17 +21666,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -19967,7 +19135,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22542,27 +21931,11 @@
+@@ -22376,27 +21765,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20000,7 +19168,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22571,7 +21944,7 @@
+@@ -22405,7 +21778,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -20009,7 +19177,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -22614,27 +21987,11 @@
+@@ -22448,27 +21821,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20042,7 +19210,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22643,7 +22000,7 @@
+@@ -22477,7 +21834,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -20051,7 +19219,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -22719,27 +22076,11 @@
+@@ -22553,27 +21910,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20084,7 +19252,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22748,7 +22089,7 @@
+@@ -22582,7 +21923,7 @@
eval "$as_ac_var=no"
fi
@@ -20093,7 +19261,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22813,27 +22154,11 @@
+@@ -22647,27 +21988,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20126,7 +19294,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22842,7 +22167,7 @@
+@@ -22676,7 +22001,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -20135,7 +19303,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -22891,27 +22216,11 @@
+@@ -22725,27 +22050,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20168,7 +19336,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22920,7 +22229,7 @@
+@@ -22754,7 +22063,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -20177,7 +19345,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -22969,27 +22278,11 @@
+@@ -22803,27 +22112,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20210,7 +19378,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22998,7 +22291,7 @@
+@@ -22832,7 +22125,7 @@
ac_cv_lib_intl_dgettext=no
fi
@@ -20219,7 +19387,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23060,27 +22353,11 @@
+@@ -22894,27 +22187,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20252,7 +19420,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23089,7 +22366,7 @@
+@@ -22923,7 +22200,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -20261,7 +19429,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23138,27 +22415,11 @@
+@@ -22972,27 +22249,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20294,7 +19462,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23167,7 +22428,7 @@
+@@ -23001,7 +22262,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -20303,7 +19471,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23262,27 +22523,11 @@
+@@ -23096,27 +22357,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20336,7 +19504,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23291,7 +22536,7 @@
+@@ -23125,7 +22370,7 @@
eval "$as_ac_var=no"
fi
@@ -20345,7 +19513,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23438,27 +22683,11 @@
+@@ -23272,27 +22517,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20378,7 +19546,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23467,7 +22696,7 @@
+@@ -23301,7 +22530,7 @@
eval "$as_ac_var=no"
fi
@@ -20387,18 +19555,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23497,8 +22726,8 @@
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
-- (msgfmt -c -o /dev/null conftest.foo) 2>&5
-+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -23528,7 +22757,7 @@
+@@ -23362,7 +22591,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20407,7 +19564,7 @@
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23616,27 +22845,11 @@
+@@ -23450,27 +22679,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20440,7 +19597,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -23708,27 +22921,11 @@
+@@ -23542,27 +22755,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20473,7 +19630,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23737,7 +22934,7 @@
+@@ -23571,7 +22768,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -20482,7 +19639,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -23758,7 +22955,7 @@
+@@ -23592,7 +22789,7 @@
esac
fi
@@ -20491,7 +19648,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -23965,27 +23162,10 @@
+@@ -23799,27 +22996,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20523,7 +19680,7 @@
has_option=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24183,17 +23363,10 @@
+@@ -24017,17 +23197,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20545,7 +19702,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -24216,7 +23389,7 @@
+@@ -24050,7 +23223,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -20554,7 +19711,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24245,27 +23418,11 @@
+@@ -24079,27 +23252,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20587,7 +19744,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -24278,7 +23435,7 @@
+@@ -24112,7 +23269,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -20596,7 +19753,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -24286,7 +23443,7 @@
+@@ -24120,7 +23277,7 @@
done
fi
@@ -20605,7 +19762,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -24341,12 +23498,12 @@
+@@ -24175,12 +23332,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -20623,7 +19780,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -24374,44 +23531,20 @@
+@@ -24208,44 +23365,20 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20677,7 +19834,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -24439,48 +23572,30 @@
+@@ -24273,48 +23406,30 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20743,7 +19900,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -24529,27 +23644,11 @@
+@@ -24363,27 +23478,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20776,7 +19933,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -24597,27 +23696,11 @@
+@@ -24431,27 +23530,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20809,7 +19966,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24626,7 +23709,7 @@
+@@ -24460,7 +23543,7 @@
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -20818,7 +19975,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24679,27 +23762,11 @@
+@@ -24513,27 +23596,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20851,7 +20008,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24708,7 +23775,7 @@
+@@ -24542,7 +23609,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -20860,7 +20017,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24721,7 +23788,7 @@
+@@ -24555,7 +23622,7 @@
fi
fi
@@ -20869,7 +20026,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -24796,27 +23863,11 @@
+@@ -24630,27 +23697,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20902,7 +20059,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24825,7 +23876,7 @@
+@@ -24659,7 +23710,7 @@
ac_cv_func_gethostbyname=no
fi
@@ -20911,7 +20068,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -24874,27 +23925,11 @@
+@@ -24708,27 +23759,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20944,7 +20101,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24903,7 +23938,7 @@
+@@ -24737,7 +23772,7 @@
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -20953,7 +20110,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -24956,27 +23991,11 @@
+@@ -24790,27 +23825,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20986,7 +20143,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24985,7 +24004,7 @@
+@@ -24819,7 +23838,7 @@
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -20995,7 +20152,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25068,27 +24087,11 @@
+@@ -24902,27 +23921,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21028,7 +20185,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25097,7 +24100,7 @@
+@@ -24931,7 +23934,7 @@
ac_cv_func_connect=no
fi
@@ -21037,7 +20194,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -25146,27 +24149,11 @@
+@@ -24980,27 +23983,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21070,7 +20227,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25175,7 +24162,7 @@
+@@ -25009,7 +23996,7 @@
ac_cv_lib_socket_connect=no
fi
@@ -21079,7 +20236,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25251,27 +24238,11 @@
+@@ -25085,27 +24072,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21112,7 +20269,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25280,7 +24251,7 @@
+@@ -25114,7 +24085,7 @@
ac_cv_func_remove=no
fi
@@ -21121,7 +20278,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -25329,27 +24300,11 @@
+@@ -25163,27 +24134,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21154,7 +20311,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25358,7 +24313,7 @@
+@@ -25192,7 +24147,7 @@
ac_cv_lib_posix_remove=no
fi
@@ -21163,7 +20320,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25434,27 +24389,11 @@
+@@ -25268,27 +24223,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21196,7 +20353,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25463,7 +24402,7 @@
+@@ -25297,7 +24236,7 @@
ac_cv_func_shmat=no
fi
@@ -21205,7 +20362,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -25512,27 +24451,11 @@
+@@ -25346,27 +24285,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21238,7 +20395,7 @@
ac_cv_lib_ipc_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25541,7 +24464,7 @@
+@@ -25375,7 +24298,7 @@
ac_cv_lib_ipc_shmat=no
fi
@@ -21247,7 +20404,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25605,27 +24528,11 @@
+@@ -25439,27 +24362,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21280,7 +20437,7 @@
ac_cv_lib_ICE_IceConnectionNumber=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25634,7 +24541,7 @@
+@@ -25468,7 +24375,7 @@
ac_cv_lib_ICE_IceConnectionNumber=no
fi
@@ -21289,7 +20446,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25713,27 +24620,11 @@
+@@ -25547,27 +24454,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21322,7 +20479,7 @@
ac_cv_func_XScreenSaverQueryInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25742,7 +24633,7 @@
+@@ -25576,7 +24467,7 @@
ac_cv_func_XScreenSaverQueryInfo=no
fi
@@ -21331,7 +20488,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
-@@ -25796,27 +24687,11 @@
+@@ -25630,27 +24521,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21364,7 +20521,7 @@
ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25825,7 +24700,7 @@
+@@ -25659,7 +24534,7 @@
ac_cv_lib_Xss_XScreenSaverQueryInfo=no
fi
@@ -21373,7 +20530,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25881,27 +24756,11 @@
+@@ -25715,27 +24590,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21406,7 +20563,7 @@
ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25910,7 +24769,7 @@
+@@ -25744,7 +24603,7 @@
ac_cv_lib_Xext_XScreenSaverQueryInfo=no
fi
@@ -21415,7 +20572,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -25971,27 +24830,10 @@
+@@ -25805,27 +24664,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21447,7 +20604,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26027,17 +24869,10 @@
+@@ -25861,17 +24703,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21469,7 +20626,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26143,27 +24978,11 @@
+@@ -25977,27 +24812,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21502,7 +20659,7 @@
ac_cv_lib_Xxf86misc_XF86MiscQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26172,7 +24991,7 @@
+@@ -26006,7 +24825,7 @@
ac_cv_lib_Xxf86misc_XF86MiscQueryExtension=no
fi
@@ -21511,7 +20668,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -26215,27 +25034,10 @@
+@@ -26049,27 +24868,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21543,7 +20700,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26300,27 +25102,10 @@
+@@ -26134,27 +24936,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21575,7 +20732,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26356,17 +25141,10 @@
+@@ -26190,17 +24975,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21597,10 +20754,20 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26411,150 +25189,30 @@
- esac
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+@@ -26235,160 +25013,40 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ----------------------------------------------------------------------------- ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=control-center ##
+-## ----------------------------------------------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
@@ -21672,6 +20839,16 @@
- pkg_failed=yes
-fi
- fi
++ ( cat <<\_ASBOX
++## ----------------------------------------------------------------------------- ##
++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=control-center ##
++## ----------------------------------------------------------------------------- ##
++_ASBOX
++ ) | sed "s/^/$as_me: WARNING: /" >&2
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21762,7 +20939,7 @@
pkg_failed=no
{ echo "$as_me:$LINENO: checking for CAPPLET" >&5
-@@ -26646,7 +25304,7 @@
+@@ -26480,7 +25138,7 @@
and CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21771,7 +20948,7 @@
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
-@@ -26656,7 +25314,7 @@
+@@ -26490,7 +25148,7 @@
and CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21780,7 +20957,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -26757,7 +25415,7 @@
+@@ -26591,7 +25249,7 @@
and GNOMECC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21789,7 +20966,7 @@
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
-@@ -26767,7 +25425,7 @@
+@@ -26601,7 +25259,7 @@
and GNOMECC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21798,7 +20975,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -26868,7 +25526,7 @@
+@@ -26702,7 +25360,7 @@
and GNOME_SETTINGS_DAEMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21807,7 +20984,7 @@
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
-@@ -26878,7 +25536,7 @@
+@@ -26712,7 +25370,7 @@
and GNOME_SETTINGS_DAEMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21816,7 +20993,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -26979,7 +25637,7 @@
+@@ -26813,7 +25471,7 @@
and OLD_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21825,7 +21002,7 @@
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
-@@ -26989,7 +25647,7 @@
+@@ -26823,7 +25481,7 @@
and OLD_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21834,7 +21011,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27090,7 +25748,7 @@
+@@ -26924,7 +25582,7 @@
and GNOME_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21843,7 +21020,7 @@
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
-@@ -27100,7 +25758,7 @@
+@@ -26934,7 +25592,7 @@
and GNOME_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21852,7 +21029,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27201,7 +25859,7 @@
+@@ -27035,7 +25693,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21861,7 +21038,7 @@
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
-@@ -27211,7 +25869,7 @@
+@@ -27045,7 +25703,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21870,7 +21047,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27312,7 +25970,7 @@
+@@ -27146,7 +25804,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21879,7 +21056,7 @@
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
-@@ -27322,7 +25980,7 @@
+@@ -27156,7 +25814,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21888,7 +21065,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27423,7 +26081,7 @@
+@@ -27257,7 +25915,7 @@
and VFS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21897,7 +21074,7 @@
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
-@@ -27433,7 +26091,7 @@
+@@ -27267,7 +25925,7 @@
and VFS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21906,7 +21083,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27534,7 +26192,7 @@
+@@ -27368,7 +26026,7 @@
and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21915,7 +21092,7 @@
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
-@@ -27544,7 +26202,7 @@
+@@ -27378,7 +26036,7 @@
and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21924,7 +21101,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27645,7 +26303,7 @@
+@@ -27479,7 +26137,7 @@
and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21933,7 +21110,7 @@
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
-@@ -27655,7 +26313,7 @@
+@@ -27489,7 +26147,7 @@
and DEFAULT_APPLICATIONS_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21942,7 +21119,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27756,7 +26414,7 @@
+@@ -27590,7 +26248,7 @@
and METACITY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21951,7 +21128,7 @@
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
-@@ -27766,7 +26424,7 @@
+@@ -27600,7 +26258,7 @@
and METACITY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -21960,7 +21137,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27778,6 +26436,117 @@
+@@ -27612,6 +26270,117 @@
fi
pkg_failed=no
@@ -22078,7 +21255,7 @@
{ echo "$as_me:$LINENO: checking for TYPING" >&5
echo $ECHO_N "checking for TYPING... $ECHO_C" >&6; }
-@@ -27867,7 +26636,7 @@
+@@ -27701,7 +26470,7 @@
and TYPING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22087,7 +21264,7 @@
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
-@@ -27877,7 +26646,7 @@
+@@ -27711,7 +26480,7 @@
and TYPING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22096,7 +21273,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -27942,27 +26711,11 @@
+@@ -27776,27 +26545,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22129,7 +21306,7 @@
ac_cv_lib_Xi_XListInputDevices=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27971,7 +26724,7 @@
+@@ -27805,7 +26558,7 @@
ac_cv_lib_Xi_XListInputDevices=no
fi
@@ -22138,7 +21315,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28006,27 +26759,10 @@
+@@ -27840,27 +26593,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22170,7 +21347,7 @@
ac_cv_header_X11_extensions_XInput_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28157,7 +26893,7 @@
+@@ -27991,7 +26727,7 @@
and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22179,7 +21356,7 @@
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
-@@ -28167,7 +26903,7 @@
+@@ -28001,7 +26737,7 @@
and FONT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22188,7 +21365,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28269,7 +27005,7 @@
+@@ -28103,7 +26839,7 @@
and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22197,7 +21374,7 @@
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
-@@ -28279,7 +27015,7 @@
+@@ -28113,7 +26849,7 @@
and AT_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22206,7 +21383,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28334,27 +27070,11 @@
+@@ -28168,27 +26904,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22239,7 +21416,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28363,7 +27083,7 @@
+@@ -28197,7 +26917,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -22248,7 +21425,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28398,27 +27118,10 @@
+@@ -28232,27 +26952,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22280,7 +21457,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28548,7 +27251,7 @@
+@@ -28382,7 +27085,7 @@
and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22289,7 +21466,7 @@
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
-@@ -28558,7 +27261,7 @@
+@@ -28392,7 +27095,7 @@
and DISPLAY_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22298,18 +21475,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28651,7 +27354,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$XCURSOR_PKG_ERRORS" >&5
-
-- have_xcursor=no
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ have_xcursor=no
- elif test $pkg_failed = untried; then
- have_xcursor=no
- else
-@@ -28770,7 +27475,7 @@
+@@ -28606,7 +27309,7 @@
and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22318,7 +21484,7 @@
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
-@@ -28780,7 +27485,7 @@
+@@ -28616,7 +27319,7 @@
and LIBGNOMEKBD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22327,7 +21493,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -28884,7 +27589,7 @@
+@@ -28720,7 +27423,7 @@
and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22336,7 +21502,7 @@
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
-@@ -28894,7 +27599,7 @@
+@@ -28730,7 +27433,7 @@
and LIBGNOMEKBDUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22345,7 +21511,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29009,7 +27714,7 @@
+@@ -28845,7 +27548,7 @@
and THEME_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22354,7 +21520,7 @@
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
-@@ -29019,7 +27724,7 @@
+@@ -28855,7 +27558,7 @@
and THEME_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22363,7 +21529,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29120,7 +27825,7 @@
+@@ -28956,7 +27659,7 @@
and THEMUS_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22372,7 +21538,7 @@
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
-@@ -29130,7 +27835,7 @@
+@@ -28966,7 +27669,7 @@
and THEMUS_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22381,7 +21547,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29231,7 +27936,7 @@
+@@ -29067,7 +27770,7 @@
and THEMUS_COMPONENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22390,7 +21556,7 @@
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
-@@ -29241,7 +27946,7 @@
+@@ -29077,7 +27780,7 @@
and THEMUS_COMPONENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22399,7 +21565,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29342,7 +28047,7 @@
+@@ -29178,7 +27881,7 @@
and THEMUS_APPLIER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22408,7 +21574,7 @@
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
-@@ -29352,7 +28057,7 @@
+@@ -29188,7 +27891,7 @@
and THEMUS_APPLIER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22417,7 +21583,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29453,7 +28158,7 @@
+@@ -29289,7 +27992,7 @@
and FONT_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22426,7 +21592,7 @@
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
-@@ -29463,7 +28168,7 @@
+@@ -29299,7 +28002,7 @@
and FONT_METHOD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22435,7 +21601,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29564,7 +28269,7 @@
+@@ -29400,7 +28103,7 @@
and FONT_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22444,7 +21610,7 @@
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
-@@ -29574,7 +28279,7 @@
+@@ -29410,7 +28113,7 @@
and FONT_THUMBNAILER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22453,7 +21619,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29675,7 +28380,7 @@
+@@ -29511,7 +28214,7 @@
and FONT_CONTEXT_MENU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22462,7 +21628,7 @@
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
-@@ -29685,7 +28390,7 @@
+@@ -29521,7 +28224,7 @@
and FONT_CONTEXT_MENU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22471,7 +21637,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29786,7 +28491,7 @@
+@@ -29622,7 +28325,7 @@
and FONT_VIEW_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22480,7 +21646,7 @@
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
-@@ -29796,7 +28501,7 @@
+@@ -29632,7 +28335,7 @@
and FONT_VIEW_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22489,7 +21655,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -29826,7 +28531,7 @@
+@@ -29662,7 +28365,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22498,7 +21664,7 @@
ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -29979,7 +28684,7 @@
+@@ -29815,7 +28518,7 @@
and LIBEBOOK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22507,7 +21673,7 @@
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
-@@ -29989,7 +28694,7 @@
+@@ -29825,7 +28528,7 @@
and LIBEBOOK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22516,7 +21682,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -30111,7 +28816,7 @@
+@@ -29947,7 +28650,7 @@
and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22525,7 +21691,7 @@
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
-@@ -30121,7 +28826,7 @@
+@@ -29957,7 +28660,7 @@
and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22534,7 +21700,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -30158,7 +28863,7 @@
+@@ -29994,7 +28697,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22543,7 +21709,7 @@
ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30201,7 +28906,7 @@
+@@ -30037,7 +28740,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22552,7 +21718,7 @@
ac_cv_path_GDK_PIXBUF_CSOURCE_32="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30253,7 +28958,7 @@
+@@ -30089,7 +28792,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22561,7 +21727,7 @@
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30304,7 +29009,7 @@
+@@ -30140,7 +28843,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22570,7 +21736,7 @@
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30426,27 +29131,10 @@
+@@ -30262,27 +28965,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22602,38 +21768,7 @@
have_oss=yes
-@@ -30545,7 +29233,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$ALSA_PKG_ERRORS" >&5
-
-- { echo "$as_me:$LINENO: result: disabled" >&5
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: disabled" >&5
- echo "${ECHO_T}disabled" >&6; }
- elif test $pkg_failed = untried; then
- { echo "$as_me:$LINENO: result: disabled" >&5
-@@ -30644,7 +29334,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$ESD_PKG_ERRORS" >&5
-
-- { echo "$as_me:$LINENO: result: disabled" >&5
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: disabled" >&5
- echo "${ECHO_T}disabled" >&6; }
- elif test $pkg_failed = untried; then
- { echo "$as_me:$LINENO: result: disabled" >&5
-@@ -30764,6 +29456,8 @@
-
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- elif test $pkg_failed = untried; then
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -30883,7 +29577,7 @@
+@@ -30725,7 +29411,7 @@
and SOUND_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22642,7 +21777,7 @@
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
-@@ -30893,7 +29587,7 @@
+@@ -30735,7 +29421,7 @@
and SOUND_CAPPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -22651,7 +21786,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -30947,7 +29641,7 @@
+@@ -30789,7 +29475,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22660,7 +21795,7 @@
ac_cv_path_UPDATE_MIME_DATABASE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30988,7 +29682,7 @@
+@@ -30830,7 +29516,7 @@
@@ -22669,7 +21804,7 @@
cat >confcache <<\_ACEOF
-@@ -31140,13 +29834,6 @@
+@@ -30982,13 +29668,6 @@
ac_config_commands="$ac_config_commands po/stamp-it"
@@ -22683,7 +21818,7 @@
if test -z "${HAVE_XINPUT_TRUE}" && test -z "${HAVE_XINPUT_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_XINPUT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -31241,7 +29928,8 @@
+@@ -31083,7 +29762,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -22693,7 +21828,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -31250,10 +29938,13 @@
+@@ -31092,10 +29772,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -22710,7 +21845,7 @@
# PATH needs CR
-@@ -31477,19 +30168,28 @@
+@@ -31319,19 +30002,28 @@
as_mkdir_p=false
fi
@@ -22750,16 +21885,16 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -31505,7 +30205,7 @@
+@@ -31347,7 +30039,7 @@
# values after options handling.
ac_log="
- This file was extended by gnome-control-center $as_me 2.19.6, which was
+ This file was extended by gnome-control-center $as_me 2.20.0, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -31534,7 +30234,7 @@
+@@ -31376,7 +30068,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -22768,16 +21903,16 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -31558,7 +30258,7 @@
+@@ -31400,7 +30092,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gnome-control-center config.status 2.19.6
+ gnome-control-center config.status 2.20.0
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -31720,8 +30420,6 @@
+@@ -31560,8 +30252,6 @@
"gnome-settings-daemon/xrdb/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-settings-daemon/xrdb/Makefile" ;;
"help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
"libbackground/Makefile") CONFIG_FILES="$CONFIG_FILES libbackground/Makefile" ;;
@@ -22786,7 +21921,7 @@
"libsounds/Makefile") CONFIG_FILES="$CONFIG_FILES libsounds/Makefile" ;;
"libwindow-settings/Makefile") CONFIG_FILES="$CONFIG_FILES libwindow-settings/Makefile" ;;
"libwindow-settings/gnome-window-settings-2.0.pc") CONFIG_FILES="$CONFIG_FILES libwindow-settings/gnome-window-settings-2.0.pc" ;;
-@@ -31887,6 +30585,7 @@
+@@ -31727,6 +30417,7 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -22794,7 +21929,7 @@
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
-@@ -31894,7 +30593,6 @@
+@@ -31734,7 +30425,6 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
@@ -22802,7 +21937,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -31936,6 +30634,7 @@
+@@ -31776,6 +30466,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -22810,7 +21945,7 @@
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
CXXCPP!$CXXCPP$ac_delim
-@@ -32006,10 +30705,6 @@
+@@ -31843,10 +30534,6 @@
TYPING_BREAK!$TYPING_BREAK$ac_delim
SCREENSAVER_LIBS!$SCREENSAVER_LIBS$ac_delim
XF86MISC_LIBS!$XF86MISC_LIBS$ac_delim
@@ -22821,38 +21956,69 @@
CAPPLET_CFLAGS!$CAPPLET_CFLAGS$ac_delim
CAPPLET_LIBS!$CAPPLET_LIBS$ac_delim
GNOMECC_CFLAGS!$GNOMECC_CFLAGS$ac_delim
-@@ -32032,7 +30727,10 @@
+@@ -31869,10 +30556,13 @@
DEFAULT_APPLICATIONS_CAPPLET_LIBS!$DEFAULT_APPLICATIONS_CAPPLET_LIBS$ac_delim
METACITY_CFLAGS!$METACITY_CFLAGS$ac_delim
METACITY_LIBS!$METACITY_LIBS$ac_delim
+SLAB_CFLAGS!$SLAB_CFLAGS$ac_delim
+SLAB_LIBS!$SLAB_LIBS$ac_delim
TYPING_CFLAGS!$TYPING_CFLAGS$ac_delim
-+TYPING_LIBS!$TYPING_LIBS$ac_delim
+ TYPING_LIBS!$TYPING_LIBS$ac_delim
+ HAVE_XINPUT_TRUE!$HAVE_XINPUT_TRUE$ac_delim
+ HAVE_XINPUT_FALSE!$HAVE_XINPUT_FALSE$ac_delim
++FONT_CAPPLET_CFLAGS!$FONT_CAPPLET_CFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -32074,7 +30772,6 @@
+@@ -31914,7 +30604,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
--TYPING_LIBS!$TYPING_LIBS$ac_delim
- HAVE_XINPUT_TRUE!$HAVE_XINPUT_TRUE$ac_delim
- HAVE_XINPUT_FALSE!$HAVE_XINPUT_FALSE$ac_delim
- FONT_CAPPLET_CFLAGS!$FONT_CAPPLET_CFLAGS$ac_delim
-@@ -32154,7 +30851,7 @@
+-FONT_CAPPLET_CFLAGS!$FONT_CAPPLET_CFLAGS$ac_delim
+ FONT_CAPPLET_LIBS!$FONT_CAPPLET_LIBS$ac_delim
+ AT_CAPPLET_CFLAGS!$AT_CAPPLET_CFLAGS$ac_delim
+ AT_CAPPLET_LIBS!$AT_CAPPLET_LIBS$ac_delim
+@@ -31991,7 +30680,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Nur control-center-2.19.6/gnome-settings-daemon/actions/Makefile.in control-center-2.19.6.new/gnome-settings-daemon/actions/Makefile.in
---- control-center-2.19.6/gnome-settings-daemon/actions/Makefile.in 2007-07-30 23:12:46.000000000 +0200
-+++ control-center-2.19.6.new/gnome-settings-daemon/actions/Makefile.in 2007-08-03 10:25:11.000000000 +0200
-@@ -227,8 +227,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/gnome-doc-utils.make control-center-2.20.0/gnome-doc-utils.make
+--- control-center-2.20.0.old/gnome-doc-utils.make 2007-09-17 16:56:25.000000000 +0200
++++ control-center-2.20.0/gnome-doc-utils.make 2007-09-22 11:38:05.000000000 +0200
+@@ -416,6 +416,11 @@
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+ for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ if ! test -d "$(distdir)/$$docdir"; then \
++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
++ $(mkinstalldirs) "$(distdir)/$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+ done
+@@ -486,6 +491,12 @@
+ done
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
++ if ! test -d "$$docdir"; then \
++ echo "$(mkinstalldirs) $$docdir"; \
++ $(mkinstalldirs) "$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+ done
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/gnome-settings-daemon/actions/Makefile.in control-center-2.20.0/gnome-settings-daemon/actions/Makefile.in
+--- control-center-2.20.0.old/gnome-settings-daemon/actions/Makefile.in 2007-09-17 16:56:40.000000000 +0200
++++ control-center-2.20.0/gnome-settings-daemon/actions/Makefile.in 2007-09-22 11:38:35.000000000 +0200
+@@ -224,8 +224,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -22861,7 +22027,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -258,8 +256,11 @@
+@@ -255,8 +253,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -22873,10 +22039,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/gnome-settings-daemon/Makefile.in control-center-2.19.6.new/gnome-settings-daemon/Makefile.in
---- control-center-2.19.6/gnome-settings-daemon/Makefile.in 2007-07-30 23:12:46.000000000 +0200
-+++ control-center-2.19.6.new/gnome-settings-daemon/Makefile.in 2007-08-03 10:25:11.000000000 +0200
-@@ -261,8 +261,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/gnome-settings-daemon/Makefile.in control-center-2.20.0/gnome-settings-daemon/Makefile.in
+--- control-center-2.20.0.old/gnome-settings-daemon/Makefile.in 2007-09-17 16:56:40.000000000 +0200
++++ control-center-2.20.0/gnome-settings-daemon/Makefile.in 2007-09-22 11:38:35.000000000 +0200
+@@ -258,8 +258,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -22885,7 +22051,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -292,8 +290,11 @@
+@@ -289,8 +287,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -22897,10 +22063,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/gnome-settings-daemon/xrdb/Makefile.in control-center-2.19.6.new/gnome-settings-daemon/xrdb/Makefile.in
---- control-center-2.19.6/gnome-settings-daemon/xrdb/Makefile.in 2007-07-30 23:12:46.000000000 +0200
-+++ control-center-2.19.6.new/gnome-settings-daemon/xrdb/Makefile.in 2007-08-03 10:25:11.000000000 +0200
-@@ -185,8 +185,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/gnome-settings-daemon/xrdb/Makefile.in control-center-2.20.0/gnome-settings-daemon/xrdb/Makefile.in
+--- control-center-2.20.0.old/gnome-settings-daemon/xrdb/Makefile.in 2007-09-17 16:56:40.000000000 +0200
++++ control-center-2.20.0/gnome-settings-daemon/xrdb/Makefile.in 2007-09-22 11:38:35.000000000 +0200
+@@ -182,8 +182,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -22909,7 +22075,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -216,8 +214,11 @@
+@@ -213,8 +211,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -22921,10 +22087,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/help/Makefile.in control-center-2.19.6.new/help/Makefile.in
---- control-center-2.19.6/help/Makefile.in 2007-07-30 23:12:46.000000000 +0200
-+++ control-center-2.19.6.new/help/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -200,8 +200,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/help/Makefile.in control-center-2.20.0/help/Makefile.in
+--- control-center-2.20.0.old/help/Makefile.in 2007-09-17 16:56:40.000000000 +0200
++++ control-center-2.20.0/help/Makefile.in 2007-09-22 11:38:39.000000000 +0200
+@@ -197,8 +197,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -22933,7 +22099,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -231,8 +229,11 @@
+@@ -228,8 +226,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -22945,10 +22111,144 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/libbackground/Makefile.in control-center-2.19.6.new/libbackground/Makefile.in
---- control-center-2.19.6/libbackground/Makefile.in 2007-07-30 23:12:47.000000000 +0200
-+++ control-center-2.19.6.new/libbackground/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -194,8 +194,6 @@
+@@ -803,6 +804,11 @@
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+ for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ if ! test -d "$(distdir)/$$docdir"; then \
++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
++ $(mkinstalldirs) "$(distdir)/$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+ done
+@@ -871,6 +877,12 @@
+ done
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
++ if ! test -d "$$docdir"; then \
++ echo "$(mkinstalldirs) $$docdir"; \
++ $(mkinstalldirs) "$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+ done
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/intltool-extract.in control-center-2.20.0/intltool-extract.in
+--- control-center-2.20.0.old/intltool-extract.in 2007-09-17 16:56:25.000000000 +0200
++++ control-center-2.20.0/intltool-extract.in 2007-09-22 11:38:05.000000000 +0200
+@@ -32,7 +32,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-extract";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.36.0";
++my $VERSION = "0.36.2";
+
+ ## Loaded modules
+ use strict;
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/intltool-merge.in control-center-2.20.0/intltool-merge.in
+--- control-center-2.20.0.old/intltool-merge.in 2007-09-17 16:56:25.000000000 +0200
++++ control-center-2.20.0/intltool-merge.in 2007-09-22 11:38:05.000000000 +0200
+@@ -35,7 +35,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-merge";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.36.0";
++my $VERSION = "0.36.2";
+
+ ## Loaded modules
+ use strict;
+@@ -100,24 +100,13 @@
+ {
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+- return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
+ return 0;
+ }
+
+-sub isGNUGettextTool
++if (! isProgramInPath ("$iconv"))
+ {
+- my ($file) = @_;
+- # Check that we are using GNU gettext tools
+- if (isProgramInPath ($file)) {
+- my $version = `$file --version`;
+- return 1 if ($version =~ m/.*\(GNU .*\).*/);
+- }
+- return 0;
+-}
+-
+-if (! isGNUGettextTool ("$iconv"))
+-{
+- print STDERR " *** GNU iconv is not found on this system!\n".
++ print STDERR " *** iconv is not found on this system!\n".
+ " *** Without it, intltool-merge can not convert encodings.\n";
+ exit;
+ }
+@@ -286,8 +275,42 @@
+
+ sub gather_po_files
+ {
+- for my $po_file (glob "$PO_DIR/*.po") {
+- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ if (my $linguas = $ENV{"LINGUAS"})
++ {
++ for my $lang (split / /, $linguas) {
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++ else
++ {
++ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
++ {
++ while (<LINGUAS_FILE>)
++ {
++ next if /^#/;
++
++ if (/([-a-zA-Z_ at .]+)\n/)
++ {
++ my $lang = $1;
++
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++
++ close LINGUAS_FILE;
++ }
++ else
++ {
++ for my $po_file (glob "$PO_DIR/*.po") {
++ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ }
++ }
+ }
+ }
+
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/intltool-update.in control-center-2.20.0/intltool-update.in
+--- control-center-2.20.0.old/intltool-update.in 2007-09-17 16:56:25.000000000 +0200
++++ control-center-2.20.0/intltool-update.in 2007-09-22 11:38:05.000000000 +0200
+@@ -30,7 +30,7 @@
+
+ ## Release information
+ my $PROGRAM = "intltool-update";
+-my $VERSION = "0.36.0";
++my $VERSION = "0.36.2";
+ my $PACKAGE = "intltool";
+
+ ## Loaded modules
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/libbackground/Makefile.in control-center-2.20.0/libbackground/Makefile.in
+--- control-center-2.20.0.old/libbackground/Makefile.in 2007-09-17 16:56:40.000000000 +0200
++++ control-center-2.20.0/libbackground/Makefile.in 2007-09-22 11:38:39.000000000 +0200
+@@ -191,8 +191,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -22957,7 +22257,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -225,8 +223,11 @@
+@@ -222,8 +220,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -22969,10 +22269,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/libsounds/Makefile.in control-center-2.19.6.new/libsounds/Makefile.in
---- control-center-2.19.6/libsounds/Makefile.in 2007-07-30 23:12:47.000000000 +0200
-+++ control-center-2.19.6.new/libsounds/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -198,8 +198,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/libsounds/Makefile.in control-center-2.20.0/libsounds/Makefile.in
+--- control-center-2.20.0.old/libsounds/Makefile.in 2007-09-17 16:56:41.000000000 +0200
++++ control-center-2.20.0/libsounds/Makefile.in 2007-09-22 11:38:40.000000000 +0200
+@@ -195,8 +195,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -22981,7 +22281,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -229,8 +227,11 @@
+@@ -226,8 +224,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -22993,10 +22293,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/libwindow-settings/Makefile.in control-center-2.19.6.new/libwindow-settings/Makefile.in
---- control-center-2.19.6/libwindow-settings/Makefile.in 2007-08-03 10:24:52.000000000 +0200
-+++ control-center-2.19.6.new/libwindow-settings/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -229,8 +229,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/libwindow-settings/Makefile.in control-center-2.20.0/libwindow-settings/Makefile.in
+--- control-center-2.20.0.old/libwindow-settings/Makefile.in 2007-09-22 11:37:15.000000000 +0200
++++ control-center-2.20.0/libwindow-settings/Makefile.in 2007-09-22 11:38:40.000000000 +0200
+@@ -226,8 +226,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23005,7 +22305,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -260,8 +258,11 @@
+@@ -257,8 +255,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -23017,9 +22317,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/ltmain.sh control-center-2.19.6.new/ltmain.sh
---- control-center-2.19.6/ltmain.sh 2007-06-06 19:08:25.000000000 +0200
-+++ control-center-2.19.6.new/ltmain.sh 2007-07-11 23:11:42.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/ltmain.sh control-center-2.20.0/ltmain.sh
+--- control-center-2.20.0.old/ltmain.sh 2007-08-08 20:42:53.000000000 +0200
++++ control-center-2.20.0/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -23037,7 +22337,7 @@
PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.24 Debian 1.5.24-1"
++VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-# See if we are running on zsh, and set the options which allow our
@@ -23573,10 +22873,10 @@
All other options (arguments beginning with \`-') are ignored.
-diff -Nur control-center-2.19.6/Makefile.in control-center-2.19.6.new/Makefile.in
---- control-center-2.19.6/Makefile.in 2007-07-30 23:12:48.000000000 +0200
-+++ control-center-2.19.6.new/Makefile.in 2007-08-03 10:25:13.000000000 +0200
-@@ -203,8 +203,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/Makefile.in control-center-2.20.0/Makefile.in
+--- control-center-2.20.0.old/Makefile.in 2007-09-17 16:56:43.000000000 +0200
++++ control-center-2.20.0/Makefile.in 2007-09-22 11:38:42.000000000 +0200
+@@ -200,8 +200,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23585,7 +22885,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -234,8 +232,11 @@
+@@ -231,8 +229,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -23597,7 +22897,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -318,7 +319,7 @@
+@@ -315,7 +316,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -23606,10 +22906,10 @@
DISTCLEANFILES = \
gnome-doc-utils.make \
intltool-extract \
-diff -Nur control-center-2.19.6/schemas/Makefile.in control-center-2.19.6.new/schemas/Makefile.in
---- control-center-2.19.6/schemas/Makefile.in 2007-07-30 23:12:47.000000000 +0200
-+++ control-center-2.19.6.new/schemas/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -185,8 +185,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/schemas/Makefile.in control-center-2.20.0/schemas/Makefile.in
+--- control-center-2.20.0.old/schemas/Makefile.in 2007-09-17 16:56:41.000000000 +0200
++++ control-center-2.20.0/schemas/Makefile.in 2007-09-22 11:38:40.000000000 +0200
+@@ -182,8 +182,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23618,7 +22918,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -216,8 +214,11 @@
+@@ -213,8 +211,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -23630,9 +22930,9 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/shell/Makefile.in control-center-2.19.6.new/shell/Makefile.in
---- control-center-2.19.6/shell/Makefile.in 2007-07-30 23:12:47.000000000 +0200
-+++ control-center-2.19.6.new/shell/Makefile.in 2007-08-03 10:25:12.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/shell/Makefile.in control-center-2.20.0/shell/Makefile.in
+--- control-center-2.20.0.old/shell/Makefile.in 2007-09-17 16:56:41.000000000 +0200
++++ control-center-2.20.0/shell/Makefile.in 2007-09-22 11:38:40.000000000 +0200
@@ -54,7 +54,7 @@
gnome_control_center_OBJECTS = $(am_gnome_control_center_OBJECTS)
am__DEPENDENCIES_1 =
@@ -23642,7 +22942,7 @@
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -214,8 +214,6 @@
+@@ -211,8 +211,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23651,7 +22951,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -245,8 +243,11 @@
+@@ -242,8 +240,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -23663,7 +22963,7 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-@@ -330,7 +331,7 @@
+@@ -327,7 +328,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = \
@@ -23672,7 +22972,7 @@
$(GNOMECC_CFLAGS)
gnome_control_center_SOURCES = \
-@@ -338,7 +339,7 @@
+@@ -335,7 +336,7 @@
gnome_control_center_LDADD = \
$(GNOMECC_LIBS) \
@@ -23681,10 +22981,10 @@
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
-diff -Nur control-center-2.19.6/typing-break/Makefile.in control-center-2.19.6.new/typing-break/Makefile.in
---- control-center-2.19.6/typing-break/Makefile.in 2007-07-30 23:12:48.000000000 +0200
-+++ control-center-2.19.6.new/typing-break/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -220,8 +220,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/typing-break/Makefile.in control-center-2.20.0/typing-break/Makefile.in
+--- control-center-2.20.0.old/typing-break/Makefile.in 2007-09-17 16:56:41.000000000 +0200
++++ control-center-2.20.0/typing-break/Makefile.in 2007-09-22 11:38:40.000000000 +0200
+@@ -217,8 +217,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23693,7 +22993,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -251,8 +249,11 @@
+@@ -248,8 +246,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -23705,10 +23005,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/vfs-methods/fontilus/Makefile.in control-center-2.19.6.new/vfs-methods/fontilus/Makefile.in
---- control-center-2.19.6/vfs-methods/fontilus/Makefile.in 2007-07-30 23:12:48.000000000 +0200
-+++ control-center-2.19.6.new/vfs-methods/fontilus/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -242,8 +242,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/vfs-methods/fontilus/Makefile.in control-center-2.20.0/vfs-methods/fontilus/Makefile.in
+--- control-center-2.20.0.old/vfs-methods/fontilus/Makefile.in 2007-09-17 16:56:42.000000000 +0200
++++ control-center-2.20.0/vfs-methods/fontilus/Makefile.in 2007-09-22 11:38:41.000000000 +0200
+@@ -239,8 +239,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23717,7 +23017,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -273,8 +271,11 @@
+@@ -270,8 +268,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -23729,10 +23029,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/vfs-methods/Makefile.in control-center-2.19.6.new/vfs-methods/Makefile.in
---- control-center-2.19.6/vfs-methods/Makefile.in 2007-07-30 23:12:48.000000000 +0200
-+++ control-center-2.19.6.new/vfs-methods/Makefile.in 2007-08-03 10:25:12.000000000 +0200
-@@ -187,8 +187,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/vfs-methods/Makefile.in control-center-2.20.0/vfs-methods/Makefile.in
+--- control-center-2.20.0.old/vfs-methods/Makefile.in 2007-09-17 16:56:42.000000000 +0200
++++ control-center-2.20.0/vfs-methods/Makefile.in 2007-09-22 11:38:41.000000000 +0200
+@@ -184,8 +184,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23741,7 +23041,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -218,8 +216,11 @@
+@@ -215,8 +213,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
@@ -23753,10 +23053,10 @@
SOUND_CAPPLET_CFLAGS = @SOUND_CAPPLET_CFLAGS@
SOUND_CAPPLET_LIBS = @SOUND_CAPPLET_LIBS@
STRIP = @STRIP@
-diff -Nur control-center-2.19.6/vfs-methods/themus/Makefile.in control-center-2.19.6.new/vfs-methods/themus/Makefile.in
---- control-center-2.19.6/vfs-methods/themus/Makefile.in 2007-07-30 23:12:48.000000000 +0200
-+++ control-center-2.19.6.new/vfs-methods/themus/Makefile.in 2007-08-03 10:25:13.000000000 +0200
-@@ -253,8 +253,6 @@
+diff -x'*config.sub' -x'*config.guess' -Naur control-center-2.20.0.old/vfs-methods/themus/Makefile.in control-center-2.20.0/vfs-methods/themus/Makefile.in
+--- control-center-2.20.0.old/vfs-methods/themus/Makefile.in 2007-09-17 16:56:42.000000000 +0200
++++ control-center-2.20.0/vfs-methods/themus/Makefile.in 2007-09-22 11:38:41.000000000 +0200
+@@ -250,8 +250,6 @@
LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -23765,7 +23065,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -284,8 +282,11 @@
+@@ -281,8 +279,11 @@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SCREENSAVER_LIBS = @SCREENSAVER_LIBS@
Modified: desktop/unstable/control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/rules?rev=12706&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/rules (original)
+++ desktop/unstable/control-center/debian/rules Sat Sep 22 09:40:31 2007
@@ -7,7 +7,6 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := gnome-control-center
More information about the pkg-gnome-commits
mailing list