[Pkg-kde-commits] rev 2284 -
trunk/packages/kdeaccessibility/debian/patches
Josh Metzler
jdmetz-guest at costa.debian.org
Tue Nov 15 01:54:55 UTC 2005
Author: jdmetz-guest
Date: 2005-11-15 01:54:42 +0000 (Tue, 15 Nov 2005)
New Revision: 2284
Modified:
trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff
Log:
Update buildprep patch.
Modified: trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2005-11-15 01:50:12 UTC (rev 2283)
+++ trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2005-11-15 01:54:42 UTC (rev 2284)
@@ -2,7 +2,7 @@
# vi: ft=diff
--- acinclude.m4
+++ acinclude.m4
-@@ -1688,15 +1688,6 @@
+@@ -1689,15 +1689,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -18,7 +18,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2138,9 +2129,6 @@
+@@ -2144,9 +2135,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28,10 +28,33 @@
AC_TRY_COMPILE([
$2
],
-@@ -3288,39 +3276,39 @@
+@@ -3351,63 +3339,63 @@
- if test "x$GXX" = "xyes"; then
- kde_have_gcc_visibility=no
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+- AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+- if test "x$GXX" = "xyes"; then
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+- AC_EGREP_CPP(
+- [GCC visibility push],
+- [ #include <exception>
+- ],
+- [
+- AC_MSG_RESULT(yes)
+- kde_stdc_visibility_patched=yes ],
+- [
+- AC_MSG_RESULT(no)
+- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
+- visibility support. Disabling -fvisibility=hidden])
+-
+- kde_stdc_visibility_patched=no ])
+- AC_LANG_RESTORE
+-
+- kde_have_gcc_visibility=no
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
- kde_have_gcc_visibility=yes
@@ -58,13 +81,37 @@
- ]
- )
-
-- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- KDE_CHECK_VISIBILITY_GCC_BUG
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- fi
- ])
+- fi
++dnl AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++dnl
++dnl AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++dnl
++dnl if test "x$GXX" = "xyes"; then
++dnl AC_LANG_SAVE
++dnl AC_LANG_CPLUSPLUS
++dnl AC_EGREP_CPP(
++dnl [GCC visibility push],
++dnl [ #include <exception>
++dnl ],
++dnl [
++dnl AC_MSG_RESULT(yes)
++dnl kde_stdc_visibility_patched=yes ],
++dnl [
++dnl AC_MSG_RESULT(no)
++dnl AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
++dnl visibility support. Disabling -fvisibility=hidden])
++dnl
++dnl kde_stdc_visibility_patched=no ])
++dnl AC_LANG_RESTORE
++dnl
++dnl kde_have_gcc_visibility=no
+dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+dnl [
+dnl kde_have_gcc_visibility=yes
@@ -78,11 +125,11 @@
+dnl
+dnl AC_TRY_COMPILE(
+dnl [
-+dnl #include <qglobal.h>
-+dnl #if Q_EXPORT - 0 != 0
-+dnl /* if this compiles, then Q_EXPORT is undefined */
-+dnl /* if Q_EXPORT is nonempty, this will break compilation */
-+dnl #endif
++dnl#include <qglobal.h>
++dnl#if Q_EXPORT - 0 != 0
++dnl/* if this compiles, then Q_EXPORT is undefined */
++dnl/* if Q_EXPORT is nonempty, this will break compilation */
++dnl#endif
+dnl ], [/* elvis is alive */],
+dnl kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+dnl
@@ -91,25 +138,54 @@
+dnl ]
+dnl )
+dnl
-+dnl if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+dnl KDE_CHECK_VISIBILITY_GCC_BUG
+dnl HAVE_GCC_VISIBILITY=1
+dnl AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+dnl fi
+dnl ])
++dnl fi
+ ])
+
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],
+@@ -5907,30 +5895,15 @@
fi
])
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## 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.
++## 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.
-@@ -5795,6 +5783,7 @@
- ## the same distribution terms that you use for the rest of that program.
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
- # serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
-
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5854,7 +5843,7 @@
+@@ -5990,7 +5963,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -118,9 +194,107 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6268,12 +6257,11 @@
+@@ -6040,7 +6013,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+ # Same as above, but do not quote variable references.
+@@ -6060,7 +6033,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -6108,6 +6081,8 @@
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -6153,6 +6128,48 @@
+ ])# _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' >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' >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
+@@ -6225,15 +6242,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+@@ -6402,14 +6419,13 @@
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
*32-bit*)
- LINUX_64_MODE="32"
case $host in
@@ -132,7 +306,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6285,7 +6273,6 @@
+@@ -6421,7 +6437,6 @@
esac
;;
*64-bit*)
@@ -140,7 +314,47 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6415,7 +6402,7 @@
+@@ -6486,7 +6501,7 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6496,8 +6511,10 @@
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ 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
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+@@ -6523,11 +6540,16 @@
+ LDFLAGS="$LDFLAGS $3"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
+ else
+ $2=yes
+ fi
+@@ -6551,7 +6573,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -149,24 +363,52 @@
case $build_os in
msdosdjgpp*)
-@@ -6444,20 +6431,26 @@
+@@ -6580,20 +6602,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
+- *)
+ 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;
+ ;;
+
- *)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++ 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
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
@@ -181,7 +423,16 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6607,7 +6600,7 @@
+@@ -6689,7 +6744,7 @@
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+@@ -6743,7 +6798,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -190,7 +441,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6696,13 +6689,6 @@
+@@ -6832,20 +6887,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -204,12 +455,29 @@
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.
-@@ -6726,8 +6712,11 @@
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6857,13 +6905,18 @@
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -218,7 +486,18 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6844,7 +6833,7 @@
+@@ -6922,8 +6975,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ 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
++ 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 &&
+@@ -6980,7 +7033,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -227,7 +506,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6857,7 +6846,7 @@
+@@ -6993,7 +7046,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -236,7 +515,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6867,7 +6856,20 @@
+@@ -7003,7 +7056,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -258,7 +537,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6932,7 +6934,7 @@
+@@ -7068,7 +7134,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -267,8 +546,17 @@
;;
beos*)
-@@ -6957,7 +6959,7 @@
+@@ -7077,7 +7143,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7093,7 +7159,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -276,34 +564,85 @@
need_version=no
need_lib_prefix=no
-@@ -7022,7 +7024,7 @@
+@@ -7105,7 +7171,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -7135,7 +7202,7 @@
+ ;;
+ 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}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -7158,7 +7225,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7045,7 +7047,7 @@
+@@ -7181,7 +7248,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7105,7 +7107,7 @@
+@@ -7193,8 +7260,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++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*)
+@@ -7212,7 +7288,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.[01]* | freebsdelf3.[01]*)
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -7239,9 +7315,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7120,7 +7122,7 @@
+@@ -7256,7 +7332,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -312,7 +651,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7131,7 +7133,7 @@
+@@ -7267,7 +7343,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -321,7 +660,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7193,22 +7195,19 @@
+@@ -7329,22 +7405,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -343,14 +682,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7218,6 +7217,30 @@
+@@ -7354,6 +7427,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -381,7 +720,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7227,7 +7250,7 @@
+@@ -7363,7 +7460,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -390,16 +729,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7256,7 +7279,7 @@
+@@ -7392,7 +7489,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7276,7 +7299,7 @@
+@@ -7412,7 +7513,7 @@
os2*)
libname_spec='$name'
@@ -408,9 +751,80 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7867,31 +7890,23 @@
+@@ -7558,7 +7659,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+@@ -7620,7 +7723,7 @@
+
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -7794,7 +7897,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -7904,7 +8007,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -7936,7 +8039,7 @@
+ 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 ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -7963,6 +8066,15 @@
+ *) 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='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+
+
+@@ -7996,44 +8108,36 @@
+ lt_cv_deplibs_check_method=pass_all
;;
+-bsdi4*)
++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*)
- lt_cv_deplibs_check_method=pass_all
+ # func_win32_libid is a shell function defined in ltmain.sh
@@ -444,12 +858,28 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7930,42 +7945,21 @@
+ # 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)/i[[3-9]]86 (compact )?demand paged shared library'
++ 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.*`
+ ;;
+@@ -8049,7 +8153,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -8066,42 +8170,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -499,9 +929,21 @@
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
-@@ -7994,9 +7988,6 @@
+@@ -8120,19 +8203,14 @@
;;
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -509,7 +951,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8006,7 +7997,6 @@
+@@ -8142,7 +8220,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -517,7 +959,83 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8272,7 +8262,7 @@
+@@ -8250,13 +8327,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+@@ -8275,13 +8352,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!). If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -8319,10 +8396,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -8395,6 +8483,10 @@
+
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -8408,7 +8500,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -526,7 +1044,16 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8322,7 +8312,7 @@
+@@ -8449,7 +8541,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -8458,48 +8550,11 @@
fi
;;
@@ -535,62 +1062,87 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8332,29 +8322,29 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8362,8 +8352,8 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+ fi
+ ;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8471,8 +8461,8 @@
+@@ -8524,7 +8579,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -8553,7 +8608,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -8568,6 +8623,10 @@
+ # 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
+@@ -8589,7 +8648,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -8607,8 +8666,8 @@
# 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
@@ -601,7 +1153,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8498,7 +8488,7 @@
+@@ -8634,7 +8693,7 @@
# 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.
@@ -610,7 +1162,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8528,8 +8518,22 @@
+@@ -8664,8 +8723,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -635,7 +1187,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8575,15 +8579,16 @@
+@@ -8682,7 +8755,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -8703,6 +8776,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -8711,15 +8787,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -656,7 +1227,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8592,13 +8597,12 @@
+@@ -8728,13 +8805,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -672,16 +1243,23 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8613,7 +8617,7 @@
+@@ -8748,8 +8824,8 @@
+ # Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -8630,12 +8634,12 @@
+@@ -8762,16 +8838,17 @@
+ esac
+ ;;
+
++
+ 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'
@@ -696,7 +1274,7 @@
# 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
-@@ -8644,7 +8648,7 @@
+@@ -8780,70 +8857,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -705,87 +1283,170 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8655,20 +8659,20 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+ ;;
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
fi
- ;;
- esac
-@@ -8678,19 +8682,19 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8725,7 +8729,7 @@
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -8854,14 +8942,14 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8747,7 +8751,7 @@
+@@ -8878,12 +8966,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aCC)
+- aCC)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8756,11 +8760,11 @@
+@@ -8892,11 +8980,11 @@
# 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 -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -794,7 +1455,38 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8817,7 +8821,7 @@
+@@ -8906,7 +8994,7 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -8922,7 +9010,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -8943,17 +9031,17 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- case "$host_cpu" in
++ aCC*)
++ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -803,7 +1495,13 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8838,7 +8842,7 @@
+@@ -8969,12 +9057,12 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*|hppa*64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -812,28 +1510,38 @@
;;
esac
fi
-@@ -8853,7 +8857,7 @@
+@@ -8987,9 +9075,9 @@
+ ;;
+ irix5* | irix6*)
case $cc_basename in
- CC)
+- CC)
++ CC*)
# SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _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 ${objdir}/so_locations -o $lib'
++ _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'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8864,9 +8868,9 @@
+@@ -9000,9 +9088,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $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}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $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'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8883,8 +8887,8 @@
+@@ -9013,14 +9101,14 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -844,19 +1552,49 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8906,16 +8910,16 @@
+@@ -9038,20 +9126,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
# Intel C++
with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ _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 ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _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 ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+- cxx)
++ pgCC*)
++ # 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'
++
++ _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'
++ ;;
++ cxx*)
# Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -865,8 +1603,17 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8953,7 +8957,7 @@
+@@ -9079,7 +9191,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
+@@ -9089,7 +9201,7 @@
+ ;;
esac
;;
- netbsd*)
@@ -874,7 +1621,32 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8972,7 +8976,7 @@
+@@ -9100,15 +9212,31 @@
+ # 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
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_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
++ output_verbose_link_cmd='echo'
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -883,25 +1655,41 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8989,7 +8993,7 @@
+@@ -9118,14 +9246,14 @@
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _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 ${objdir}/so_locations -o $lib'
++ _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'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9143,7 +9271,7 @@
*)
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} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _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}${objdir}/so_locations -o $lib'
++ _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9032,7 +9036,7 @@
+@@ -9162,13 +9290,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -910,50 +1698,123 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9048,10 +9052,10 @@
+@@ -9177,17 +9305,17 @@
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $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 $objdir/so_locations -o $lib~
++ $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'
-@@ -9070,7 +9074,7 @@
+@@ -9206,7 +9334,7 @@
*)
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} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _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}${objdir}/so_locations -o $lib'
++ _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)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9127,9 +9131,9 @@
- CC)
+@@ -9230,7 +9358,7 @@
+ sco*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -9242,12 +9370,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9260,36 +9388,33 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _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} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9163,7 +9167,7 @@
+ case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The C++ compiler is used as linker so we must use $wl
+ # flag to pass the commands to the underlying system
+- # linker.
++ # linker. We must also pass each convience library through
++ # to the system linker between allextract/defaultextract.
++ # The C++ compiler will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -9297,9 +9422,9 @@
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
- gcx)
+- gcx)
++ gcx*)
# Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9173,9 +9177,9 @@
+@@ -9309,9 +9434,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -965,7 +1826,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9184,9 +9188,9 @@
+@@ -9320,9 +9445,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -977,7 +1838,25 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9354,7 +9358,7 @@
+@@ -9340,7 +9465,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9450,7 +9575,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -9490,7 +9615,7 @@
fi
;;
@@ -986,16 +1865,115 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9463,7 +9467,7 @@
+@@ -9526,6 +9651,21 @@
+
+ $rm -f confest.$objext
+
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++ case $cc_basename in
++ CC*)
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ ;;
++ esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -9576,12 +9716,16 @@
+ # 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"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -9591,7 +9735,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -9599,8 +9743,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
+- test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
;;
esac
-@@ -9605,11 +9609,12 @@
+ AC_MSG_RESULT([$enable_shared])
+@@ -9651,20 +9797,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\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"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -9711,11 +9864,16 @@
+ # 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"
+ 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
+
+ AC_LIBTOOL_CONFIG($1)
+@@ -9741,11 +9899,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1010,7 +1988,7 @@
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 \
-@@ -9659,7 +9664,7 @@
+@@ -9795,7 +9954,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1019,7 +1997,34 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9790,7 +9795,7 @@
+@@ -9861,11 +10020,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -9896,6 +10055,12 @@
+ # 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
+@@ -9926,7 +10091,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1028,7 +2033,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9821,7 +9826,7 @@
+@@ -9957,7 +10122,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1037,7 +2042,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10065,7 +10070,10 @@
+@@ -9972,7 +10137,7 @@
+ # 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 ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -10201,7 +10366,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -1049,7 +2063,31 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10138,7 +10146,7 @@
+@@ -10243,9 +10411,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -10267,6 +10432,13 @@
+ 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'"
+ ;;
++linux*)
++ 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'"
++ 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'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+@@ -10274,7 +10446,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1058,7 +2096,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10156,7 +10164,7 @@
+@@ -10292,14 +10464,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1067,26 +2105,133 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10371,7 +10379,7 @@
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -10463,7 +10638,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -10488,18 +10663,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ 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
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -10507,22 +10692,22 @@
+ ;;
esac
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10422,7 +10430,7 @@
+ case $cc_basename in
+- CC)
++ CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+- aCC)
++ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -10537,7 +10722,7 @@
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -10548,18 +10733,24 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ _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'
- ;;
+- cxx)
+ ;;
- cxx)
++ pgCC*)
++ # Portland Group C++ compiler.
++ _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'
++ ;;
++ cxx*)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10447,7 +10455,7 @@
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -10576,25 +10767,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
;;
+ *)
+ ;;
esac
;;
- netbsd*)
@@ -1094,17 +2239,175 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10758,6 +10766,9 @@
+- KCC)
++ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -10610,7 +10801,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ *)
+@@ -10619,13 +10810,13 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+@@ -10635,12 +10826,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -10650,7 +10841,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+@@ -10721,7 +10912,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -10747,6 +10938,16 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_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
+@@ -10758,7 +10959,7 @@
+ _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
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -10782,12 +10983,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ 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.
+@@ -10808,9 +11016,14 @@
+ ;;
+
+ solaris*)
+- _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'
++ 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
+ ;;
+
+ sunos4*)
+@@ -10832,6 +11045,11 @@
+ fi
+ ;;
+
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10859,7 +11077,7 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -10892,7 +11110,10 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
+ linux*)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -10782,7 +10793,7 @@
+@@ -10918,7 +11139,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1113,7 +2416,45 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10856,7 +10867,7 @@
+@@ -10935,7 +11156,8 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
+-
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -10955,6 +11177,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ _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
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -10992,7 +11235,7 @@
_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
@@ -1122,7 +2463,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10866,13 +10877,13 @@
+@@ -11002,13 +11245,13 @@
# _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'
@@ -1130,7 +2471,8 @@
+ _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 '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _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'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -1138,18 +2480,51 @@
# 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
-@@ -10881,19 +10892,19 @@
+@@ -11017,19 +11260,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
- ld_shlibs=no
+- ld_shlibs=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd*)
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ _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'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _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'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -1162,7 +2537,7 @@
fi
;;
-@@ -10911,8 +10922,8 @@
+@@ -11047,8 +11322,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1173,36 +2548,8 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10925,10 +10936,36 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
+@@ -11063,24 +11338,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-+ fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -1212,7 +2559,28 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10978,9 +11015,20 @@
+ ;;
+ esac
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+- 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'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $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
++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++ runpath_var=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -11114,9 +11384,20 @@
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
@@ -1235,7 +2603,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11026,29 +11074,29 @@
+@@ -11133,7 +11414,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -11154,6 +11435,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -11162,29 +11446,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1274,16 +2661,27 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11063,7 +11111,7 @@
+@@ -11198,8 +11482,8 @@
+ # Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -11086,13 +11134,13 @@
+@@ -11212,7 +11496,7 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+- bsdi4*)
++ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+@@ -11222,69 +11506,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1300,88 +2698,117 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -11106,21 +11154,21 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -11129,26 +11177,26 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
;;
dgux*)
-@@ -11181,8 +11229,8 @@
+@@ -11317,8 +11601,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ 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
-@@ -11190,7 +11238,7 @@
+@@ -11326,7 +11610,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1390,9 +2817,12 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11208,10 +11256,10 @@
+@@ -11342,16 +11626,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1403,7 +2833,21 @@
;;
esac
else
-@@ -11258,7 +11306,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -11361,7 +11645,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -11394,7 +11678,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1412,7 +2856,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11268,7 +11316,7 @@
+@@ -11404,7 +11688,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1421,16 +2865,17 @@
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
else
-@@ -11291,7 +11339,7 @@
+@@ -11427,7 +11711,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11301,7 +11349,7 @@
+@@ -11437,7 +11722,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1439,7 +2884,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11312,14 +11360,14 @@
+@@ -11448,14 +11733,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1456,7 +2901,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11331,7 +11379,7 @@
+@@ -11467,13 +11752,13 @@
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}\*'
@@ -1465,19 +2910,50 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11356,9 +11404,9 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -11492,10 +11777,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $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 -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_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~
-@@ -11378,7 +11426,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -11504,8 +11791,18 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -11514,7 +11811,7 @@
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.
@@ -1486,7 +2962,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11438,9 +11486,9 @@
+@@ -11574,9 +11871,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1498,7 +2974,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11498,7 +11546,7 @@
+@@ -11634,7 +11931,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1507,57 +2983,18 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11657,8 +11705,8 @@
- fi
- done
- done
--])
- SED=$lt_cv_path_SED
-+])
- AC_MSG_RESULT([$SED])
- ])
-
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
-
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# 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.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+@@ -11768,7 +12065,7 @@
+ # 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 && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--- config.h.in
+++ config.h.in
-@@ -269,9 +269,6 @@
+@@ -293,9 +293,6 @@
#endif
@@ -1569,16 +3006,35 @@
#define __svr4__ 1
--- configure
+++ configure
+@@ -278,15 +278,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM include_ksayit_audio_plugins_TRUE include_ksayit_audio_plugins_FALSE PKGCONFIGFOUND PKG_CONFIG GST_CFLAGS GST_LIBS CFLAGS_GST LDADD_GST LDFLAGS_GST include_kttsd_gstplayer_TRUE include_kttsd_gstplayer_FALSE KTTS_KSPEECH_DIR KTTS_KSPEECH_INCLUDE KTTS_COMPAT_DIR include_kttsd_command_TRUE include_kttsd_command_FALSE epos_bindir include_kttsd_epos_TRUE include_kttsd_epos_FALSE festival_bindir include_kttsd_festivalint_TRUE include_kttsd_festivalint_FALSE flite_bindir include_kttsd_flite_TRUE include_kttsd_flite_FALSE freetts_bindir include_kttsd_freetts_TRUE include_kttsd_freetts_FALSE hadifix_mbrola_bin hadifix_txt2pho_bin include_kttsd_hadifix_TRUE include_kttsd_hadifix_FALSE TOPSUBDIRS IconThemes_SUBDIR_included_TRUE IconThemes_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kbstateapplet_SUBDIR_included_TRUE kbstateapplet_SUBDIR_included_FALSE kmag_SUBDIR_included_TRUE kmag_SUBDIR_included_FALSE kmousetool_SUBDIR_included_TRUE kmousetool_SUBDIR_included_FALSE kmouth_SUBDIR_included_TRUE kmouth_SUBDIR_included_FALSE ksayit_SUBDIR_included_TRUE ksayit_SUBDIR_included_FALSE kttsd_SUBDIR_included_TRUE kttsd_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM include_ksayit_audio_plugins_TRUE include_ksayit_audio_plugins_FALSE PKGCONFIGFOUND PKG_CONFIG GST_CFLAGS GST_LIBS CFLAGS_GST LDADD_GST LDFLAGS_GST include_kttsd_gstplayer_TRUE include_kttsd_gstplayer_FALSE KTTS_KSPEECH_DIR KTTS_KSPEECH_INCLUDE KTTS_COMPAT_DIR include_kttsd_command_TRUE include_kttsd_command_FALSE epos_bindir include_kttsd_epos_TRUE include_kttsd_epos_FALSE festival_bindir include_kttsd_festivalint_TRUE include_kttsd_festivalint_FALSE flite_bindir include_kttsd_flite_TRUE include_kttsd_flite_FALSE freetts_bindir include_kttsd_freetts_TRUE include_kttsd_freetts_FALSE hadifix_mbrola_bin hadifix_txt2pho_bin include_kttsd_hadifix_TRUE include_kttsd_hadifix_FALSE TOPSUBDIRS IconThemes_SUBDIR_included_TRUE IconThemes_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kbstateapplet_SUBDIR_included_TRUE kbstateapplet_SUBDIR_included_FALSE kmag_SUBDIR_included_TRUE kmag_SUBDIR_included_FALSE kmousetool_SUBDIR_included_TRUE kmousetool_SUBDIR_included_FALSE kmouth_SUBDIR_included_TRUE kmouth_SUBDIR_included_FALSE ksayit_SUBDIR_included_TRUE ksayit_SUBDIR_included_FALSE kttsd_SUBDIR_included_TRUE kttsd_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM KTTS_KSPEECH_DIR KTTS_KSPEECH_INCLUDE KTTS_INTERFACES_DIR include_ksayit_audio_plugins_TRUE include_ksayit_audio_plugins_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_kttsd_gstplayer_TRUE include_kttsd_gstplayer_FALSE include_kttsd_artsplayer_TRUE include_kttsd_artsplayer_FALSE LIBASOUND ARTS_LIBASOUND include_kttsd_alsaplayer_TRUE include_kttsd_alsaplayer_FALSE AKODE_CONFIG akode_includes akode_libs include_kttsd_akodeplayer_TRUE include_kttsd_akodeplayer_FALSE KTTS_ICONS_DIR include_kttsd_command_TRUE include_kttsd_command_FALSE epos_bindir include_kttsd_epos_TRUE include_kttsd_epos_FALSE festival_bindir include_kttsd_festivalint_TRUE include_kttsd_festivalint_FALSE flite_bindir include_kttsd_flite_TRUE include_kttsd_flite_FALSE freetts_bindir include_kttsd_freetts_TRUE include_kttsd_freetts_FALSE hadifix_mbrola_bin hadifix_txt2pho_bin include_kttsd_hadifix_TRUE include_kttsd_hadifix_FALSE TOPSUBDIRS IconThemes_SUBDIR_included_TRUE IconThemes_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kbstateapplet_SUBDIR_included_TRUE kbstateapplet_SUBDIR_included_FALSE kmag_SUBDIR_included_TRUE kmag_SUBDIR_included_FALSE kmousetool_SUBDIR_included_TRUE kmousetool_SUBDIR_included_FALSE kmouth_SUBDIR_included_TRUE kmouth_SUBDIR_included_FALSE ksayit_SUBDIR_included_TRUE ksayit_SUBDIR_included_FALSE kttsd_SUBDIR_included_TRUE kttsd_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM KTTS_KSPEECH_DIR KTTS_KSPEECH_INCLUDE KTTS_INTERFACES_DIR include_ksayit_audio_plugins_TRUE include_ksayit_audio_plugins_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_kttsd_gstplayer_TRUE include_kttsd_gstplayer_FALSE include_kttsd_artsplayer_TRUE include_kttsd_artsplayer_FALSE LIBASOUND ARTS_LIBASOUND include_kttsd_alsaplayer_TRUE include_kttsd_alsaplayer_FALSE AKODE_CONFIG akode_includes akode_libs include_kttsd_akodeplayer_TRUE include_kttsd_akodeplayer_FALSE KTTS_ICONS_DIR include_kttsd_command_TRUE include_kttsd_command_FALSE epos_bindir include_kttsd_epos_TRUE include_kttsd_epos_FALSE festival_bindir include_kttsd_festivalint_TRUE include_kttsd_festivalint_FALSE flite_bindir include_kttsd_flite_TRUE include_kttsd_flite_FALSE freetts_bindir include_kttsd_freetts_TRUE include_kttsd_freetts_FALSE hadifix_mbrola_bin hadifix_txt2pho_bin include_kttsd_hadifix_TRUE include_kttsd_hadifix_FALSE TOPSUBDIRS IconThemes_SUBDIR_included_TRUE IconThemes_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kbstateapplet_SUBDIR_included_TRUE kbstateapplet_SUBDIR_included_FALSE kmag_SUBDIR_included_TRUE kmag_SUBDIR_included_FALSE kmousetool_SUBDIR_included_TRUE kmousetool_SUBDIR_included_FALSE kmouth_SUBDIR_included_TRUE kmouth_SUBDIR_included_FALSE ksayit_SUBDIR_included_TRUE ksayit_SUBDIR_included_FALSE kttsd_SUBDIR_included_TRUE kttsd_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
-@@ -1029,6 +1029,8 @@
+@@ -1025,6 +1025,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -1587,7 +3043,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1197,7 +1199,7 @@
+@@ -1193,7 +1195,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -1596,7 +3052,7 @@
done
fi
-@@ -2100,6 +2102,31 @@
+@@ -2096,6 +2098,31 @@
@@ -1628,7 +3084,7 @@
unset CDPATH
-@@ -3033,8 +3060,7 @@
+@@ -3029,8 +3056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1638,7 +3094,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3092,8 +3118,7 @@
+@@ -3088,8 +3114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1648,7 +3104,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3209,8 +3234,7 @@
+@@ -3205,8 +3230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1658,7 +3114,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3264,8 +3288,7 @@
+@@ -3260,8 +3284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1668,7 +3124,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3310,8 +3333,7 @@
+@@ -3306,8 +3329,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1678,7 +3134,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3355,8 +3377,7 @@
+@@ -3351,8 +3373,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1688,7 +3144,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3913,8 +3934,7 @@
+@@ -3909,8 +3930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1698,7 +3154,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3972,8 +3992,7 @@
+@@ -3968,8 +3988,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1708,7 +3164,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4044,8 +4063,7 @@
+@@ -4040,8 +4059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1718,7 +3174,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4089,8 +4107,7 @@
+@@ -4085,8 +4103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1728,7 +3184,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4268,8 +4285,7 @@
+@@ -4264,8 +4281,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1738,7 +3194,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4380,8 +4396,7 @@
+@@ -4376,8 +4392,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1748,7 +3204,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4469,8 +4484,7 @@
+@@ -4465,8 +4480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1758,7 +3214,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4572,8 +4586,7 @@
+@@ -4568,8 +4582,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1768,7 +3224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4672,8 +4685,7 @@
+@@ -4668,8 +4681,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1778,7 +3234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4757,8 +4769,7 @@
+@@ -4753,8 +4765,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1788,7 +3244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4847,8 +4858,7 @@
+@@ -4843,8 +4854,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1798,7 +3254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4935,8 +4945,7 @@
+@@ -4931,8 +4941,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1808,7 +3264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5023,8 +5032,7 @@
+@@ -5019,8 +5028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1818,7 +3274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5130,8 +5138,7 @@
+@@ -5126,8 +5134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1828,7 +3284,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5218,8 +5225,7 @@
+@@ -5214,8 +5221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1838,7 +3294,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5306,8 +5312,7 @@
+@@ -5302,8 +5308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1848,7 +3304,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5394,8 +5399,7 @@
+@@ -5390,8 +5395,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1858,7 +3314,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5526,8 +5530,7 @@
+@@ -5522,8 +5526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1868,7 +3324,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5615,8 +5618,7 @@
+@@ -5611,8 +5614,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1878,7 +3334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5703,8 +5705,7 @@
+@@ -5699,8 +5701,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1888,7 +3344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5791,8 +5792,7 @@
+@@ -5787,8 +5788,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1898,7 +3354,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5879,8 +5879,7 @@
+@@ -5875,8 +5875,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1908,7 +3364,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5967,8 +5966,7 @@
+@@ -5963,8 +5962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1918,7 +3374,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6391,8 +6389,7 @@
+@@ -6387,8 +6385,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1928,7 +3384,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6518,8 +6515,7 @@
+@@ -6514,8 +6511,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1938,7 +3394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6607,8 +6603,7 @@
+@@ -6603,8 +6599,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1948,7 +3404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6691,185 +6686,6 @@
+@@ -6687,185 +6682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -2134,19 +3590,58 @@
fi
-@@ -7058,10 +6874,10 @@
- fi
- done
- done
-+SED=$lt_cv_path_SED
+@@ -7029,7 +6845,7 @@
+ # 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 && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -7134,7 +6950,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -7168,7 +6984,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -7198,6 +7014,15 @@
+ *) 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='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
- fi
+ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+@@ -7284,44 +7109,36 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
--SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
-
-@@ -7295,31 +7111,23 @@
+-bsdi4*)
++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*)
@@ -2181,12 +3676,28 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7358,42 +7166,21 @@
+ # 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)/i[3-9]86 (compact )?demand paged shared library'
++ 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.*`
+ ;;
+@@ -7337,7 +7154,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -7354,42 +7171,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2236,9 +3747,21 @@
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
-@@ -7422,9 +7209,6 @@
+@@ -7408,19 +7204,14 @@
;;
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -2246,7 +3769,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7434,7 +7218,6 @@
+@@ -7430,7 +7221,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2254,18 +3777,21 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7511,7 +7294,7 @@
+@@ -7507,7 +7297,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7514 "configure"' > conftest.$ac_ext
-+ echo '#line 7297 "configure"' > conftest.$ac_ext
+- echo '#line 7510 "configure"' > conftest.$ac_ext
++ echo '#line 7300 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7556,12 +7339,11 @@
+@@ -7550,14 +7340,13 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- case "`/usr/bin/file conftest.o`" in
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
*32-bit*)
- LINUX_64_MODE="32"
case $host in
@@ -2277,7 +3803,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7573,7 +7355,6 @@
+@@ -7569,7 +7358,6 @@
esac
;;
*64-bit*)
@@ -2285,7 +3811,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7633,8 +7414,7 @@
+@@ -7629,8 +7417,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2295,7 +3821,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7709,8 +7489,7 @@
+@@ -7705,8 +7492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2305,7 +3831,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7880,8 +7659,7 @@
+@@ -7876,8 +7662,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2315,7 +3841,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7948,8 +7726,7 @@
+@@ -7944,8 +7729,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2325,16 +3851,260 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8156,7 +7933,7 @@
+@@ -8060,6 +7844,243 @@
+ done
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++if test -z "$CXXCPP"; then
++ if test "${ac_cv_prog_CXXCPP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Double quotes because CXXCPP needs to be expanded
++ for CXXCPP in "$CXX -E" "/lib/cpp"
++ do
++ ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether non-existent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ # Broken: success on invalid input.
++continue
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ break
++fi
++
++ done
++ ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++ CXXCPP=$ac_cv_prog_CXXCPP
++else
++ ac_cv_prog_CXXCPP=$CXXCPP
++fi
++echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether non-existent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ # Broken: success on invalid input.
++continue
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ :
++else
++ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++fi
++
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -8152,7 +8173,7 @@
+
+
# Provide some information about the compiler.
--echo "$as_me:8159:" \
-+echo "$as_me:7936:" \
+-echo "$as_me:8155:" \
++echo "$as_me:8176:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8202,8 +7979,7 @@
+@@ -8198,8 +8219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2344,7 +4114,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8252,8 +8028,7 @@
+@@ -8248,8 +8268,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2354,7 +4124,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8311,7 +8086,7 @@
+@@ -8307,7 +8326,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -2363,24 +4133,52 @@
case $build_os in
msdosdjgpp*)
-@@ -8340,20 +8115,26 @@
+@@ -8336,20 +8355,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
+- *)
+ 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;
+ ;;
+
- *)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++ 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
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
@@ -2395,7 +4193,31 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8421,7 +8202,7 @@
+@@ -8386,9 +8438,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -8410,6 +8459,13 @@
+ 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'"
+ ;;
++linux*)
++ 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'"
++ 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'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[BCDEGRST]'
+ ;;
+@@ -8417,7 +8473,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -2404,7 +4226,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8439,7 +8220,7 @@
+@@ -8435,14 +8491,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2413,35 +4235,256 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9188,11 +8969,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -8604,7 +8663,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+
+ # Same as above, but do not quote variable references.
+@@ -8624,7 +8683,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -8909,6 +8968,17 @@
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -8934,7 +9004,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -8996,7 +9066,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -9095,6 +9165,20 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -9131,11 +9215,16 @@
+ LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works=yes
++ fi
+ else
+ lt_prog_compiler_static_works=yes
+ fi
+@@ -9181,18 +9270,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9191: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8972: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9187: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9276: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9195: \$? = $ac_status" >&5
-+ echo "$as_me:8976: \$? = $ac_status" >&5
+- echo "$as_me:9191: \$? = $ac_status" >&5
++ echo "$as_me:9280: \$? = $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
-@@ -9421,11 +9202,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+ fi
+ fi
+@@ -9269,7 +9360,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -9295,6 +9386,16 @@
+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic='-qnocommon'
++ lt_prog_compiler_wl='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -9306,7 +9407,7 @@
+ lt_prog_compiler_wl='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -9330,12 +9431,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fpic'
++ lt_prog_compiler_static='-Bstatic'
++ ;;
+ ccc*)
+ lt_prog_compiler_wl='-Wl,'
+ # All Alpha code is PIC.
+@@ -9356,9 +9464,14 @@
+ ;;
+
+ solaris*)
+- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ lt_prog_compiler_wl='-Qoption ld ';;
++ *)
++ lt_prog_compiler_wl='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -9380,6 +9493,11 @@
+ fi
+ ;;
+
++ unicos*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_can_build_shared=no
++ ;;
++
+ uts4*)
+ lt_prog_compiler_pic='-pic'
+ lt_prog_compiler_static='-Bstatic'
+@@ -9414,18 +9532,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9424: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9420: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9538: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9428: \$? = $ac_status" >&5
-+ echo "$as_me:9209: \$? = $ac_status" >&5
+- echo "$as_me:9424: \$? = $ac_status" >&5
++ echo "$as_me:9542: \$? = $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
-@@ -9472,13 +9253,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works=yes
+ fi
+ fi
+@@ -9446,7 +9566,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+@@ -9468,38 +9588,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2455,26 +4498,35 @@
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.
-@@ -9488,11 +9262,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9491: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9265: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9487: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9600: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9495: \$? = $ac_status" >&5
-+ echo "$as_me:9269: \$? = $ac_status" >&5
+- echo "$as_me:9491: \$? = $ac_status" >&5
++ echo "$as_me:9604: \$? = $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
-@@ -9502,8 +9276,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -2483,7 +4535,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9631,7 +9408,7 @@
+@@ -9570,6 +9688,16 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
++ # Just being paranoid about ensuring that cc_basename is set.
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -9590,6 +9718,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ whole_archive_flag_spec=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -9627,7 +9776,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -2492,7 +4589,7 @@
else
ld_shlibs=no
fi
-@@ -9641,13 +9418,13 @@
+@@ -9637,13 +9786,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -2500,7 +4597,8 @@
+ allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -2508,12 +4606,44 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9656,19 +9433,19 @@
+@@ -9652,19 +9801,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ else
++ ld_shlibs=no
++ fi
++ ;;
++
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ link_all_deplibs=no
else
ld_shlibs=no
fi
@@ -2532,7 +4662,7 @@
fi
;;
-@@ -9686,8 +9463,8 @@
+@@ -9682,8 +9863,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2543,36 +4673,8 @@
else
ld_shlibs=no
fi
-@@ -9700,10 +9477,36 @@
- hardcode_shlibpath_var=no
- ;;
+@@ -9698,24 +9879,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_cmds="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds="$tmp_archive_cmds"
-+ fi
-+ link_all_deplibs=no
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -2582,7 +4684,28 @@
else
ld_shlibs=no
fi
-@@ -9753,9 +9556,20 @@
+ ;;
+ esac
+
+- if test "$ld_shlibs" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec=
+- fi
++ if test "$ld_shlibs" = no; then
++ runpath_var=
++ hardcode_libdir_flag_spec=
++ export_dynamic_flag_spec=
++ whole_archive_flag_spec=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -9749,9 +9925,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -2605,7 +4728,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9801,21 +9615,22 @@
+@@ -9768,7 +9955,7 @@
+ link_all_deplibs=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -9789,6 +9976,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -9797,21 +9987,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2633,7 +4775,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9839,8 +9654,7 @@
+@@ -9835,8 +10026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2643,7 +4785,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9867,14 +9681,13 @@
+@@ -9863,14 +10053,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -2661,7 +4803,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9901,8 +9714,7 @@
+@@ -9897,8 +10086,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2671,16 +4813,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9940,7 +9752,7 @@
+@@ -9935,8 +10123,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -9963,13 +9775,13 @@
+@@ -9949,7 +10137,7 @@
+ ld_shlibs=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+@@ -9959,13 +10147,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -2697,14 +4850,17 @@
# 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.
-@@ -9983,21 +9795,21 @@
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+@@ -9975,52 +10163,52 @@
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- archive_cmds_need_lc=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
@@ -2717,58 +4873,88 @@
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -10006,18 +9818,18 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_need_lc=no
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -10058,8 +9870,8 @@
+- whole_archive_flag_spec='-all_load $convenience'
++ whole_archive_flag_spec=''
+ link_all_deplibs=yes
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+- ld_shlibs=no
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs=no
++ ;;
++ esac
+ fi
;;
+@@ -10054,8 +10242,8 @@
+ ;;
+
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10067,7 +9879,7 @@
+@@ -10063,7 +10251,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2777,9 +4963,12 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10085,10 +9897,10 @@
+@@ -10079,16 +10267,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -2790,7 +4979,21 @@
;;
esac
else
-@@ -10135,7 +9947,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -10098,7 +10286,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld='+b $libdir'
+@@ -10131,7 +10319,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -2799,7 +5002,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10145,7 +9957,7 @@
+@@ -10141,7 +10329,7 @@
link_all_deplibs=yes
;;
@@ -2808,16 +5011,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10168,7 +9980,7 @@
+@@ -10164,7 +10352,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10178,7 +9990,7 @@
+@@ -10174,7 +10363,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -2826,7 +5030,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10189,14 +10001,14 @@
+@@ -10185,14 +10374,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -2843,7 +5047,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10208,7 +10020,7 @@
+@@ -10204,13 +10393,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -2852,19 +5056,50 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10233,9 +10045,9 @@
+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10229,10 +10418,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10255,7 +10067,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -10241,8 +10432,18 @@
+ hardcode_shlibpath_var=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ *)
++ whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+@@ -10251,7 +10452,7 @@
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.
@@ -2873,7 +5108,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10315,9 +10127,9 @@
+@@ -10311,9 +10512,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -2885,7 +5120,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10423,7 +10235,7 @@
+@@ -10419,7 +10620,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -2894,7 +5129,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10433,7 +10245,20 @@
+@@ -10429,7 +10630,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2916,7 +5151,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10498,7 +10323,7 @@
+@@ -10494,7 +10708,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -2925,8 +5160,17 @@
;;
beos*)
-@@ -10523,7 +10348,7 @@
+@@ -10503,7 +10717,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10519,7 +10733,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -2934,34 +5178,85 @@
need_version=no
need_lib_prefix=no
-@@ -10588,7 +10413,7 @@
+@@ -10531,7 +10745,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -10561,7 +10776,7 @@
+ ;;
+ 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}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -10584,7 +10799,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10611,7 +10436,7 @@
+@@ -10607,7 +10822,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10671,7 +10496,7 @@
+@@ -10619,8 +10834,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++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*)
+@@ -10638,7 +10862,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -10665,9 +10889,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10686,7 +10511,7 @@
+@@ -10682,7 +10906,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -2970,7 +5265,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10697,7 +10522,7 @@
+@@ -10693,7 +10917,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -2979,7 +5274,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10759,22 +10584,19 @@
+@@ -10755,22 +10979,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -3001,14 +5296,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10784,6 +10606,30 @@
+@@ -10780,6 +11001,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3039,7 +5334,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10793,7 +10639,7 @@
+@@ -10789,7 +11034,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3048,16 +5343,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10822,7 +10668,7 @@
+@@ -10818,7 +11063,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -10842,7 +10688,7 @@
+@@ -10838,7 +11087,7 @@
os2*)
libname_spec='$name'
@@ -3066,7 +5365,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11071,8 +10917,7 @@
+@@ -10940,8 +11189,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+- test -n "$runpath_var " || \
+- test "X$hardcode_automatic"="Xyes" ; then
++ test -n "$runpath_var" || \
++ test "X$hardcode_automatic" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct" != no &&
+@@ -11067,8 +11316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3076,7 +5386,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11175,8 +11020,7 @@
+@@ -11171,8 +11419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3086,7 +5396,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11241,8 +11085,7 @@
+@@ -11237,8 +11484,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3096,7 +5406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11335,8 +11178,7 @@
+@@ -11331,8 +11577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3106,7 +5416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11401,8 +11243,7 @@
+@@ -11397,8 +11642,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3116,7 +5426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11468,8 +11309,7 @@
+@@ -11464,8 +11708,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3126,7 +5436,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11535,8 +11375,7 @@
+@@ -11531,8 +11774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3136,25 +5446,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11611,7 +11450,7 @@
+@@ -11607,7 +11849,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11614 "configure"
-+#line 11453 "configure"
+-#line 11610 "configure"
++#line 11852 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11709,7 +11548,7 @@
+@@ -11673,7 +11915,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -11705,7 +11947,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11712 "configure"
-+#line 11551 "configure"
+-#line 11708 "configure"
++#line 11950 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11834,7 +11673,7 @@
+@@ -11771,7 +12013,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -11821,7 +12063,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -11830,47 +12072,10 @@
fi
;;
@@ -3163,18 +5500,18 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11844,29 +11683,29 @@
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- archive_cmds_need_lc=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
- else
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -3183,31 +5520,27 @@
- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag='-undefined dynamic_lookup'
-+ ;;
-+ esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
-@@ -11900,7 +11739,8 @@
+- hardcode_direct=no
+- hardcode_automatic=yes
+- hardcode_shlibpath_var=unsupported
+- whole_archive_flag_spec='-all_load $convenience'
+- link_all_deplibs=yes
+- else
+- ld_shlibs=no
+- fi
+ ;;
+ esac
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -11896,7 +12101,8 @@
# 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.
@@ -3217,7 +5550,34 @@
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 \
-@@ -12078,7 +11918,7 @@
+@@ -12010,11 +12216,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -12044,6 +12250,12 @@
+ # 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
+@@ -12074,7 +12286,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3226,7 +5586,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12109,7 +11949,7 @@
+@@ -12105,7 +12317,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3235,7 +5595,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12351,7 +12191,10 @@
+@@ -12120,7 +12332,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -12347,7 +12559,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -3247,7 +5616,84 @@
fi
-@@ -12619,8 +12462,8 @@
+@@ -12412,7 +12627,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -12449,7 +12666,7 @@
+ compiler_lib_search_path_CXX=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -12470,6 +12687,20 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -12491,7 +12722,16 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -12562,7 +12802,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -12596,7 +12836,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -12615,8 +12855,8 @@
# 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
@@ -3258,7 +5704,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12646,7 +12489,7 @@
+@@ -12642,7 +12882,7 @@
# 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.
@@ -3267,7 +5713,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12677,8 +12520,22 @@
+@@ -12673,8 +12913,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3292,7 +5738,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12724,15 +12581,16 @@
+@@ -12691,7 +12945,7 @@
+ link_all_deplibs_CXX=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -12712,6 +12966,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -12720,15 +12977,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3313,7 +5778,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12762,8 +12620,7 @@
+@@ -12758,8 +13016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3323,7 +5788,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12792,13 +12649,12 @@
+@@ -12788,13 +13045,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3339,7 +5804,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12825,8 +12681,7 @@
+@@ -12821,8 +13077,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3349,16 +5814,23 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12864,7 +12719,7 @@
+@@ -12859,8 +13114,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -12881,12 +12736,12 @@
+@@ -12873,16 +13128,17 @@
+ esac
+ ;;
+
++
+ cygwin* | mingw* | pw32*)
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -3373,7 +5845,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12895,7 +12750,7 @@
+@@ -12891,70 +13147,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3382,87 +5854,170 @@
else
ld_shlibs_CXX=no
fi
-@@ -12906,20 +12761,20 @@
- archive_cmds_need_lc_CXX=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+ ;;
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ archive_cmds_need_lc_CXX=no
++ hardcode_direct_CXX=no
++ hardcode_automatic_CXX=yes
++ hardcode_shlibpath_var_CXX=unsupported
++ whole_archive_flag_spec_CXX=''
++ link_all_deplibs_CXX=yes
+
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- archive_cmds_need_lc_CXX=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_CXX='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- else
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_CXX='-undefined dynamic_lookup'
-+ ;;
-+ esac
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
fi
- ;;
- esac
-@@ -12929,19 +12784,19 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- 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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
-@@ -12976,7 +12831,7 @@
+- hardcode_direct_CXX=no
+- hardcode_automatic_CXX=yes
+- hardcode_shlibpath_var_CXX=unsupported
+- whole_archive_flag_spec_CXX='-all_load $convenience'
+- link_all_deplibs_CXX=yes
+- else
+- ld_shlibs_CXX=no
+- fi
+- ;;
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ else
++ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ 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}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs_CXX=no
++ ;;
++ esac
++ fi
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -12965,14 +13232,14 @@
+ ;;
+ esac
+ ;;
+- freebsd12*)
++ freebsd[12]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12998,7 +12853,7 @@
+@@ -12989,12 +13256,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aCC)
+- aCC)
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13007,11 +12862,11 @@
+@@ -13003,11 +13270,11 @@
# 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 -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -3471,7 +6026,38 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13068,7 +12923,7 @@
+@@ -13017,7 +13284,7 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+@@ -13033,7 +13300,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+@@ -13054,17 +13321,17 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aCC)
+- case "$host_cpu" in
++ aCC*)
++ case $host_cpu in
+ hppa*64*|ia64*)
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -3480,7 +6066,13 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13089,7 +12944,7 @@
+@@ -13080,12 +13347,12 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*|hppa*64*)
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -3489,28 +6081,38 @@
;;
esac
fi
-@@ -13104,7 +12959,7 @@
+@@ -13098,9 +13365,9 @@
+ ;;
+ irix5* | irix6*)
case $cc_basename in
- CC)
+- CC)
++ CC*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$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'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13115,9 +12970,9 @@
+@@ -13111,9 +13378,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared -nostdlib $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}${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $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'
else
- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
fi
link_all_deplibs_CXX=yes
-@@ -13134,8 +12989,8 @@
+@@ -13124,14 +13391,14 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -3521,19 +6123,49 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13157,16 +13012,16 @@
+@@ -13149,20 +13416,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
# Intel C++
with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
archive_cmds_need_lc_CXX=no
- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler
++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ archive_expsym_cmds_CXX='$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'
++
++ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
# Compaq C++
- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -3542,8 +6174,17 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13204,7 +13059,7 @@
+@@ -13190,7 +13481,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
;;
+@@ -13200,7 +13491,7 @@
+ ;;
esac
;;
- netbsd*)
@@ -3551,7 +6192,32 @@
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=
-@@ -13223,7 +13078,7 @@
+@@ -13211,15 +13502,31 @@
+ # 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
++ ld_shlibs_CXX=no
++ ;;
++ openbsd*)
++ hardcode_direct_CXX=yes
++ hardcode_shlibpath_var_CXX=no
++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ export_dynamic_flag_spec_CXX='${wl}-E'
++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -3560,25 +6226,41 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13240,7 +13095,7 @@
+@@ -13229,14 +13536,14 @@
+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- cxx)
++ cxx*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$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 ${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$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'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13258,7 +13113,7 @@
+@@ -13254,7 +13561,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$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}${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$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'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13283,7 +13138,7 @@
+@@ -13273,13 +13580,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -3587,50 +6269,123 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13299,10 +13154,10 @@
+@@ -13288,17 +13595,17 @@
+ # the KAI C++ compiler.
+ old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- cxx)
++ cxx*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $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 $objdir/so_locations -o $lib~
++ $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'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13321,7 +13176,7 @@
+@@ -13317,7 +13624,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$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}${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$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'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13378,9 +13233,9 @@
- CC)
+@@ -13341,7 +13648,7 @@
+ sco*)
+ archive_cmds_need_lc_CXX=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+@@ -13353,12 +13660,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13371,36 +13678,33 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
++ archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13414,7 +13269,7 @@
+ case $host_os in
+- solaris2.0-5 | solaris2.0-5.*) ;;
++ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The C++ compiler is used as linker so we must use $wl
+ # flag to pass the commands to the underlying system
+- # linker.
++ # linker. We must also pass each convience library through
++ # to the system linker between allextract/defaultextract.
++ # The C++ compiler will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ link_all_deplibs_CXX=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13408,9 +13712,9 @@
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
- gcx)
+- gcx)
++ gcx*)
# Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13424,9 +13279,9 @@
+@@ -13420,9 +13724,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -3642,7 +6397,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13435,9 +13290,9 @@
+@@ -13431,9 +13735,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -3654,7 +6409,25 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13552,7 +13407,7 @@
+@@ -13451,7 +13755,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13508,7 +13812,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -13548,7 +13852,7 @@
fi
;;
@@ -3663,17 +6436,142 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13687,7 +13542,7 @@
+@@ -13584,6 +13888,20 @@
+
+ $rm -f confest.$objext
+
++# PORTME: override above test on systems where it is broken
++case $host_os in
++solaris*)
++ case $cc_basename in
++ CC*)
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ postdeps_CXX='-lCstd -lCrun'
++ ;;
++ esac
++esac
++
++
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13639,7 +13957,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -13664,18 +13982,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic_CXX='-qnocommon'
++ lt_prog_compiler_wl_CXX='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ lt_prog_compiler_pic_CXX='-KPIC'
;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+@@ -13683,22 +14011,22 @@
+ ;;
esac
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13763,7 +13618,7 @@
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ if test "$host_cpu" != ia64; then
+ lt_prog_compiler_pic_CXX='+Z'
+ fi
;;
+- aCC)
++ aCC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -13713,7 +14041,7 @@
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_static_CXX='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -13724,18 +14052,24 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ lt_prog_compiler_wl_CXX='--backend -Wl,'
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler.
++ lt_prog_compiler_wl_CXX='-Wl,'
++ lt_prog_compiler_pic_CXX='-fpic'
++ lt_prog_compiler_static_CXX='-Bstatic'
++ ;;
++ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -13752,25 +14086,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ lt_prog_compiler_pic_CXX='-W c,exportall'
+ ;;
+ *)
+ ;;
esac
;;
- netbsd*)
@@ -3681,21 +6579,105 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13874,11 +13729,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+- KCC)
++ KCC*)
+ lt_prog_compiler_wl_CXX='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ lt_prog_compiler_wl_CXX='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -13786,7 +14120,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+ *)
+@@ -13795,13 +14129,13 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ lt_prog_compiler_wl_CXX='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ lt_prog_compiler_pic_CXX='-PIC'
+ ;;
+@@ -13811,12 +14145,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ lt_prog_compiler_pic_CXX='-pic'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+@@ -13826,7 +14160,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ lt_prog_compiler_pic_CXX='-KPIC'
+ ;;
+@@ -13867,18 +14201,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13877: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13732: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13873: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14207: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13881: \$? = $ac_status" >&5
-+ echo "$as_me:13736: \$? = $ac_status" >&5
+- echo "$as_me:13877: \$? = $ac_status" >&5
++ echo "$as_me:14211: \$? = $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
-@@ -13925,13 +13780,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works_CXX=yes
+ fi
+ fi
+@@ -13899,7 +14235,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_CXX=
+@@ -13921,38 +14257,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3709,26 +6691,35 @@
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.
-@@ -13941,11 +13789,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13944: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13792: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13940: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14269: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13948: \$? = $ac_status" >&5
-+ echo "$as_me:13796: \$? = $ac_status" >&5
+- echo "$as_me:13944: \$? = $ac_status" >&5
++ echo "$as_me:14273: \$? = $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
-@@ -13955,8 +13803,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -3737,17 +6728,19 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14008,6 +13859,9 @@
+@@ -14002,7 +14336,10 @@
+ export_symbols_cmds_CXX="$ltdll_cmds"
+ ;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
+ linux*)
+ link_all_deplibs_CXX=no
-+ ;;
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -14089,7 +13943,7 @@
+@@ -14085,7 +14422,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3756,7 +6749,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14099,7 +13953,20 @@
+@@ -14095,7 +14432,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3778,7 +6771,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14164,7 +14031,7 @@
+@@ -14160,7 +14510,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3787,8 +6780,17 @@
;;
beos*)
-@@ -14189,7 +14056,7 @@
+@@ -14169,7 +14519,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14185,7 +14535,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -3796,34 +6798,85 @@
need_version=no
need_lib_prefix=no
-@@ -14254,7 +14121,7 @@
+@@ -14197,7 +14547,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -14227,7 +14578,7 @@
+ ;;
+ 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}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -14250,7 +14601,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14277,7 +14144,7 @@
+@@ -14273,7 +14624,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14337,7 +14204,7 @@
+@@ -14285,8 +14636,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++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*)
+@@ -14304,7 +14664,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -14331,9 +14691,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14352,7 +14219,7 @@
+@@ -14348,7 +14708,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3832,7 +6885,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14363,7 +14230,7 @@
+@@ -14359,7 +14719,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3841,7 +6894,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14425,22 +14292,19 @@
+@@ -14421,22 +14781,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -3863,14 +6916,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14450,6 +14314,30 @@
+@@ -14446,6 +14803,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3901,7 +6954,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14459,7 +14347,7 @@
+@@ -14455,7 +14836,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3910,16 +6963,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14488,7 +14376,7 @@
+@@ -14484,7 +14865,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14508,7 +14396,7 @@
+@@ -14504,7 +14889,7 @@
os2*)
libname_spec='$name'
@@ -3928,7 +6985,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14737,8 +14625,7 @@
+@@ -14606,8 +14991,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+- test -n "$runpath_var CXX" || \
+- test "X$hardcode_automatic_CXX"="Xyes" ; then
++ test -n "$runpath_var_CXX" || \
++ test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_CXX" != no &&
+@@ -14733,8 +15118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3938,7 +7006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14841,8 +14728,7 @@
+@@ -14837,8 +15221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3948,7 +7016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14907,8 +14793,7 @@
+@@ -14903,8 +15286,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3958,7 +7026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15001,8 +14886,7 @@
+@@ -14997,8 +15379,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3968,7 +7036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15067,8 +14951,7 @@
+@@ -15063,8 +15444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3978,7 +7046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15134,8 +15017,7 @@
+@@ -15130,8 +15510,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3988,7 +7056,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15201,8 +15083,7 @@
+@@ -15197,8 +15576,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3998,25 +7066,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15277,7 +15158,7 @@
+@@ -15273,7 +15651,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15280 "configure"
-+#line 15161 "configure"
+-#line 15276 "configure"
++#line 15654 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15375,7 +15256,7 @@
+@@ -15339,7 +15717,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -15371,7 +15749,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15378 "configure"
-+#line 15259 "configure"
+-#line 15374 "configure"
++#line 15752 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15492,7 +15373,8 @@
+@@ -15437,7 +15815,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -15488,7 +15866,8 @@
# 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.
@@ -4026,7 +7112,20 @@
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 \
-@@ -15622,7 +15504,7 @@
+@@ -15588,6 +15967,12 @@
+ # 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
+@@ -15618,7 +16003,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4035,7 +7134,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15653,7 +15535,7 @@
+@@ -15649,7 +16034,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4044,7 +7143,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15870,7 +15752,10 @@
+@@ -15664,7 +16049,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -15866,7 +16251,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -4056,30 +7164,185 @@
fi
-@@ -15972,7 +15857,7 @@
+@@ -15942,12 +16330,35 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+
+ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+@@ -15960,7 +16371,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -15968,8 +16379,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
+- test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
;;
esac
-@@ -16198,11 +16083,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -16046,7 +16459,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -16072,6 +16485,16 @@
+ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic_F77='-qnocommon'
++ lt_prog_compiler_wl_F77='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -16083,7 +16506,7 @@
+ lt_prog_compiler_wl_F77='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -16107,12 +16530,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ lt_prog_compiler_wl_F77='-Wl,'
++ lt_prog_compiler_pic_F77='-fpic'
++ lt_prog_compiler_static_F77='-Bstatic'
++ ;;
+ ccc*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ # All Alpha code is PIC.
+@@ -16133,9 +16563,14 @@
+ ;;
+
+ solaris*)
+- lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ lt_prog_compiler_wl_F77='-Qoption ld ';;
++ *)
++ lt_prog_compiler_wl_F77='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -16157,6 +16592,11 @@
+ fi
+ ;;
+
++ unicos*)
++ lt_prog_compiler_wl_F77='-Wl,'
++ lt_prog_compiler_can_build_shared_F77=no
++ ;;
++
+ uts4*)
+ lt_prog_compiler_pic_F77='-pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -16191,18 +16631,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16201: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16086: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16197: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16637: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16205: \$? = $ac_status" >&5
-+ echo "$as_me:16090: \$? = $ac_status" >&5
+- echo "$as_me:16201: \$? = $ac_status" >&5
++ echo "$as_me:16641: \$? = $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
-@@ -16249,13 +16134,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works_F77=yes
+ fi
+ fi
+@@ -16223,7 +16665,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_F77=
+@@ -16245,38 +16687,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4093,26 +7356,35 @@
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.
-@@ -16265,11 +16143,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16268: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16146: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16264: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16699: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16272: \$? = $ac_status" >&5
-+ echo "$as_me:16150: \$? = $ac_status" >&5
+- echo "$as_me:16268: \$? = $ac_status" >&5
++ echo "$as_me:16703: \$? = $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
-@@ -16279,8 +16157,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_F77=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -4121,7 +7393,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16408,7 +16289,7 @@
+@@ -16347,6 +16787,16 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
++ # Just being paranoid about ensuring that cc_basename is set.
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -16367,6 +16817,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ whole_archive_flag_spec_F77=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -16404,7 +16875,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4130,7 +7447,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16418,13 +16299,13 @@
+@@ -16414,13 +16885,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -4138,7 +7455,8 @@
+ allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -4146,14 +7464,47 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16433,19 +16314,19 @@
+@@ -16429,19 +16900,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ else
++ ld_shlibs_F77=no
++ fi
++ ;;
++
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ link_all_deplibs_F77=no
else
- ld_shlibs=no
+- ld_shlibs=no
++ ld_shlibs_F77=no
fi
;;
@@ -4170,7 +7521,7 @@
fi
;;
-@@ -16463,8 +16344,8 @@
+@@ -16459,8 +16962,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4181,36 +7532,8 @@
else
ld_shlibs_F77=no
fi
-@@ -16477,10 +16358,36 @@
- hardcode_shlibpath_var_F77=no
- ;;
+@@ -16475,24 +16978,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_cmds_F77="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds_F77="$tmp_archive_cmds"
-+ fi
-+ link_all_deplibs_F77=no
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -4220,7 +7543,28 @@
else
ld_shlibs_F77=no
fi
-@@ -16530,9 +16437,20 @@
+ ;;
+ esac
+
+- if test "$ld_shlibs_F77" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec_F77=
+- fi
++ if test "$ld_shlibs_F77" = no; then
++ runpath_var=
++ hardcode_libdir_flag_spec_F77=
++ export_dynamic_flag_spec_F77=
++ whole_archive_flag_spec_F77=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -16526,9 +17024,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4243,7 +7587,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16578,21 +16496,22 @@
+@@ -16545,7 +17054,7 @@
+ link_all_deplibs_F77=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -16566,6 +17075,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -16574,21 +17086,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4271,7 +7634,7 @@
program main
end
-@@ -16606,8 +16525,7 @@
+@@ -16602,8 +17115,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4281,7 +7644,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16634,14 +16552,13 @@
+@@ -16630,14 +17142,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4299,7 +7662,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16658,8 +16575,7 @@
+@@ -16654,8 +17165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4309,16 +7672,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16697,7 +16613,7 @@
+@@ -16692,8 +17202,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -16720,13 +16636,13 @@
+@@ -16706,7 +17216,7 @@
+ ld_shlibs_F77=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_F77=-rdynamic
+ ;;
+
+@@ -16716,68 +17226,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -4335,78 +7709,114 @@
# 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.
-@@ -16740,21 +16656,21 @@
- archive_cmds_need_lc_F77=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_F77=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- archive_cmds_need_lc_F77=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_F77='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_F77='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -16763,18 +16679,18 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- 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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_need_lc_F77=no
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16815,8 +16731,8 @@
+- whole_archive_flag_spec_F77='-all_load $convenience'
++ whole_archive_flag_spec_F77=''
+ link_all_deplibs_F77=yes
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+- ld_shlibs_F77=no
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs_F77=no
++ ;;
++ esac
+ fi
;;
+@@ -16811,8 +17321,8 @@
+ ;;
+
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16824,7 +16740,7 @@
+@@ -16820,7 +17330,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4415,9 +7825,12 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16842,10 +16758,10 @@
+@@ -16836,16 +17346,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -4428,7 +7841,21 @@
;;
esac
else
-@@ -16892,7 +16808,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -16855,7 +17365,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+@@ -16888,7 +17398,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4437,7 +7864,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16902,7 +16818,7 @@
+@@ -16898,7 +17408,7 @@
link_all_deplibs_F77=yes
;;
@@ -4446,16 +7873,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16925,7 +16841,7 @@
+@@ -16921,7 +17431,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16935,7 +16851,7 @@
+@@ -16931,7 +17442,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -4464,7 +7892,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16946,14 +16862,14 @@
+@@ -16942,14 +17453,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -4481,7 +7909,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16965,7 +16881,7 @@
+@@ -16961,13 +17472,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -4490,19 +7918,50 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16990,9 +16906,9 @@
+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -16986,10 +17497,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -17012,7 +16928,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -16998,8 +17511,18 @@
+ hardcode_shlibpath_var_F77=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ *)
++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ link_all_deplibs_F77=yes
+ ;;
+@@ -17008,7 +17531,7 @@
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.
@@ -4511,7 +7970,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17072,9 +16988,9 @@
+@@ -17068,9 +17591,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -4523,7 +7982,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17180,7 +17096,7 @@
+@@ -17176,7 +17699,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4532,7 +7991,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17190,7 +17106,20 @@
+@@ -17186,7 +17709,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4554,7 +8013,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17255,7 +17184,7 @@
+@@ -17251,7 +17787,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4563,8 +8022,17 @@
;;
beos*)
-@@ -17280,7 +17209,7 @@
+@@ -17260,7 +17796,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17276,7 +17812,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -4572,34 +8040,85 @@
need_version=no
need_lib_prefix=no
-@@ -17345,7 +17274,7 @@
+@@ -17288,7 +17824,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -17318,7 +17855,7 @@
+ ;;
+ 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}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -17341,7 +17878,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17368,7 +17297,7 @@
+@@ -17364,7 +17901,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17428,7 +17357,7 @@
+@@ -17376,8 +17913,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++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*)
+@@ -17395,7 +17941,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -17422,9 +17968,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17443,7 +17372,7 @@
+@@ -17439,7 +17985,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4608,7 +8127,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17454,7 +17383,7 @@
+@@ -17450,7 +17996,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4617,7 +8136,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17516,22 +17445,19 @@
+@@ -17512,22 +18058,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -4639,14 +8158,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17541,6 +17467,30 @@
+@@ -17537,6 +18080,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4677,7 +8196,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17550,7 +17500,7 @@
+@@ -17546,7 +18113,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4686,16 +8205,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17579,7 +17529,7 @@
+@@ -17575,7 +18142,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17599,7 +17549,7 @@
+@@ -17595,7 +18166,7 @@
os2*)
libname_spec='$name'
@@ -4704,7 +8227,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17778,7 +17728,8 @@
+@@ -17697,8 +18268,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+- test -n "$runpath_var F77" || \
+- test "X$hardcode_automatic_F77"="Xyes" ; then
++ test -n "$runpath_var_F77" || \
++ test "X$hardcode_automatic_F77" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_F77" != no &&
+@@ -17774,7 +18345,8 @@
# 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.
@@ -4714,7 +8248,20 @@
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 \
-@@ -17908,7 +17859,7 @@
+@@ -17874,6 +18446,12 @@
+ # 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
+@@ -17904,7 +18482,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4723,7 +8270,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17939,7 +17890,7 @@
+@@ -17935,7 +18513,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4732,7 +8279,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18156,7 +18107,10 @@
+@@ -17950,7 +18528,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -18152,7 +18730,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -4744,35 +8300,203 @@
fi
-@@ -18238,11 +18192,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+@@ -18185,7 +18766,7 @@
+ lt_simple_compile_test_code="class foo {}\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -18196,15 +18777,41 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ compiler_GCJ=$CC
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
+
++old_archive_cmds_GCJ=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -18231,18 +18838,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18241: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18195: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18237: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18844: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18245: \$? = $ac_status" >&5
-+ echo "$as_me:18199: \$? = $ac_status" >&5
+- echo "$as_me:18241: \$? = $ac_status" >&5
++ echo "$as_me:18848: \$? = $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
-@@ -18471,11 +18425,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+ fi
+ fi
+@@ -18319,7 +18928,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -18345,6 +18954,16 @@
+ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic_GCJ='-qnocommon'
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -18356,7 +18975,7 @@
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -18380,12 +18999,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ lt_prog_compiler_pic_GCJ='-fpic'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ ;;
+ ccc*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ # All Alpha code is PIC.
+@@ -18406,9 +19032,14 @@
+ ;;
+
+ solaris*)
+- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ lt_prog_compiler_wl_GCJ='-Qoption ld ';;
++ *)
++ lt_prog_compiler_wl_GCJ='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -18430,6 +19061,11 @@
+ fi
+ ;;
+
++ unicos*)
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ lt_prog_compiler_can_build_shared_GCJ=no
++ ;;
++
+ uts4*)
+ lt_prog_compiler_pic_GCJ='-pic'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18464,18 +19100,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18474: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18428: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18470: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19106: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18478: \$? = $ac_status" >&5
-+ echo "$as_me:18432: \$? = $ac_status" >&5
+- echo "$as_me:18474: \$? = $ac_status" >&5
++ echo "$as_me:19110: \$? = $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
-@@ -18522,13 +18476,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works_GCJ=yes
+ fi
+ fi
+@@ -18496,7 +19134,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_GCJ=
+@@ -18518,38 +19156,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4786,26 +8510,35 @@
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.
-@@ -18538,11 +18485,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18541: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18488: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18537: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19168: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18545: \$? = $ac_status" >&5
-+ echo "$as_me:18492: \$? = $ac_status" >&5
+- echo "$as_me:18541: \$? = $ac_status" >&5
++ echo "$as_me:19172: \$? = $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
-@@ -18552,8 +18499,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_GCJ=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -4814,7 +8547,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18681,7 +18631,7 @@
+@@ -18620,6 +19256,16 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
++ # Just being paranoid about ensuring that cc_basename is set.
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -18640,6 +19286,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ whole_archive_flag_spec_GCJ=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -18677,7 +19344,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4823,7 +8601,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18691,13 +18641,13 @@
+@@ -18687,13 +19354,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -4831,7 +8609,8 @@
+ allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -4839,14 +8618,47 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18706,19 +18656,19 @@
+@@ -18702,19 +19369,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
- ld_shlibs=no
+- ld_shlibs=no
++ ld_shlibs_GCJ=no
++ fi
++ ;;
++
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ link_all_deplibs_GCJ=no
++ else
++ ld_shlibs_GCJ=no
fi
;;
@@ -4863,7 +8675,7 @@
fi
;;
-@@ -18736,8 +18686,8 @@
+@@ -18732,8 +19431,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4874,36 +8686,8 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18750,10 +18700,36 @@
- hardcode_shlibpath_var_GCJ=no
- ;;
+@@ -18748,24 +19447,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_cmds_GCJ="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-+ fi
-+ link_all_deplibs_GCJ=no
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -4913,7 +8697,28 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18803,9 +18779,20 @@
+ ;;
+ esac
+
+- if test "$ld_shlibs_GCJ" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec_GCJ=
+- fi
++ if test "$ld_shlibs_GCJ" = no; then
++ runpath_var=
++ hardcode_libdir_flag_spec_GCJ=
++ export_dynamic_flag_spec_GCJ=
++ whole_archive_flag_spec_GCJ=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -18799,9 +19493,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4936,7 +8741,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18851,21 +18838,22 @@
+@@ -18818,7 +19523,7 @@
+ link_all_deplibs_GCJ=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -18839,6 +19544,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -18847,21 +19555,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4964,7 +8788,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18889,8 +18877,7 @@
+@@ -18885,8 +19594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4974,7 +8798,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18917,14 +18904,13 @@
+@@ -18913,14 +19621,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4992,7 +8816,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18951,8 +18937,7 @@
+@@ -18947,8 +19654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5002,16 +8826,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18990,7 +18975,7 @@
+@@ -18985,8 +19691,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -19013,13 +18998,13 @@
+@@ -18999,7 +19705,7 @@
+ ld_shlibs_GCJ=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_GCJ=-rdynamic
+ ;;
+
+@@ -19009,68 +19715,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5028,78 +8863,114 @@
# 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.
-@@ -19033,21 +19018,21 @@
- archive_cmds_need_lc_GCJ=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+ old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_GCJ=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- archive_cmds_need_lc_GCJ=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_GCJ='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -19056,18 +19041,18 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- 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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_need_lc_GCJ=no
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19108,8 +19093,8 @@
+- whole_archive_flag_spec_GCJ='-all_load $convenience'
++ whole_archive_flag_spec_GCJ=''
+ link_all_deplibs_GCJ=yes
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+- ld_shlibs_GCJ=no
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs_GCJ=no
++ ;;
++ esac
+ fi
;;
+@@ -19104,8 +19810,8 @@
+ ;;
+
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19117,7 +19102,7 @@
+@@ -19113,7 +19819,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5108,9 +8979,12 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19135,10 +19120,10 @@
+@@ -19129,16 +19835,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5121,7 +8995,21 @@
;;
esac
else
-@@ -19185,7 +19170,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -19148,7 +19854,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+@@ -19181,7 +19887,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5130,7 +9018,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19195,7 +19180,7 @@
+@@ -19191,7 +19897,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5139,16 +9027,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19218,7 +19203,7 @@
+@@ -19214,7 +19920,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19228,7 +19213,7 @@
+@@ -19224,7 +19931,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5157,7 +9046,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19239,14 +19224,14 @@
+@@ -19235,14 +19942,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5174,7 +9063,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19258,7 +19243,7 @@
+@@ -19254,13 +19961,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5183,19 +9072,50 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19283,9 +19268,9 @@
+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+@@ -19279,10 +19986,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19305,7 +19290,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -19291,8 +20000,18 @@
+ hardcode_shlibpath_var_GCJ=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ *)
++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ link_all_deplibs_GCJ=yes
+ ;;
+@@ -19301,7 +20020,7 @@
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.
@@ -5204,7 +9124,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19365,9 +19350,9 @@
+@@ -19361,9 +20080,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5216,7 +9136,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19473,7 +19458,7 @@
+@@ -19469,7 +20188,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5225,7 +9145,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19483,7 +19468,20 @@
+@@ -19479,7 +20198,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5247,7 +9167,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19548,7 +19546,7 @@
+@@ -19544,7 +20276,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5256,8 +9176,17 @@
;;
beos*)
-@@ -19573,7 +19571,7 @@
+@@ -19553,7 +20285,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19569,7 +20301,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -5265,34 +9194,85 @@
need_version=no
need_lib_prefix=no
-@@ -19638,7 +19636,7 @@
+@@ -19581,7 +20313,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -19611,7 +20344,7 @@
+ ;;
+ 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}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -19634,7 +20367,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19661,7 +19659,7 @@
+@@ -19657,7 +20390,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19721,7 +19719,7 @@
+@@ -19669,8 +20402,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++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*)
+@@ -19688,7 +20430,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -19715,9 +20457,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19736,7 +19734,7 @@
+@@ -19732,7 +20474,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5301,7 +9281,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19747,7 +19745,7 @@
+@@ -19743,7 +20485,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5310,7 +9290,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19809,22 +19807,19 @@
+@@ -19805,22 +20547,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5332,14 +9312,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -19834,6 +19829,30 @@
+@@ -19830,6 +20569,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5370,7 +9350,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19843,7 +19862,7 @@
+@@ -19839,7 +20602,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5379,16 +9359,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19872,7 +19891,7 @@
+@@ -19868,7 +20631,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -19892,7 +19911,7 @@
+@@ -19888,7 +20655,7 @@
os2*)
libname_spec='$name'
@@ -5397,7 +9381,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20121,8 +20140,7 @@
+@@ -19990,8 +20757,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_GCJ=
+ if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+- test -n "$runpath_var GCJ" || \
+- test "X$hardcode_automatic_GCJ"="Xyes" ; then
++ test -n "$runpath_var_GCJ" || \
++ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+@@ -20117,8 +20884,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5407,7 +9402,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20225,8 +20243,7 @@
+@@ -20221,8 +20987,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5417,7 +9412,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20291,8 +20308,7 @@
+@@ -20287,8 +21052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5427,7 +9422,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20385,8 +20401,7 @@
+@@ -20381,8 +21145,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5437,7 +9432,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20451,8 +20466,7 @@
+@@ -20447,8 +21210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5447,7 +9442,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20518,8 +20532,7 @@
+@@ -20514,8 +21276,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5457,7 +9452,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20585,8 +20598,7 @@
+@@ -20581,8 +21342,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5467,25 +9462,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20661,7 +20673,7 @@
+@@ -20657,7 +21417,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20664 "configure"
-+#line 20676 "configure"
+-#line 20660 "configure"
++#line 21420 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20759,7 +20771,7 @@
+@@ -20723,7 +21483,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -20755,7 +21515,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20762 "configure"
-+#line 20774 "configure"
+-#line 20758 "configure"
++#line 21518 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20876,7 +20888,8 @@
+@@ -20821,7 +21581,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -20872,7 +21632,8 @@
# 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.
@@ -5495,7 +9508,20 @@
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 \
-@@ -21006,7 +21019,7 @@
+@@ -20972,6 +21733,12 @@
+ # 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
+@@ -21002,7 +21769,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5504,7 +9530,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21037,7 +21050,7 @@
+@@ -21033,7 +21800,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5513,7 +9539,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21254,7 +21267,10 @@
+@@ -21048,7 +21815,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -21250,7 +22017,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -5525,7 +9560,43 @@
fi
-@@ -21317,7 +21333,8 @@
+@@ -21293,11 +22063,35 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ compiler_RC=$CC
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ lt_cv_prog_compiler_c_o_RC=yes
+
+ # The else clause should only fire when bootstrapping the
+@@ -21313,7 +22107,8 @@
# 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.
@@ -5535,7 +9606,20 @@
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 \
-@@ -21447,7 +21464,7 @@
+@@ -21413,6 +22208,12 @@
+ # 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
+@@ -21443,7 +22244,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5544,7 +9628,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21478,7 +21495,7 @@
+@@ -21474,7 +22275,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5553,7 +9637,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21695,7 +21712,10 @@
+@@ -21489,7 +22290,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -21691,7 +22492,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -5565,7 +9658,7 @@
fi
-@@ -21742,7 +21762,7 @@
+@@ -21738,7 +22542,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -5574,7 +9667,7 @@
# Prevent multiple expansion
-@@ -22063,8 +22083,7 @@
+@@ -22063,8 +22867,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5584,7 +9677,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22138,9 +22157,6 @@
+@@ -22138,9 +22941,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5594,7 +9687,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22174,8 +22190,7 @@
+@@ -22174,8 +22974,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5604,7 +9697,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22279,8 +22294,7 @@
+@@ -22279,8 +23078,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5614,7 +9707,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22359,9 +22373,6 @@
+@@ -22359,9 +23157,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5624,7 +9717,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22394,8 +22405,7 @@
+@@ -22394,8 +23189,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5634,7 +9727,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22498,8 +22508,7 @@
+@@ -22498,8 +23292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5644,7 +9737,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22589,8 +22598,7 @@
+@@ -22589,8 +23382,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5654,7 +9747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22651,8 +22659,7 @@
+@@ -22651,8 +23443,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5664,7 +9757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22720,8 +22727,7 @@
+@@ -22720,8 +23511,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5674,7 +9767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22787,8 +22793,7 @@
+@@ -22787,8 +23577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5684,7 +9777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22881,8 +22886,7 @@
+@@ -22881,8 +23670,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5694,7 +9787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22960,8 +22964,7 @@
+@@ -22960,8 +23748,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5704,7 +9797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23045,8 +23048,7 @@
+@@ -23045,8 +23832,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5714,7 +9807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23114,8 +23116,7 @@
+@@ -23114,8 +23900,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5724,7 +9817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23210,8 +23211,7 @@
+@@ -23210,8 +23995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5734,7 +9827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23275,8 +23275,7 @@
+@@ -23275,8 +24059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5744,7 +9837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23371,8 +23370,7 @@
+@@ -23371,8 +24154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5754,7 +9847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23436,8 +23434,7 @@
+@@ -23436,8 +24218,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5764,7 +9857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23533,8 +23530,7 @@
+@@ -23533,8 +24314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5774,7 +9867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23598,8 +23594,7 @@
+@@ -23598,8 +24378,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5784,7 +9877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23696,8 +23691,7 @@
+@@ -23696,8 +24475,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5794,7 +9887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23762,8 +23756,7 @@
+@@ -23762,8 +24540,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5804,7 +9897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23831,8 +23824,7 @@
+@@ -23831,8 +24608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5814,7 +9907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23983,8 +23975,7 @@
+@@ -23983,8 +24759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5824,7 +9917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24139,8 +24130,7 @@
+@@ -24139,8 +24914,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5834,7 +9927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24205,8 +24195,7 @@
+@@ -24205,8 +24979,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5844,7 +9937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24353,8 +24342,7 @@
+@@ -24353,8 +25126,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5854,7 +9947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24509,8 +24497,7 @@
+@@ -24509,8 +25281,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5864,7 +9957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24566,9 +24553,6 @@
+@@ -24566,9 +25337,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5874,7 +9967,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24602,8 +24586,7 @@
+@@ -24602,8 +25370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5884,7 +9977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24707,8 +24690,7 @@
+@@ -24707,8 +25474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5894,7 +9987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24808,8 +24790,7 @@
+@@ -24808,8 +25574,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5904,7 +9997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24883,8 +24864,7 @@
+@@ -24883,8 +25648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5914,7 +10007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24947,8 +24927,7 @@
+@@ -24947,8 +25711,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5924,7 +10017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25010,8 +24989,7 @@
+@@ -25010,8 +25773,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5934,7 +10027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25051,8 +25029,7 @@
+@@ -25051,8 +25813,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5944,7 +10037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25108,8 +25085,7 @@
+@@ -25108,8 +25869,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5954,7 +10047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25149,8 +25125,7 @@
+@@ -25149,8 +25909,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5964,7 +10057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25214,8 +25189,7 @@
+@@ -25214,8 +25973,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5974,7 +10067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25246,10 +25220,8 @@
+@@ -25246,10 +26004,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -5987,7 +10080,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25360,8 +25332,7 @@
+@@ -25360,8 +26116,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5997,7 +10090,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25423,8 +25394,7 @@
+@@ -25423,8 +26178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6007,7 +10100,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25464,8 +25434,7 @@
+@@ -25464,8 +26218,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6017,7 +10110,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25521,8 +25490,7 @@
+@@ -25521,8 +26274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6027,7 +10120,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25562,8 +25530,7 @@
+@@ -25562,8 +26314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6037,7 +10130,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25627,8 +25594,7 @@
+@@ -25627,8 +26378,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6047,7 +10140,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25659,10 +25625,8 @@
+@@ -25659,10 +26409,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6060,7 +10153,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25773,8 +25737,7 @@
+@@ -25773,8 +26521,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6070,7 +10163,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25836,8 +25799,7 @@
+@@ -25836,8 +26583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6080,7 +10173,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25877,8 +25839,7 @@
+@@ -25877,8 +26623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6090,7 +10183,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25934,8 +25895,7 @@
+@@ -25934,8 +26679,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6100,7 +10193,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25975,8 +25935,7 @@
+@@ -25975,8 +26719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6110,7 +10203,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26040,8 +25999,7 @@
+@@ -26040,8 +26783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6120,7 +10213,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26072,10 +26030,8 @@
+@@ -26072,10 +26814,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6133,7 +10226,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26186,8 +26142,7 @@
+@@ -26186,8 +26926,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6143,7 +10236,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26249,8 +26204,7 @@
+@@ -26249,8 +26988,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6153,7 +10246,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26290,8 +26244,7 @@
+@@ -26290,8 +27028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6163,7 +10256,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26347,8 +26300,7 @@
+@@ -26347,8 +27084,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6173,7 +10266,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26388,8 +26340,7 @@
+@@ -26388,8 +27124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6183,7 +10276,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26453,8 +26404,7 @@
+@@ -26453,8 +27188,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6193,7 +10286,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26485,10 +26435,8 @@
+@@ -26485,10 +27219,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6206,7 +10299,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26607,8 +26555,7 @@
+@@ -26607,8 +27339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6216,7 +10309,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26679,8 +26626,7 @@
+@@ -26679,8 +27410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6226,7 +10319,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26750,8 +26696,7 @@
+@@ -26750,8 +27480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6236,7 +10329,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26813,8 +26758,7 @@
+@@ -26813,8 +27542,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6246,7 +10339,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26854,8 +26798,7 @@
+@@ -26854,8 +27582,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6256,7 +10349,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26911,8 +26854,7 @@
+@@ -26911,8 +27638,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6266,7 +10359,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26952,8 +26894,7 @@
+@@ -26952,8 +27678,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6276,7 +10369,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27017,8 +26958,7 @@
+@@ -27017,8 +27742,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6286,7 +10379,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27049,10 +26989,8 @@
+@@ -27049,10 +27773,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6299,7 +10392,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27164,8 +27102,7 @@
+@@ -27164,8 +27886,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6309,7 +10402,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27227,8 +27164,7 @@
+@@ -27227,8 +27948,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6319,7 +10412,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27268,8 +27204,7 @@
+@@ -27268,8 +27988,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6329,7 +10422,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27325,8 +27260,7 @@
+@@ -27325,8 +28044,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6339,7 +10432,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27366,8 +27300,7 @@
+@@ -27366,8 +28084,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6349,7 +10442,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27431,8 +27364,7 @@
+@@ -27431,8 +28148,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6359,7 +10452,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27463,10 +27395,8 @@
+@@ -27463,10 +28179,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6372,7 +10465,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27577,8 +27507,7 @@
+@@ -27577,8 +28291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6382,17 +10475,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27648,8 +27577,7 @@
+@@ -27659,8 +28372,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -27760,8 +28472,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27829,8 +27757,7 @@
+@@ -27941,8 +28652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6402,7 +10505,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27939,8 +27866,7 @@
+@@ -28051,8 +28761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6412,7 +10515,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28164,8 +28090,7 @@
+@@ -28276,8 +28985,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6422,7 +10525,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28388,8 +28313,7 @@
+@@ -28500,8 +29208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6432,7 +10535,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28465,8 +28389,7 @@
+@@ -28577,8 +29284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6442,7 +10545,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28608,8 +28531,7 @@
+@@ -28720,8 +29426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6452,7 +10555,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28684,8 +28606,7 @@
+@@ -28796,8 +29501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6462,7 +10565,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28745,8 +28666,7 @@
+@@ -28857,8 +29561,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6472,7 +10575,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28829,8 +28749,7 @@
+@@ -28941,8 +29644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6482,7 +10585,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28923,8 +28842,7 @@
+@@ -29035,8 +29737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6492,7 +10595,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29098,8 +29016,7 @@
+@@ -29210,8 +29911,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6502,7 +10605,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29197,8 +29114,7 @@
+@@ -29309,8 +30009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6512,7 +10615,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29291,8 +29207,7 @@
+@@ -29397,8 +30096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6522,7 +10625,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29375,8 +29290,7 @@
+@@ -29475,8 +30173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6532,25 +10635,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29429,7 +29343,7 @@
+@@ -29529,7 +30226,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29432: $i/$j" >&5
-+ echo "configure: 29346: $i/$j" >&5
+- echo "configure: 29532: $i/$j" >&5
++ echo "configure: 30229: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29732,7 +29646,7 @@
+@@ -29827,7 +30524,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29735: $i/$j" >&5
-+ echo "configure: 29649: $i/$j" >&5
+- echo "configure: 29830: $i/$j" >&5
++ echo "configure: 30527: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30409,8 +30323,7 @@
+@@ -30504,8 +31201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6560,47 +10663,98 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30569,7 +30482,7 @@
+@@ -30664,7 +31360,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30572: $i/$j" >&5
-+ echo "configure: 30485: $i/$j" >&5
+- echo "configure: 30667: $i/$j" >&5
++ echo "configure: 31363: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30599,7 +30512,7 @@
+@@ -30694,7 +31390,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30602: $i/$j" >&5
-+ echo "configure: 30515: $i/$j" >&5
+- echo "configure: 30697: $i/$j" >&5
++ echo "configure: 31393: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30617,7 +30530,7 @@
+@@ -30712,7 +31408,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30620: $i/$j" >&5
-+ echo "configure: 30533: $i/$j" >&5
+- echo "configure: 30715: $i/$j" >&5
++ echo "configure: 31411: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32135,7 +32048,7 @@
+@@ -32235,7 +32931,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32138: $i/$j" >&5
-+ echo "configure: 32051: $i/$j" >&5
+- echo "configure: 32238: $i/$j" >&5
++ echo "configure: 32934: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32292,290 +32205,6 @@
+@@ -32397,345 +33093,6 @@
- if test "x$GXX" = "xyes"; then
- kde_have_gcc_visibility=no
+
+
+- echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
-
+- if test "x$GXX" = "xyes"; then
+-
+-
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+- #include <exception>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "GCC visibility push" >/dev/null 2>&1; then
+-
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- kde_stdc_visibility_patched=yes
+-else
+-
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+- visibility support. Disabling -fvisibility=hidden" >&5
+-echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+- visibility support. Disabling -fvisibility=hidden" >&2;}
+-
+- kde_stdc_visibility_patched=no
+-fi
+-rm -f conftest*
+-
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+- kde_have_gcc_visibility=no
+-
-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
@@ -6768,7 +10922,7 @@
-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
-
-- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-
- echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
@@ -6884,10 +11038,14 @@
-
-fi
-
- fi
-
-
-@@ -32600,9 +32229,6 @@
+- fi
+-
+-
+-
+ echo "$as_me:$LINENO: checking for setenv" >&5
+ echo $ECHO_N "checking for setenv... $ECHO_C" >&6
+ if test "${kde_cv_func_setenv+set}" = set; then
+@@ -32756,9 +33113,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6897,7 +11055,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32633,8 +32259,7 @@
+@@ -32789,8 +33143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6907,7 +11065,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32735,8 +32360,7 @@
+@@ -32891,8 +33244,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6917,7 +11075,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32815,9 +32439,6 @@
+@@ -32971,9 +33323,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6927,7 +11085,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32848,8 +32469,7 @@
+@@ -33004,8 +33353,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6937,7 +11095,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32950,8 +32570,7 @@
+@@ -33106,8 +33454,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6947,7 +11105,15 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33059,8 +32678,7 @@
+@@ -33173,6 +33520,7 @@
+
+ if test "$KTTS_KSPEECH_DIR" = ""; then
+
++
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+@@ -33216,8 +33564,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6957,7 +11123,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33216,8 +32834,7 @@
+@@ -33381,8 +33728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6967,7 +11133,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33296,8 +32913,7 @@
+@@ -33474,8 +33820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6977,7 +11143,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33378,8 +32994,7 @@
+@@ -33631,8 +33976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6987,17 +11153,37 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33484,8 +33099,7 @@
+@@ -33711,8 +34055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -33793,8 +34136,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -33899,8 +34241,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33527,8 +33141,7 @@
+@@ -33942,8 +34283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7007,7 +11193,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33585,8 +33198,7 @@
+@@ -34000,8 +34340,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7017,17 +11203,107 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34015,8 +33627,7 @@
+@@ -34409,8 +34748,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -34564,8 +34902,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -34644,8 +34981,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -34703,8 +35039,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -34762,8 +35097,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -34970,8 +35304,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -35036,8 +35369,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -35200,8 +35532,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34910,6 +34521,13 @@
+@@ -35365,8 +35696,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -35453,8 +35783,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -36263,6 +36592,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7041,7 +11317,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -35682,6 +35300,9 @@
+@@ -37059,6 +37395,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -7051,7 +11327,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -36067,11 +35688,6 @@
+@@ -37458,11 +37797,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7063,7 +11339,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -36110,6 +35726,12 @@
+@@ -37501,6 +37835,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7089,7 +11365,7 @@
dnl generate the config header
--- doc/kmag/Makefile.in
+++ doc/kmag/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7099,7 +11375,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,7 @@
+@@ -356,7 +359,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7108,7 +11384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -379,9 +382,9 @@
+@@ -394,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7122,7 +11398,7 @@
mostlyclean-libtool:
--- doc/kmousetool/Makefile.in
+++ doc/kmousetool/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7132,7 +11408,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,7 @@
+@@ -356,7 +359,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7141,7 +11417,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -379,9 +382,9 @@
+@@ -394,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7153,9 +11429,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -544,7 +547,7 @@
+ KDE_DIST=index.docbook Makefile.in man-kmousetool.1.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook man-kmousetool.1.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kmousetool.1.docbook index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -571,20 +574,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmousetool
+- @for base in index.docbook man-kmousetool.1.docbook ; do \
++ @for base in man-kmousetool.1.docbook index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmousetool/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmousetool/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook man-kmousetool.1.docbook ; do \
++ for base in man-kmousetool.1.docbook index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmousetool/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook man-kmousetool.1.docbook ; do \
++ for file in man-kmousetool.1.docbook index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kmouth/Makefile.in
+++ doc/kmouth/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7165,7 +11474,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,7 @@
+@@ -356,7 +359,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7174,7 +11483,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -379,9 +382,9 @@
+@@ -394,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7186,46 +11495,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,10 +529,10 @@
+@@ -541,10 +544,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=index.docbook kmouthmain.eps kmouthedit.png Makefile.in kmouthcwcp.eps kmouthwizard.eps kmouthcpref.png kmouthcpref.eps kmouthedit.eps kmouthmain.png kmouthwizard.png Makefile.am kmouthctts.png kmouthctts.eps kmouthcwcp.png index.cache.bz2
-+KDE_DIST=Makefile.in kmouthcwcp.eps kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthctts.png kmouthcwcp.png kmouthctts.eps kmouthmain.eps index.docbook kmouthedit.png kmouthcpref.png kmouthwizard.eps kmouthwizard.png Makefile.am index.cache.bz2
+-KDE_DIST=index.docbook kmouthmain.eps kmouthedit.png Makefile.in kmouthcwcp.eps kmouthwizard.eps kmouthcpref.png kmouthcpref.eps kmouthedit.eps kmouthmain.png man-kmouth.1.docbook kmouthwizard.png Makefile.am kmouthctts.png kmouthctts.eps kmouthcwcp.png index.cache.bz2
++KDE_DIST=Makefile.in kmouthcwcp.eps kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthctts.png kmouthcwcp.png kmouthctts.eps kmouthmain.eps index.docbook kmouthedit.png kmouthcpref.png kmouthwizard.eps man-kmouth.1.docbook kmouthwizard.png Makefile.am index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kmouth.1.docbook kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook man-kmouth.1.docbook
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -556,20 +559,20 @@
+@@ -571,20 +574,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth
-- @for base in kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps ; do \
-+ @for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
+- @for base in man-kmouth.1.docbook kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps ; do \
++ @for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook man-kmouth.1.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
done
uninstall-nls:
-- for base in kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps ; do \
-+ for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
+- for base in man-kmouth.1.docbook kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps ; do \
++ for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook man-kmouth.1.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps ; do \
-+ for file in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
+- for file in man-kmouth.1.docbook kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps ; do \
++ for file in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook man-kmouth.1.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kttsd/Makefile.in
+++ doc/kttsd/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7235,7 +11544,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,7 @@
+@@ -355,7 +358,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7244,7 +11553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -379,9 +382,9 @@
+@@ -393,9 +396,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7256,46 +11565,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,10 +529,10 @@
+@@ -540,10 +543,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=audio.png talkers.png index.docbook jobs.png interruption.png Makefile.in talkerchooser.png festivalintconf.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2 filters.png
-+KDE_DIST=talkers.png Makefile.in filters.png audio.png index.docbook jobs.png interruption.png talkerchooser.png festivalintconf.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2
+-KDE_DIST=talkers.png Makefile.in filters.png selecttalker.png audio.png jobs.png index.docbook interruption.png notifications.png festivalintconf.png talkerchooser.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2
++KDE_DIST=talkers.png Makefile.in filters.png selecttalker.png audio.png index.docbook jobs.png interruption.png notifications.png talkerchooser.png festivalintconf.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png addtalker.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png selecttalker.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png notifications.png addtalker.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) notifications.png selecttalker.png filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -556,20 +559,20 @@
+@@ -570,20 +573,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd
-- @for base in interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png addtalker.png ; do \
-+ @for base in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
+- @for base in interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png selecttalker.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png notifications.png addtalker.png ; do \
++ @for base in notifications.png selecttalker.png filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
done
uninstall-nls:
-- for base in interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png addtalker.png ; do \
-+ for base in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
+- for base in interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png selecttalker.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png notifications.png addtalker.png ; do \
++ for base in notifications.png selecttalker.png filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png addtalker.png ; do \
-+ for file in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
+- for file in interruption.png general.png jobs.png audio.png festivalintconf.png xmltransformer.png selecttalker.png index.docbook stringreplacer.png talkerchooser.png talkers.png filters.png notifications.png addtalker.png ; do \
++ for file in notifications.png selecttalker.png filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -186,6 +186,9 @@
+@@ -193,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7305,7 +11614,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -354,13 +357,13 @@
+@@ -368,13 +371,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -7321,7 +11630,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -398,9 +401,9 @@
+@@ -412,9 +415,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7335,7 +11644,7 @@
mostlyclean-libtool:
--- IconThemes/Makefile.in
+++ IconThemes/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7345,7 +11654,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -343,7 +346,7 @@
+@@ -357,7 +360,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7354,7 +11663,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -381,9 +384,9 @@
+@@ -395,9 +398,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7368,7 +11677,7 @@
mostlyclean-libtool:
--- kbstateapplet/images/Makefile.in
+++ kbstateapplet/images/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7378,7 +11687,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,7 @@
+@@ -355,7 +358,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7387,7 +11696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -379,9 +382,9 @@
+@@ -393,9 +396,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7399,83 +11708,105 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -524,165 +527,165 @@
+@@ -538,273 +541,273 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr22-action-keypressok.png cr22-action-shiftkey.png cr22-action-keypressno.png cr48-action-lockkey.png cr32-action-keypressok.png cr48-action-capskey.png cr22-action-superkey.png cr64-action-metakey.png cr16-action-keypressno.png cr16-action-superkey.png crsc-action-metakey.svg cr32-action-altkey.png cr32-action-lockkey.png cr22-action-capskey.png crsc-action-altkey.svg cr16-action-unlatched.png cr64-action-keypressno.png cr22-action-lockkey.png cr22-action-key.png cr16-action-shiftkey.png cr48-action-shiftkey.png cr16-action-hyperkey.png cr32-action-keypressno.png cr64-action-key.png cr16-action-lockkey.png crsc-action-keypressok.svg cr48-action-keypressok.png cr64-action-unlatched.png cr32-action-superkey.png crsc-action-controlkey.svg cr32-action-hyperkey.png cr22-action-altkey.png crsc-action-hyperkey.svg cr16-action-capskey.png cr64-action-capskey.png cr48-action-hyperkey.png cr64-action-hyperkey.png cr64-action-superkey.png crsc-action-superkey.svg crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr22-action-hyperkey.png cr32-action-unlatched.png cr64-action-shiftkey.png cr64-action-lockkey.png cr32-action-capskey.png cr22-action-metakey.png cr48-action-key.png cr48-action-altkey.png cr48-action-keypressno.png cr48-action-superkey.png cr16-action-altkey.png cr16-action-metakey.png cr32-action-metakey.png cr22-action-controlkey.png cr16-action-key.png cr64-action-altkey.png cr22-action-unlatched.png cr48-action-controlkey.png crsc-action-unlatched.svg Makefile.in crsc-action-lockkey.svg cr32-action-key.png cr16-action-keypressok.png cr32-action-controlkey.png cr48-action-unlatched.png cr64-action-controlkey.png crsc-action-key.svg cr64-action-keypressok.png crsc-action-capskey.svg crsc-action-shiftkey.svg cr32-action-shiftkey.png Makefile.am
-+KDE_DIST=cr22-action-keypressok.png cr22-action-shiftkey.png cr48-action-lockkey.png cr22-action-keypressno.png cr48-action-capskey.png cr22-action-superkey.png cr32-action-keypressok.png cr64-action-metakey.png cr16-action-keypressno.png cr16-action-superkey.png crsc-action-metakey.svg cr32-action-altkey.png cr22-action-capskey.png crsc-action-altkey.svg cr32-action-lockkey.png cr16-action-unlatched.png cr64-action-keypressno.png cr22-action-lockkey.png cr22-action-key.png cr48-action-shiftkey.png cr16-action-shiftkey.png cr32-action-keypressno.png cr16-action-hyperkey.png cr64-action-key.png cr16-action-lockkey.png cr48-action-keypressok.png crsc-action-keypressok.svg cr64-action-unlatched.png cr32-action-superkey.png cr32-action-hyperkey.png crsc-action-controlkey.svg cr22-action-altkey.png crsc-action-hyperkey.svg cr16-action-capskey.png cr64-action-capskey.png cr48-action-hyperkey.png cr64-action-hyperkey.png crsc-action-superkey.svg cr64-action-superkey.png crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr22-action-hyperkey.png cr32-action-unlatched.png cr64-action-shiftkey.png cr64-action-lockkey.png cr32-action-capskey.png cr22-action-metakey.png cr48-action-key.png cr48-action-altkey.png cr48-action-keypressno.png cr16-action-altkey.png cr48-action-superkey.png cr16-action-metakey.png cr32-action-metakey.png cr22-action-controlkey.png cr16-action-key.png cr48-action-controlkey.png cr64-action-altkey.png cr22-action-unlatched.png crsc-action-unlatched.svg crsc-action-lockkey.svg cr32-action-key.png Makefile.in cr16-action-keypressok.png cr32-action-controlkey.png cr48-action-unlatched.png crsc-action-key.svg cr64-action-controlkey.png cr64-action-keypressok.png crsc-action-capskey.svg crsc-action-shiftkey.svg cr32-action-shiftkey.png Makefile.am
+-KDE_DIST=cr32-action-kbstate_mouse_right_selected.png cr16-action-kbstate_mouse.png cr48-action-kbstate_mouse_right.png cr22-action-superkey.png cr48-action-kbstate_mouse_mid_selected.png cr64-action-kbstate_mouse_mid.png cr22-action-kbstate_stickykeys.png cr64-action-kbstate_slowkeys.png crsc-action-metakey.svg cr32-action-lockkey.png crsc-action-altkey.svg cr22-action-key.png cr16-action-shiftkey.png cr48-action-shiftkey.png cr16-action-hyperkey.png cr32-action-kbstate_mouse_right.png cr32-action-keypressno.png cr64-action-kbstate_mouse_mid_selected.png cr64-action-key.png cr16-action-lockkey.png cr32-action-kbstate_mouse_mid.png cr48-action-kbstate_slowkeys.png crsc-action-keypressok.svg crsc-action-kbstate_mouse_left.svg cr64-action-unlatched.png cr16-action-kbstate_stickykeys.png cr32-action-kbstate_mouse_mid_selected.png cr32-action-superkey.png crsc-action-controlkey.svg cr64-action-capskey.png cr48-action-hyperkey.png cr16-action-kbstate_slowkeys.png cr22-action-metakey.png cr48-action-key.png cr16-action-kbstate_mouse_mid_selected.png cr64-action-kbstate_stickykeys.png cr48-action-altkey.png cr48-action-keypressno.png cr48-action-superkey.png cr16-action-metakey.png cr48-action-controlkey.png cr22-action-unlatched.png cr48-action-kbstate_stickykeys.png crsc-action-unlatched.svg Makefile.in cr32-action-key.png crsc-action-lockkey.svg cr16-action-kbstate_mouse_mid.png cr22-action-kbstate_mouse_mid_selected.png cr16-action-kbstate_mouse_right_selected.png cr22-action-kbstate_slowkeys.png crsc-action-key.svg crsc-action-kbstate_mouse_right_selected.svg cr64-action-keypressok.png cr32-action-shiftkey.png cr22-action-kbstate_mouse_left_selected.png cr64-action-kbstate_mouse_right.png cr64-action-kbstate_mouse_left.png cr22-action-keypressok.png cr32-action-kbstate_mouse_left_selected.png cr16-action-kbstate_mouse_right.png cr22-action-shiftkey.png cr48-action-lockkey.png cr22-action-keypressno.png cr48-action-capskey.png cr32-action-keypressok.png cr64-action-metakey.png cr16-action-keypressno.png cr48-action-kbstate_mouse_right_selected.png cr16-action-superkey.png cr32-action-kbstate_stickykeys.png cr64-action-kbstate_mouse_left_selected.png cr32-action-altkey.png crsc-action-kbstate_mouse_mid_selected.svg cr22-action-capskey.png crsc-action-kbstate_stickykeys.svg cr16-action-unlatched.png cr22-action-lockkey.png cr64-action-keypressno.png cr64-action-kbstate_mouse_right_selected.png cr22-action-kbstate_mouse.png crsc-action-kbstate_mouse.svg cr48-action-keypressok.png cr16-action-kbstate_mouse_left_selected.png cr22-action-kbstate_mouse_mid.png crsc-action-kbstate_mouse_left_selected.svg cr32-action-hyperkey.png cr22-action-altkey.png crsc-action-kbstate_mouse_mid.svg crsc-action-hyperkey.svg cr16-action-capskey.png cr16-action-kbstate_mouse_left.png cr48-action-kbstate_mouse_mid.png cr64-action-hyperkey.png crsc-action-superkey.svg cr64-action-superkey.png crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr22-action-hyperkey.png cr64-action-shiftkey.png cr32-action-unlatched.png cr64-action-lockkey.png cr32-action-capskey.png cr32-action-kbstate_mouse_left.png cr22-action-kbstate_mouse_left.png cr32-action-kbstate_slowkeys.png cr64-action-kbstate_mouse.png cr16-action-altkey.png cr32-action-metakey.png cr22-action-kbstate_mouse_right.png cr22-action-controlkey.png cr48-action-kbstate_mouse.png cr32-action-kbstate_mouse.png cr16-action-key.png cr64-action-altkey.png crsc-action-kbstate_slowkeys.svg cr48-action-kbstate_mouse_left.png cr16-action-keypressok.png cr32-action-controlkey.png cr48-action-unlatched.png cr64-action-controlkey.png crsc-action-capskey.svg crsc-action-shiftkey.svg crsc-action-kbstate_mouse_right.svg cr22-action-kbstate_mouse_right_selected.png Makefile.am cr48-action-kbstate_mouse_left_selected.png
++KDE_DIST=cr22-action-keypressok.png cr32-action-kbstate_mouse_left_selected.png cr32-action-kbstate_mouse_right_selected.png cr16-action-kbstate_mouse_right.png cr48-action-kbstate_mouse_right.png cr16-action-kbstate_mouse.png cr22-action-shiftkey.png cr48-action-lockkey.png cr22-action-keypressno.png cr48-action-capskey.png cr22-action-superkey.png cr32-action-keypressok.png cr64-action-kbstate_mouse_mid.png cr48-action-kbstate_mouse_mid_selected.png cr22-action-kbstate_stickykeys.png cr64-action-metakey.png cr64-action-kbstate_slowkeys.png cr16-action-keypressno.png cr48-action-kbstate_mouse_right_selected.png cr16-action-superkey.png crsc-action-metakey.svg cr32-action-kbstate_stickykeys.png cr64-action-kbstate_mouse_left_selected.png crsc-action-kbstate_mouse_mid_selected.svg cr32-action-altkey.png cr22-action-capskey.png crsc-action-altkey.svg cr32-action-lockkey.png crsc-action-kbstate_stickykeys.svg cr16-action-unlatched.png cr64-action-keypressno.png cr22-action-lockkey.png cr22-action-key.png cr64-action-kbstate_mouse_right_selected.png cr48-action-shiftkey.png cr16-action-shiftkey.png cr32-action-kbstate_mouse_right.png cr16-action-hyperkey.png cr32-action-keypressno.png cr22-action-kbstate_mouse.png cr64-action-kbstate_mouse_mid_selected.png cr64-action-key.png cr16-action-lockkey.png crsc-action-kbstate_mouse.svg cr32-action-kbstate_mouse_mid.png cr48-action-kbstate_slowkeys.png cr48-action-keypressok.png crsc-action-keypressok.svg crsc-action-kbstate_mouse_left.svg cr64-action-unlatched.png cr22-action-kbstate_mouse_mid.png cr16-action-kbstate_mouse_left_selected.png cr16-action-kbstate_stickykeys.png cr32-action-kbstate_mouse_mid_selected.png cr32-action-superkey.png crsc-action-kbstate_mouse_left_selected.svg crsc-action-controlkey.svg cr32-action-hyperkey.png cr22-action-altkey.png crsc-action-kbstate_mouse_mid.svg crsc-action-hyperkey.svg cr64-action-capskey.png cr16-action-capskey.png cr48-action-hyperkey.png cr16-action-kbstate_mouse_left.png cr48-action-kbstate_mouse_mid.png cr64-action-hyperkey.png crsc-action-superkey.svg cr64-action-superkey.png crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr16-action-kbstate_slowkeys.png cr22-action-hyperkey.png cr32-action-unlatched.png cr64-action-shiftkey.png cr64-action-lockkey.png cr32-action-capskey.png cr22-action-metakey.png cr32-action-kbstate_mouse_left.png cr22-action-kbstate_mouse_left.png cr48-action-key.png cr16-action-kbstate_mouse_mid_selected.png cr64-action-kbstate_stickykeys.png cr32-action-kbstate_slowkeys.png cr64-action-kbstate_mouse.png cr48-action-altkey.png cr48-action-keypressno.png cr16-action-metakey.png cr16-action-altkey.png cr48-action-superkey.png cr22-action-kbstate_mouse_right.png cr32-action-metakey.png cr22-action-controlkey.png cr48-action-kbstate_mouse.png cr32-action-kbstate_mouse.png cr16-action-key.png cr22-action-unlatched.png cr64-action-altkey.png cr48-action-controlkey.png cr48-action-kbstate_stickykeys.png crsc-action-kbstate_slowkeys.svg cr48-action-kbstate_mouse_left.png crsc-action-unlatched.svg crsc-action-lockkey.svg Makefile.in cr32-action-key.png cr16-action-keypressok.png cr32-action-controlkey.png cr16-action-kbstate_mouse_mid.png cr22-action-kbstate_mouse_mid_selected.png cr16-action-kbstate_mouse_right_selected.png cr22-action-kbstate_slowkeys.png cr64-action-controlkey.png crsc-action-key.svg cr48-action-unlatched.png crsc-action-kbstate_mouse_right_selected.svg cr64-action-keypressok.png crsc-action-capskey.svg crsc-action-shiftkey.svg crsc-action-kbstate_mouse_right.svg cr32-action-shiftkey.png cr22-action-kbstate_mouse_right_selected.png Makefile.am cr48-action-kbstate_mouse_left_selected.png cr64-action-kbstate_mouse_right.png cr22-action-kbstate_mouse_left_selected.png cr64-action-kbstate_mouse_left.png
#>+ 2
docs-am:
- #>+ 154
+ #>+ 262
install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions
+- $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_left.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left.svg
+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
$(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions
-- $(INSTALL_DATA) $(srcdir)/cr64-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
-- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions
-- $(INSTALL_DATA) $(srcdir)/cr48-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
-+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid.png
+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_mid_selected.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
$(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_stickykeys.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left_selected.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
+- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left_selected.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-capskey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_slowkeys.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
++ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions
++ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_left_selected.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left_selected.svg
++ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_right_selected.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right_selected.svg
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_stickykeys.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_slowkeys.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_slowkeys.svg
+ $(INSTALL_DATA) $(srcdir)/cr22-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions
-- $(INSTALL_DATA) $(srcdir)/crsc-action-capskey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
-- $(INSTALL_DATA) $(srcdir)/cr64-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
-- $(INSTALL_DATA) $(srcdir)/cr64-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-hyperkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
$(INSTALL_DATA) $(srcdir)/cr22-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_right.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right.svg
+- $(INSTALL_DATA) $(srcdir)/cr22-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_slowkeys.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-superkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
+- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
-- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_stickykeys.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right_selected.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_mid.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_right_selected.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right_selected.svg
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_slowkeys.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_left.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left.svg
+ $(INSTALL_DATA) $(srcdir)/crsc-action-capskey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left.png
$(INSTALL_DATA) $(srcdir)/cr16-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/crsc-action-shiftkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
-- $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
-- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/cr32-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/crsc-action-metakey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
-+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_slowkeys.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_stickykeys.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_stickykeys.svg
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_stickykeys.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_stickykeys.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right_selected.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
@@ -7483,69 +11814,150 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-action-controlkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
+ $(INSTALL_DATA) $(srcdir)/cr64-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-shiftkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
- $(INSTALL_DATA) $(srcdir)/crsc-action-keypressno.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
- $(INSTALL_DATA) $(srcdir)/cr48-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
-- $(INSTALL_DATA) $(srcdir)/crsc-action-unlatched.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left_selected.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-shiftkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_left_selected.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left_selected.svg
+- $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-keypressno.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
++ $(INSTALL_DATA) $(srcdir)/cr48-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-keypressok.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
+ $(INSTALL_DATA) $(srcdir)/cr32-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_slowkeys.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_mid.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid.svg
+ $(INSTALL_DATA) $(srcdir)/cr32-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-unlatched.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
+ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_right.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid_selected.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_stickykeys.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_mid_selected.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid_selected.svg
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-altkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_stickykeys.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_slowkeys.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_stickykeys.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right_selected.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_right_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_stickykeys.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-metakey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
+- $(INSTALL_DATA) $(srcdir)/cr64-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left_selected.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-keypressno.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
+- $(INSTALL_DATA) $(srcdir)/cr48-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_slowkeys.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse.svg
+- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-unlatched.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_slowkeys.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_right_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_mid_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_stickykeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_stickykeys.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-key.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-altkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
- $(INSTALL_DATA) $(srcdir)/crsc-action-controlkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
- $(INSTALL_DATA) $(srcdir)/crsc-action-altkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
- $(INSTALL_DATA) $(srcdir)/cr32-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_left.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_slowkeys.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_slowkeys.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_mid.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid.svg
- $(INSTALL_DATA) $(srcdir)/crsc-action-keypressok.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
- $(INSTALL_DATA) $(srcdir)/crsc-action-hyperkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
- $(INSTALL_DATA) $(srcdir)/cr22-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_slowkeys.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_slowkeys.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid_selected.png
$(INSTALL_DATA) $(srcdir)/cr22-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_mid_selected.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid_selected.svg
+ $(INSTALL_DATA) $(srcdir)/crsc-action-key.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
+ $(INSTALL_DATA) $(srcdir)/cr48-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
$(INSTALL_DATA) $(srcdir)/cr16-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left_selected.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_left_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left_selected.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kbstate_mouse_mid.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-superkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
+ $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kbstate_mouse_right.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
$(INSTALL_DATA) $(srcdir)/cr32-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid_selected.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kbstate_mouse.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
++ $(INSTALL_DATA) $(srcdir)/crsc-action-kbstate_mouse_right.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right.svg
+ $(INSTALL_DATA) $(srcdir)/cr64-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kbstate_mouse_mid_selected.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid_selected.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
@@ -7554,62 +11966,84 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_mid_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_slowkeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left_selected.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right_selected.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_stickykeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_stickykeys.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left_selected.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left_selected.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_slowkeys.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_slowkeys.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
-rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_slowkeys.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_stickykeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_mid.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right_selected.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_slowkeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left.png
-rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_slowkeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_stickykeys.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_stickykeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_stickykeys.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
@@ -7617,69 +12051,150 @@
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_left_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_left_selected.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_slowkeys.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_right.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_mid_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_stickykeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid_selected.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_stickykeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_mid_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_slowkeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_stickykeys.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_right_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_stickykeys.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/kbstate_mouse_left_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_slowkeys.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_slowkeys.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_mid_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_stickykeys.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_left.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_slowkeys.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_slowkeys.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid_selected.png
-rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_right.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_right.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_mid_selected.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
-rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_right.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse_left_selected.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_left_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/kbstate_mouse_mid.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/kbstate_mouse_right.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
-rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid_selected.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/kbstate_mouse.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/kbstate_mouse_right.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/kbstate_mouse_mid_selected.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
@@ -7691,7 +12206,7 @@
force-reedit:
--- kbstateapplet/Makefile.in
+++ kbstateapplet/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -236,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7701,7 +12216,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -424,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7710,7 +12225,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7722,18 +12237,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -881,7 +884,7 @@
- -rm -f kbstate.moc
-
- #>+ 2
--KDE_DIST=kbstateapplet.desktop Makefile.in eventsrc configure.in.in Makefile.am
-+KDE_DIST=Makefile.in kbstateapplet.desktop eventsrc configure.in.in Makefile.am
-
- #>+ 3
- clean-closures:
--- kmag/Makefile.in
+++ kmag/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7743,7 +12249,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -420,7 +423,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7752,7 +12258,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -458,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7764,8 +12270,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -782,27 +785,27 @@
+@@ -789,34 +792,34 @@
+ -rm -f kmag.moc kmagselrect.moc kmagzoomview.moc
+ #>+ 2
+-KDE_DIST=hi16-action-hidemouse.png kmag.lsm kmag.kdevprj hi16-action-followmouse.png Makefile.in hi16-action-window.png hi32-app-kmag.png kmag.mdk.spec Makefile.am
++KDE_DIST=hi16-action-hidemouse.png hi32-app-kmag.png kmag.mdk.spec kmag.lsm kmag.kdevprj hi16-action-followmouse.png Makefile.in hi16-action-window.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
#>+ 23
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
@@ -7802,7 +12316,7 @@
force-reedit:
--- kmousetool/kmousetool/Makefile.in
+++ kmousetool/kmousetool/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -242,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7812,7 +12326,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -436,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7821,7 +12335,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7833,9 +12347,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -887,7 +890,7 @@
+ -rm -f kmousetool.moc
+
+ #>+ 2
+-KDE_DIST=Xmd_kmousetool.h Makefile.in kmousetoolui.ui Makefile.am
++KDE_DIST=Xmd_kmousetool.h kmousetoolui.ui Makefile.in Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kmousetool/kmousetool/pics/Makefile.in
+++ kmousetool/kmousetool/pics/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7845,7 +12368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -342,7 +345,7 @@
+@@ -356,7 +359,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7854,7 +12377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -380,9 +383,9 @@
+@@ -394,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7866,16 +12389,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,7 +528,7 @@
+@@ -539,7 +542,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=hi16-action-kmousetool_on.png hi32-app-kmousetool.png hi16-app-kmousetool.png hi32-action-kmousetool_off.png Makefile.in hi32-action-kmousetool_on.png hi16-action-kmousetool_off.png Makefile.am
+-KDE_DIST=hi32-action-kmousetool_off.png Makefile.in hi16-action-kmousetool_on.png hi32-app-kmousetool.png hi16-app-kmousetool.png hi32-action-kmousetool_on.png hi16-action-kmousetool_off.png Makefile.am
+KDE_DIST=hi16-action-kmousetool_on.png hi32-app-kmousetool.png hi16-app-kmousetool.png hi32-action-kmousetool_off.png Makefile.in hi32-action-kmousetool_on.png Makefile.am hi16-action-kmousetool_off.png
#>+ 2
docs-am:
-@@ -533,29 +536,29 @@
+@@ -547,29 +550,29 @@
#>+ 26
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions
@@ -7918,7 +12441,7 @@
force-reedit:
--- kmousetool/Makefile.in
+++ kmousetool/Makefile.in
-@@ -187,6 +187,9 @@
+@@ -194,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7928,7 +12451,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
+@@ -371,7 +374,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7937,7 +12460,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +398,9 @@
+@@ -409,9 +412,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7949,9 +12472,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -698,7 +701,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in kmousetool.lsm Makefile.am
++KDE_DIST=kmousetool.lsm Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
--- kmouth/books/Makefile.in
+++ kmouth/books/Makefile.in
-@@ -183,6 +183,9 @@
+@@ -190,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7961,7 +12493,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -372,7 +375,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7970,7 +12502,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -410,9 +413,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7982,9 +12514,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -608,7 +611,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=en-personal.phrasebook nl-personal.phrasebook nl-courteousness.phrasebook en-howareyou.phrasebook nl-howareyou.phrasebook en-courteousness.phrasebook sv-courteousness.phrasebook sv-howareyou.phrasebook sv-greetings.phrasebook sv-personal.phrasebook nl-greetings.phrasebook Makefile.in de-greetings.phrasebook en.desktop de-personal.phrasebook nl.desktop de-courteousness.phrasebook en-greetings.phrasebook de.desktop sv.desktop de-howareyou.phrasebook Makefile.am
++KDE_DIST=en.desktop en-personal.phrasebook nl-personal.phrasebook nl-courteousness.phrasebook de-personal.phrasebook en-howareyou.phrasebook nl.desktop de-courteousness.phrasebook nl-howareyou.phrasebook en-courteousness.phrasebook en-greetings.phrasebook sv-courteousness.phrasebook sv-howareyou.phrasebook sv-greetings.phrasebook sv-personal.phrasebook de.desktop nl-greetings.phrasebook sv.desktop Makefile.in de-howareyou.phrasebook de-greetings.phrasebook Makefile.am
+
+ #>+ 2
+ docs-am:
--- kmouth/icons/app/Makefile.in
+++ kmouth/icons/app/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7994,7 +12535,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,7 @@
+@@ -354,7 +357,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8003,7 +12544,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -378,9 +381,9 @@
+@@ -392,9 +395,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8015,8 +12556,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -530,29 +533,29 @@
+@@ -537,36 +540,36 @@
+ .NOEXPORT:
+ #>+ 2
+-KDE_DIST=hi22-app-kmouth.png hi32-app-kmouth.png Makefile.in lo32-app-kmouth.png lo22-app-kmouth.png hi48-app-kmouth.png hi16-app-kmouth.png lo16-app-kmouth.png Makefile.am
++KDE_DIST=lo32-app-kmouth.png lo22-app-kmouth.png hi48-app-kmouth.png hi22-app-kmouth.png hi16-app-kmouth.png lo16-app-kmouth.png hi32-app-kmouth.png Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+
#>+ 25
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
@@ -8059,7 +12608,7 @@
force-reedit:
--- kmouth/icons/history/Makefile.in
+++ kmouth/icons/history/Makefile.in
-@@ -172,6 +172,9 @@
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8069,7 +12618,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -346,7 +349,7 @@
+@@ -360,7 +363,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8078,7 +12627,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -384,9 +387,9 @@
+@@ -398,9 +401,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8090,7 +12639,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -536,29 +539,29 @@
+@@ -550,29 +553,29 @@
#>+ 25
install-kde-icons:
@@ -8133,7 +12682,7 @@
force-reedit:
--- kmouth/icons/Makefile.in
+++ kmouth/icons/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -195,6 +195,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8143,7 +12692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -363,7 +366,7 @@
+@@ -377,7 +380,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8152,7 +12701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -401,9 +404,9 @@
+@@ -415,9 +418,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8164,7 +12713,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -703,18 +706,18 @@
+@@ -717,18 +720,18 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
$(INSTALL_DATA) $(srcdir)/hi22-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/speak.png
@@ -8188,7 +12737,7 @@
force-reedit:
--- kmouth/icons/phrase/Makefile.in
+++ kmouth/icons/phrase/Makefile.in
-@@ -172,6 +172,9 @@
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8198,7 +12747,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -346,7 +349,7 @@
+@@ -360,7 +363,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8207,7 +12756,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -384,9 +387,9 @@
+@@ -398,9 +401,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8219,7 +12768,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -538,33 +541,33 @@
+@@ -552,33 +555,33 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
$(INSTALL_DATA) $(srcdir)/hi22-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
@@ -8268,7 +12817,7 @@
force-reedit:
--- kmouth/icons/phrasebook/Makefile.in
+++ kmouth/icons/phrasebook/Makefile.in
-@@ -172,6 +172,9 @@
+@@ -179,6 +179,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8278,7 +12827,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -346,7 +349,7 @@
+@@ -360,7 +363,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8287,7 +12836,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -384,9 +387,9 @@
+@@ -398,9 +401,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8299,7 +12848,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -537,40 +540,40 @@
+@@ -551,40 +554,40 @@
#>+ 37
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
@@ -8365,7 +12914,7 @@
force-reedit:
--- kmouth/Makefile.in
+++ kmouth/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8375,7 +12924,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -432,7 +435,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8384,7 +12933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +473,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8396,7 +12945,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -904,6 +907,13 @@
+@@ -918,6 +921,13 @@
mocs: speech.moc
#>+ 3
@@ -8410,7 +12959,7 @@
optionsdialog.moc: $(srcdir)/optionsdialog.h
$(MOC) $(srcdir)/optionsdialog.h -o optionsdialog.moc
-@@ -918,11 +928,11 @@
+@@ -932,11 +942,11 @@
mocs: texttospeechsystem.moc
#>+ 3
@@ -8425,7 +12974,7 @@
#>+ 3
configwizard.moc: $(srcdir)/configwizard.h
-@@ -932,15 +942,8 @@
+@@ -946,18 +956,11 @@
mocs: configwizard.moc
#>+ 3
@@ -8441,10 +12990,14 @@
+ -rm -f speech.moc phraselist.moc optionsdialog.moc texttospeechsystem.moc kmouth.moc configwizard.moc
#>+ 2
- KDE_DIST=kmouth.lsm Makefile.in Makefile.am
-@@ -993,7 +996,7 @@
+-KDE_DIST=Makefile.in kmouth.lsm Makefile.am
++KDE_DIST=kmouth.lsm Makefile.in Makefile.am
+ #>+ 5
+ clean-ui:
+@@ -1007,7 +1010,7 @@
+
#>+ 11
-kmouth.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/texttospeechconfigurationwidget.cpp $(srcdir)/optionsdialog.cpp $(srcdir)/configwizard.cpp $(srcdir)/phraseedit.cpp $(srcdir)/phraselist.cpp $(srcdir)/speech.cpp $(srcdir)/texttospeechsystem.cpp $(srcdir)/phraselistitem.cpp $(srcdir)/kmouth.cpp $(srcdir)/main.cpp preferencesui.cpp texttospeechconfigurationui.cpp speech.moc texttospeechsystem.moc kmouth.moc preferencesui.moc optionsdialog.moc phraselist.moc texttospeechconfigurationui.moc configwizard.moc
+kmouth.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/texttospeechconfigurationwidget.cpp $(srcdir)/optionsdialog.cpp $(srcdir)/configwizard.cpp $(srcdir)/phraseedit.cpp $(srcdir)/phraselist.cpp $(srcdir)/speech.cpp $(srcdir)/texttospeechsystem.cpp $(srcdir)/phraselistitem.cpp $(srcdir)/kmouth.cpp $(srcdir)/main.cpp preferencesui.cpp texttospeechconfigurationui.cpp speech.moc texttospeechsystem.moc kmouth.moc preferencesui.moc phraselist.moc optionsdialog.moc texttospeechconfigurationui.moc configwizard.moc
@@ -8453,7 +13006,7 @@
echo "#define KDE_USE_FINAL 1" >> kmouth.all_cpp.final; \
--- kmouth/phrasebook/Makefile.in
+++ kmouth/phrasebook/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8463,7 +13016,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -416,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8472,7 +13025,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -454,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8486,7 +13039,7 @@
clean-noinstLIBRARIES:
--- kmouth/wordcompletion/Makefile.in
+++ kmouth/wordcompletion/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8496,7 +13049,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,7 @@
+@@ -409,7 +412,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8505,7 +13058,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +436,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8517,9 +13070,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -711,7 +714,7 @@
+ -rm -f dictionarycreationwizard.moc wordcompletion.moc wordcompletionwidget.moc klanguagebutton.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in wordcompletionui.ui.h Makefile.am
++KDE_DIST=wordcompletionui.ui.h Makefile.in Makefile.am
+
+ #>+ 7
+ clean-ui:
--- ksayit/Freeverb_plugin/Makefile.in
+++ ksayit/Freeverb_plugin/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -231,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8529,7 +13091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8538,7 +13100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8550,9 +13112,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-fxpluginsLTLIBRARIES: $(fxplugins_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -790,7 +793,7 @@
+ -rm -f ksayitfreeverblib.moc freeverbsetupimpl.moc
+
+ #>+ 2
+-KDE_DIST=freeverb_setup.ui Makefile.in ksayit_libFreeverb_service.desktop ksayit_libFreeverb.desktop configure.in.in Makefile.am
++KDE_DIST=ksayit_libFreeverb_service.desktop ksayit_libFreeverb.desktop freeverb_setup.ui configure.in.in Makefile.in Makefile.am
+
+ #>+ 4
+ clean-ui:
--- ksayit/KTTSD_Lib/Makefile.in
+++ ksayit/KTTSD_Lib/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8562,7 +13133,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8571,7 +13142,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8583,7 +13154,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -738,22 +741,22 @@
+@@ -755,22 +758,22 @@
mocs: kttsdlibsetupimpl.moc
#>+ 3
@@ -8613,7 +13184,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am KTTSDlibSetup.ui
-@@ -815,7 +818,7 @@
+@@ -832,7 +835,7 @@
#>+ 11
@@ -8624,7 +13195,7 @@
echo "#define KDE_USE_FINAL 1" >> libKTTSD_Lib_la.all_cpp.final; \
--- ksayit/Makefile.in
+++ ksayit/Makefile.in
-@@ -187,6 +187,9 @@
+@@ -194,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8634,7 +13205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -372,7 +375,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8643,7 +13214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -410,9 +413,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8655,9 +13226,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -699,7 +702,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=DocBook.README Makefile.in ksayit.kdevelop Doxyfile configure.in.in Makefile.am
++KDE_DIST=DocBook.README Doxyfile configure.in.in Makefile.in ksayit.kdevelop Makefile.am
+
+ #>+ 2
+ docs-am:
--- ksayit/src/Makefile.in
+++ ksayit/src/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8667,7 +13247,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -462,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8676,7 +13256,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -500,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8688,20 +13268,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -809,18 +812,18 @@
- .NOEXPORT:
+@@ -858,18 +861,18 @@
+ mocs: ksayit.moc
#>+ 3
--ksayitsystemtray.moc: $(srcdir)/ksayitsystemtray.h
-- $(MOC) $(srcdir)/ksayitsystemtray.h -o ksayitsystemtray.moc
-+fxpluginhandler.moc: $(srcdir)/fxpluginhandler.h
-+ $(MOC) $(srcdir)/fxpluginhandler.h -o fxpluginhandler.moc
-
- #>+ 2
--mocs: ksayitsystemtray.moc
-+mocs: fxpluginhandler.moc
-
- #>+ 3
-fxpluginhandler.moc: $(srcdir)/fxpluginhandler.h
- $(MOC) $(srcdir)/fxpluginhandler.h -o fxpluginhandler.moc
+ksayitsystemtray.moc: $(srcdir)/ksayitsystemtray.h
@@ -8712,21 +13282,21 @@
+mocs: ksayitsystemtray.moc
#>+ 3
- voicesetupdlg.moc: $(srcdir)/voicesetupdlg.h
-@@ -830,18 +833,18 @@
- mocs: voicesetupdlg.moc
+-ksayitsystemtray.moc: $(srcdir)/ksayitsystemtray.h
+- $(MOC) $(srcdir)/ksayitsystemtray.h -o ksayitsystemtray.moc
++fxpluginhandler.moc: $(srcdir)/fxpluginhandler.h
++ $(MOC) $(srcdir)/fxpluginhandler.h -o fxpluginhandler.moc
- #>+ 3
--ksayitviewimpl.moc: $(srcdir)/ksayitviewimpl.h
-- $(MOC) $(srcdir)/ksayitviewimpl.h -o ksayitviewimpl.moc
-+fxsetupimpl.moc: $(srcdir)/fxsetupimpl.h
-+ $(MOC) $(srcdir)/fxsetupimpl.h -o fxsetupimpl.moc
-
#>+ 2
--mocs: ksayitviewimpl.moc
-+mocs: fxsetupimpl.moc
+-mocs: ksayitsystemtray.moc
++mocs: fxpluginhandler.moc
#>+ 3
+ ksayit_fxplugin.moc.cpp: $(srcdir)/ksayit_fxplugin.h
+@@ -879,25 +882,25 @@
+ mocs: ksayit_fxplugin.moc.cpp
+
+ #>+ 3
-fxsetupimpl.moc: $(srcdir)/fxsetupimpl.h
- $(MOC) $(srcdir)/fxsetupimpl.h -o fxsetupimpl.moc
+ksayitviewimpl.moc: $(srcdir)/ksayitviewimpl.h
@@ -8737,17 +13307,27 @@
+mocs: ksayitviewimpl.moc
#>+ 3
- ksayit.moc: $(srcdir)/ksayit.h
-@@ -852,7 +855,7 @@
+-ksayitviewimpl.moc: $(srcdir)/ksayitviewimpl.h
+- $(MOC) $(srcdir)/ksayitviewimpl.h -o ksayitviewimpl.moc
++fxsetupimpl.moc: $(srcdir)/fxsetupimpl.h
++ $(MOC) $(srcdir)/fxsetupimpl.h -o fxsetupimpl.moc
+ #>+ 2
+-mocs: ksayitviewimpl.moc
++mocs: fxsetupimpl.moc
+
#>+ 3
clean-metasources:
-- -rm -f ksayitsystemtray.moc fxpluginhandler.moc voicesetupdlg.moc ksayitviewimpl.moc fxsetupimpl.moc ksayit.moc
-+ -rm -f fxpluginhandler.moc ksayitsystemtray.moc voicesetupdlg.moc fxsetupimpl.moc ksayitviewimpl.moc ksayit.moc
+- -rm -f contextmenuhandler.moc voicesetupdlg.moc ksayit.moc fxpluginhandler.moc ksayitsystemtray.moc ksayit_fxplugin.moc.cpp fxsetupimpl.moc ksayitviewimpl.moc
++ -rm -f contextmenuhandler.moc voicesetupdlg.moc ksayit.moc ksayitsystemtray.moc fxpluginhandler.moc ksayit_fxplugin.moc.cpp ksayitviewimpl.moc fxsetupimpl.moc
#>+ 2
- KDE_DIST=ksayitui.rc hi32-app-ksayit_clipempty.png hi16-app-ksayit.png DocTreeView.ui fx_setup.ui hi32-app-ksayit_talking.png hi32-app-ksayit.png KSayItView.ui Makefile.in ksayit.desktop Makefile.am
-@@ -870,17 +873,17 @@
+-KDE_DIST=ksayitui.rc DocTreeView.ui hi32-app-ksayit.png Makefile.in hi32-app-ksayit_clipempty.png hi16-app-ksayit.png DocTreeView.ui.h fx_setup.ui hi32-app-ksayit_talking.png ContextMenus.xml KSayItView.ui ksayit.desktop Makefile.am
++KDE_DIST=ksayitui.rc hi32-app-ksayit_clipempty.png hi16-app-ksayit.png DocTreeView.ui.h DocTreeView.ui fx_setup.ui hi32-app-ksayit_talking.png hi32-app-ksayit.png ContextMenus.xml KSayItView.ui Makefile.in ksayit.desktop Makefile.am
+
+ #>+ 4
+ clean-idl:
+@@ -917,17 +920,17 @@
#>+ 14
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
@@ -8769,28 +13349,18 @@
#>+ 15
force-reedit:
-@@ -921,7 +924,7 @@
+@@ -968,7 +971,7 @@
#>+ 11
--ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayit_skel.cpp $(srcdir)/ksayit_stub.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp voicesetupdlg.moc ksayit.moc fx_setup.moc ksayitsystemtray.moc fxpluginhandler.moc DocTreeView.moc ksayitviewimpl.moc fxsetupimpl.moc KSayItView.moc
-+ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayit_skel.cpp $(srcdir)/ksayit_stub.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp voicesetupdlg.moc ksayit.moc fx_setup.moc fxpluginhandler.moc ksayitsystemtray.moc DocTreeView.moc fxsetupimpl.moc ksayitviewimpl.moc KSayItView.moc
+-ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp $(srcdir)/contextmenuhandler.cpp $(srcdir)/docbookclasses.cpp $(srcdir)/docbookgenerator.cpp $(srcdir)/docbookparser.cpp ksayit_skel.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp ksayit_fxplugin.moc.cpp contextmenuhandler.moc voicesetupdlg.moc ksayit.moc fx_setup.moc fxpluginhandler.moc ksayitsystemtray.moc ksayitviewimpl.moc fxsetupimpl.moc DocTreeView.moc KSayItView.moc
++ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp $(srcdir)/contextmenuhandler.cpp $(srcdir)/docbookclasses.cpp $(srcdir)/docbookgenerator.cpp $(srcdir)/docbookparser.cpp ksayit_skel.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp ksayit_fxplugin.moc.cpp contextmenuhandler.moc voicesetupdlg.moc ksayit.moc fx_setup.moc ksayitsystemtray.moc fxpluginhandler.moc fxsetupimpl.moc ksayitviewimpl.moc DocTreeView.moc KSayItView.moc
@echo 'creating ksayit.all_cpp.cpp ...'; \
rm -f ksayit.all_cpp.files ksayit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> ksayit.all_cpp.final; \
-@@ -969,8 +972,8 @@
- $(srcdir)/parasaxparser.cpp: DocTreeView.h fx_setup.h KSayItView.h
- fxsetupimpl.lo: fxsetupimpl.moc
- $(srcdir)/saxhandler.cpp: DocTreeView.h fx_setup.h KSayItView.h
--ksayitsystemtray.o: ksayitsystemtray.moc
- ksayitviewimpl.o: ksayitviewimpl.moc
-+ksayitsystemtray.o: ksayitsystemtray.moc
- ksayitviewimpl.lo: ksayitviewimpl.moc
- $(srcdir)/ksayit_skel.cpp: DocTreeView.h fx_setup.h KSayItView.h
- $(srcdir)/ksayit.cpp: DocTreeView.h fx_setup.h KSayItView.h
--- kttsd/app-plugins/kate/Makefile.in
+++ kttsd/app-plugins/kate/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -220,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8800,7 +13370,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -414,7 +417,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8809,7 +13379,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -452,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8823,7 +13393,7 @@
@$(NORMAL_INSTALL)
--- kttsd/app-plugins/Makefile.in
+++ kttsd/app-plugins/Makefile.in
-@@ -186,6 +186,9 @@
+@@ -193,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8833,7 +13403,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -356,7 +359,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8842,7 +13412,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -394,9 +397,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8854,9 +13424,92 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+--- kttsd/compat/icons/Makefile.in
++++ kttsd/compat/icons/Makefile.in
+@@ -177,6 +177,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -354,7 +357,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -392,9 +395,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+@@ -537,36 +540,36 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr64-app-kttsd.png cr48-app-kttsd.png cr32-app-kttsd.png Makefile.in cr128-app-kttsd.png cr22-app-kttsd.png cr16-app-kttsd.png Makefile.am crsc-app-kttsd.svgz
++KDE_DIST=cr22-app-kttsd.png cr64-app-kttsd.png cr48-app-kttsd.png cr16-app-kttsd.png cr32-app-kttsd.png Makefile.in Makefile.am crsc-app-kttsd.svgz cr128-app-kttsd.png
+
+ #>+ 2
+ docs-am:
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+
+ #>+ 15
+ force-reedit:
--- kttsd/compat/interfaces/kspeech/Makefile.in
+++ kttsd/compat/interfaces/kspeech/Makefile.in
-@@ -187,6 +187,9 @@
+@@ -194,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8866,7 +13519,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,7 @@
+@@ -379,7 +382,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8875,7 +13528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -400,9 +403,9 @@
+@@ -417,9 +420,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8889,7 +13542,7 @@
mostlyclean-libtool:
--- kttsd/compat/interfaces/Makefile.in
+++ kttsd/compat/interfaces/Makefile.in
-@@ -186,6 +186,9 @@
+@@ -193,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8899,7 +13552,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -372,7 +375,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8908,7 +13561,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -410,9 +413,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8922,7 +13575,7 @@
mostlyclean-libtool:
--- kttsd/compat/Makefile.in
+++ kttsd/compat/Makefile.in
-@@ -186,6 +186,9 @@
+@@ -193,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8932,7 +13585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -373,7 +376,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8941,7 +13594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -411,9 +414,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8955,7 +13608,7 @@
mostlyclean-libtool:
--- kttsd/filters/Makefile.in
+++ kttsd/filters/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -232,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8965,7 +13618,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -426,7 +429,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8974,7 +13627,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +453,9 @@
+@@ -464,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8988,7 +13641,7 @@
clean-checkPROGRAMS:
--- kttsd/filters/sbd/Makefile.in
+++ kttsd/filters/sbd/Makefile.in
-@@ -220,6 +220,9 @@
+@@ -227,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8998,7 +13651,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -434,7 +437,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9007,7 +13660,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -472,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9019,9 +13672,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -800,7 +803,7 @@
+ -rm -f sbdconf.moc sbdproc.moc
+
+ #>+ 2
+-KDE_DIST=sbdconf.h polish_festival_sbdrc kttsd_sbdplugin.desktop Makefile.in standard_sbdrc sbdconfwidget.ui Makefile.am
++KDE_DIST=sbdconf.h standard_sbdrc polish_festival_sbdrc kttsd_sbdplugin.desktop sbdconfwidget.ui Makefile.in Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kttsd/filters/stringreplacer/Makefile.in
+++ kttsd/filters/stringreplacer/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -231,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9031,7 +13693,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9040,7 +13702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9052,18 +13714,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -804,7 +807,7 @@
+@@ -812,7 +815,7 @@
-rm -f stringreplacerproc.moc stringreplacerconf.moc
#>+ 2
--KDE_DIST=abbreviations.xml stringreplacerconfwidget.ui stringreplacerconf.h polish_festival_unspeakables.xml polish_festival_fixes.xml kmail.xml stringreplacerproc.h kttsd_stringreplacerplugin.desktop Makefile.in chat.xml editreplacementwidget.ui Makefile.am emoticons.xml
-+KDE_DIST=abbreviations.xml stringreplacerconfwidget.ui stringreplacerconf.h polish_festival_unspeakables.xml polish_festival_fixes.xml kmail.xml stringreplacerproc.h kttsd_stringreplacerplugin.desktop Makefile.in editreplacementwidget.ui chat.xml emoticons.xml Makefile.am
+-KDE_DIST=festival_unspeakable_chars.xml qt2plaintext.xml stringreplacerconf.h polish_festival_unspeakables.xml stringreplacerproc.h Makefile.in chat.xml editreplacementwidget.ui abbreviations.xml stringreplacerconfwidget.ui polish_festival_fixes.xml kmail.xml kttsd_stringreplacerplugin.desktop Makefile.am emoticons.xml
++KDE_DIST=festival_unspeakable_chars.xml abbreviations.xml qt2plaintext.xml stringreplacerconfwidget.ui stringreplacerconf.h polish_festival_unspeakables.xml polish_festival_fixes.xml kmail.xml stringreplacerproc.h kttsd_stringreplacerplugin.desktop Makefile.in editreplacementwidget.ui chat.xml emoticons.xml Makefile.am
#>+ 5
clean-ui:
--- kttsd/filters/talkerchooser/Makefile.in
+++ kttsd/filters/talkerchooser/Makefile.in
-@@ -223,6 +223,9 @@
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9073,7 +13735,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -436,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9082,7 +13744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9094,9 +13756,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -802,7 +805,7 @@
+ -rm -f talkerchooserconf.moc talkerchooserproc.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in talkerchooserconf.h female_notifications_rc talkerchooserconfwidget.ui talkerchooserproc.h Makefile.am kttsd_talkerchooserplugin.desktop
++KDE_DIST=talkerchooserconfwidget.ui Makefile.in talkerchooserconf.h talkerchooserproc.h female_notifications_rc Makefile.am kttsd_talkerchooserplugin.desktop
+
+ #>+ 4
+ clean-ui:
--- kttsd/filters/xmltransformer/Makefile.in
+++ kttsd/filters/xmltransformer/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -231,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9106,7 +13777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9115,7 +13786,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9127,9 +13798,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -801,7 +804,7 @@
+ -rm -f xmltransformerconf.moc xmltransformerproc.moc
+
+ #>+ 2
+-KDE_DIST=xmltransformerproc.h xhtml2ssml.xsl Makefile.in kttsd_xmltransformerplugin.desktop xhtml2ssml_simple.xsl xmltransformerconf.h xmltransformerconfwidget.ui Makefile.am
++KDE_DIST=xhtml2ssml_simple.xsl xmltransformerproc.h xmltransformerconf.h xhtml2ssml.xsl xmltransformerconfwidget.ui Makefile.in Makefile.am kttsd_xmltransformerplugin.desktop
+
+ #>+ 4
+ clean-ui:
--- kttsd/icons/Makefile.in
+++ kttsd/icons/Makefile.in
-@@ -170,6 +170,9 @@
+@@ -177,6 +177,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9139,7 +13819,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -342,7 +345,7 @@
+@@ -354,7 +357,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9148,7 +13828,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -380,9 +383,9 @@
+@@ -392,9 +395,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9160,84 +13840,72 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -532,50 +535,50 @@
+@@ -537,48 +540,48 @@
+ .NOEXPORT:
- #>+ 46
+ #>+ 2
+-KDE_DIST=hi16-action-nospeak.png lo22-action-speak.png hi32-action-speak.png Makefile.in hi16-action-male.png lo16-action-speak.png hi16-action-female.png hi48-action-nospeak.png hi22-action-nospeak.png hi16-action-speak.png hi32-action-nospeak.png hi48-action-speak.png hi22-action-speak.png Makefile.am lo32-action-speak.png
++KDE_DIST=hi16-action-nospeak.png hi22-action-nospeak.png lo22-action-speak.png hi16-action-speak.png hi32-action-speak.png hi32-action-nospeak.png Makefile.in hi48-action-speak.png hi22-action-speak.png hi16-action-male.png lo16-action-speak.png Makefile.am hi16-action-female.png lo32-action-speak.png hi48-action-nospeak.png
+
+ #>+ 2
+ docs-am:
+
+ #>+ 37
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
-- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/hi22-action-nospeak.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/nospeak.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/lo16-action-speak.png $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/speak.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-male.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/male.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/hi32-action-nospeak.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/nospeak.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-nospeak.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/nospeak.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/hi22-action-speak.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/speak.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-speak.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/speak.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/hi16-action-speak.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/speak.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/lo32-action-speak.png $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/speak.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions
+ $(INSTALL_DATA) $(srcdir)/hi48-action-nospeak.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/nospeak.png
+ $(INSTALL_DATA) $(srcdir)/hi48-action-speak.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/speak.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-speak.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/speak.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-nospeak.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/nospeak.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-nospeak.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/nospeak.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-female.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/female.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/lo22-action-speak.png $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/speak.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/lo32-action-speak.png $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/speak.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-male.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/male.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
-- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/nospeak.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/actions/speak.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/male.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/nospeak.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/nospeak.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/speak.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/speak.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/speak.png
++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/speak.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/nospeak.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/speak.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/speak.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/nospeak.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/nospeak.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/female.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/actions/speak.png
+- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/actions/speak.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/male.png
#>+ 15
force-reedit:
--- kttsd/kcmkttsmgr/Makefile.in
+++ kttsd/kcmkttsmgr/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -229,6 +229,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9247,7 +13915,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -471,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9256,7 +13924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9268,18 +13936,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -854,7 +857,7 @@
+ -rm -f kcmkttsmgr.moc selectevent.moc addtalker.moc
+
+ #>+ 2
+-KDE_DIST=kcmkttsd_testmessage.desktop kcmkttsd.desktop kcmkttsmgrwidget.ui selecteventwidget.ui Makefile.in addtalkerwidget.ui Makefile.am
++KDE_DIST=kcmkttsd_testmessage.desktop kcmkttsd.desktop kcmkttsmgrwidget.ui addtalkerwidget.ui selecteventwidget.ui Makefile.in Makefile.am
+
+ #>+ 5
+ clean-idl:
--- kttsd/kttsd/Makefile.in
+++ kttsd/kttsd/Makefile.in
-@@ -70,7 +70,7 @@
- am__DEPENDENCIES_1 =
- kttsd_DEPENDENCIES = $(top_builddir)/kttsd/libkttsd/libkttsd.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-@@ -227,6 +227,9 @@
+@@ -234,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9289,29 +13957,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,6 @@
- INCLUDES = \
- -I$(top_srcdir)/kttsd/libkttsd \
- -I$(kde_includes)/arts \
-- $(CFLAGS_GST) \
- $(KTTS_KSPEECH_INCLUDE) \
- $(all_includes)
+@@ -467,7 +470,7 @@
-@@ -433,11 +435,10 @@
- filtermgr.cpp \
- talkermgr.cpp kspeech_skel.cpp kspeechsink_stub.cpp kttsd_skel.cpp
-
--kttsd_LDFLAGS = -avoid-version -module $(LDFLAGS_GST) $(all_libraries) $(KDE_RPATH)
-+kttsd_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
- kttsd_LDADD = \
- $(top_builddir)/kttsd/libkttsd/libkttsd.la \
- $(LIB_KDECORE) \
-- $(LDADD_GST) \
- $(LIB_KIO) \
- $(LIB_KUTILS)
-
-@@ -455,7 +456,7 @@
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -9319,7 +13966,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +494,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9331,40 +13978,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -854,7 +857,7 @@
+ -rm -f filtermgr.moc speaker.moc ssmlconvert.moc kttsd.moc speechdata.moc
+
+ #>+ 2
+-KDE_DIST=filtermgr.h kttsd.h Makefile.in speaker.h speechdata.h kttsd.desktop SSMLtoPlainText.xsl talkermgr.h Makefile.am
++KDE_DIST=speechdata.h filtermgr.h kttsd.desktop kttsd.h SSMLtoPlainText.xsl talkermgr.h Makefile.in speaker.h Makefile.am
+
+ #>+ 6
+ clean-idl:
--- kttsd/kttsjobmgr/Makefile.in
+++ kttsd/kttsjobmgr/Makefile.in
-@@ -41,8 +41,8 @@
- host_triplet = @host@
- target_triplet = @target@
- subdir = kttsd/kttsjobmgr
--DIST_COMMON = $(kpartsinclude_HEADERS) $(noinst_HEADERS) \
-- $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-@@ -58,8 +58,7 @@
- esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(rcdir)" \
-- "$(DESTDIR)$(kpartsincludedir)"
-+ "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(rcdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -99,8 +98,7 @@
- kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- rcDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(kde_services_DATA) $(rc_DATA)
--kpartsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
--HEADERS = $(kpartsinclude_HEADERS) $(noinst_HEADERS)
-+HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -224,6 +222,9 @@
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9374,19 +13999,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,10 +434,6 @@
- $(LIB_KFILE) $(LIBVM) $(LIB_KPARTS)
+@@ -448,7 +451,7 @@
-
--# Header files to be installed.
--kpartsincludedir = $(includedir)/kparts
--kpartsinclude_HEADERS = kttsjobmgr.h
--
- # Header files not to be installed.
- noinst_HEADERS = selecttalkerwidget.h
-
-@@ -452,7 +449,7 @@
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -9394,7 +14008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +487,9 @@
+@@ -486,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9406,106 +14020,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -599,23 +596,6 @@
- echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
- rm -f "$(DESTDIR)$(rcdir)/$$f"; \
- done
--install-kpartsincludeHEADERS: $(kpartsinclude_HEADERS)
-- @$(NORMAL_INSTALL)
-- test -z "$(kpartsincludedir)" || $(mkdir_p) "$(DESTDIR)$(kpartsincludedir)"
-- @list='$(kpartsinclude_HEADERS)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(kpartsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kpartsincludedir)/$$f'"; \
-- $(kpartsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kpartsincludedir)/$$f"; \
-- done
--
--uninstall-kpartsincludeHEADERS:
-- @$(NORMAL_UNINSTALL)
-- @list='$(kpartsinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(kpartsincludedir)/$$f'"; \
-- rm -f "$(DESTDIR)$(kpartsincludedir)/$$f"; \
-- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -696,7 +676,7 @@
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
- installdirs:
-- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(kpartsincludedir)"; do \
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(rcdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
- install: install-am
-@@ -750,12 +730,10 @@
- info-am:
-
- #>- install-data-am: install-kde_moduleLTLIBRARIES \
--#>- install-kde_servicesDATA install-kpartsincludeHEADERS \
--#>- install-rcDATA
--#>+ 3
-+#>- install-kde_servicesDATA install-rcDATA
-+#>+ 2
- install-data-am: \
-- install-kde_servicesDATA install-kpartsincludeHEADERS \
-- install-rcDATA
-+ install-kde_servicesDATA install-rcDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -786,8 +764,7 @@
- ps-am:
-
- uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-- uninstall-kde_servicesDATA uninstall-kpartsincludeHEADERS \
-- uninstall-rcDATA
-+ uninstall-kde_servicesDATA uninstall-rcDATA
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
-@@ -796,13 +773,12 @@
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-- install-kpartsincludeHEADERS install-man install-rcDATA \
-- install-strip installcheck installcheck-am installdirs \
-- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-- pdf pdf-am ps ps-am tags uninstall uninstall-am \
-- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-- uninstall-kde_servicesDATA uninstall-kpartsincludeHEADERS \
-+ install-man install-rcDATA install-strip installcheck \
-+ installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags uninstall uninstall-am uninstall-info-am \
-+ uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
- uninstall-rcDATA
-
-
-@@ -844,7 +820,7 @@
+@@ -802,7 +805,7 @@
-rm -f kttsjobmgr.moc
#>+ 2
--KDE_DIST=kttsjobmgr.desktop selecttalkerwidget.ui kttsjobmgrui.rc Makefile.in Makefile.am
-+KDE_DIST=kttsjobmgr.desktop selecttalkerwidget.ui kttsjobmgrui.rc kttsjobmgr.h Makefile.in Makefile.am
+-KDE_DIST=kttsjobmgr.h Makefile.in kttsjobmgr.desktop Makefile.am
++KDE_DIST=kttsjobmgr.desktop kttsjobmgr.h Makefile.in Makefile.am
#>+ 5
clean-idl:
-@@ -887,7 +863,7 @@
- bcheck: bcheck-am
-
- bcheck-am:
-- @for i in $(kpartsinclude_HEADERS) ; do \
-+ @for i in ; do \
- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
--- kttsd/kttsmgr/Makefile.in
+++ kttsd/kttsmgr/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9515,7 +14041,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -437,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9524,7 +14050,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -475,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9538,7 +14064,7 @@
@$(NORMAL_INSTALL)
--- kttsd/libkttsd/Makefile.in
+++ kttsd/libkttsd/Makefile.in
-@@ -223,6 +223,9 @@
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9548,7 +14074,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9557,7 +14083,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9569,7 +14095,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -769,18 +772,18 @@
+@@ -800,18 +803,18 @@
#>+ 3
@@ -9593,8 +14119,8 @@
+mocs: pluginproc.moc
#>+ 3
- stretcher.moc: $(srcdir)/stretcher.h
-@@ -790,18 +793,18 @@
+ selecttalkerdlg.moc: $(srcdir)/selecttalkerdlg.h
+@@ -828,18 +831,18 @@
mocs: stretcher.moc
#>+ 3
@@ -9619,27 +14145,31 @@
#>+ 3
pluginconf.moc: $(srcdir)/pluginconf.h
-@@ -812,7 +815,7 @@
+@@ -850,10 +853,10 @@
#>+ 3
clean-metasources:
-- -rm -f pluginproc.moc filterproc.moc stretcher.moc player.moc.cpp filterconf.moc pluginconf.moc
-+ -rm -f filterproc.moc pluginproc.moc stretcher.moc filterconf.moc player.moc.cpp pluginconf.moc
+- -rm -f pluginproc.moc filterproc.moc selecttalkerdlg.moc stretcher.moc player.moc.cpp filterconf.moc pluginconf.moc
++ -rm -f filterproc.moc pluginproc.moc selecttalkerdlg.moc stretcher.moc filterconf.moc player.moc.cpp pluginconf.moc
#>+ 2
- KDE_DIST=kttsd_synthplugin.desktop filterproc.h Makefile.in filterconf.h Makefile.am
-@@ -863,7 +866,7 @@
+-KDE_DIST=selecttalkerwidget.ui notify.h Makefile.in kttsd_synthplugin.desktop filterproc.h filterconf.h Makefile.am
++KDE_DIST=selecttalkerwidget.ui kttsd_synthplugin.desktop notify.h filterproc.h Makefile.in filterconf.h Makefile.am
+ #>+ 4
+ clean-ui:
+@@ -906,7 +909,7 @@
+
#>+ 11
--libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp player.moc.cpp filterproc.moc pluginproc.moc filterconf.moc stretcher.moc pluginconf.moc
-+libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp player.moc.cpp pluginproc.moc filterproc.moc filterconf.moc stretcher.moc pluginconf.moc
+-libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp $(srcdir)/selecttalkerdlg.cpp $(srcdir)/notify.cpp selecttalkerwidget.cpp player.moc.cpp filterproc.moc pluginproc.moc selecttalkerdlg.moc selecttalkerwidget.moc filterconf.moc stretcher.moc pluginconf.moc
++libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp $(srcdir)/selecttalkerdlg.cpp $(srcdir)/notify.cpp selecttalkerwidget.cpp player.moc.cpp pluginproc.moc filterproc.moc selecttalkerdlg.moc selecttalkerwidget.moc filterconf.moc stretcher.moc pluginconf.moc
@echo 'creating libkttsd_la.all_cpp.cpp ...'; \
rm -f libkttsd_la.all_cpp.files libkttsd_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkttsd_la.all_cpp.final; \
--- kttsd/Makefile.in
+++ kttsd/Makefile.in
-@@ -187,6 +187,9 @@
+@@ -194,6 +194,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9649,7 +14179,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -371,7 +374,7 @@
+@@ -385,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9658,7 +14188,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -409,9 +412,9 @@
+@@ -423,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9670,9 +14200,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -718,7 +721,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=sample.polish TODO.french sample.ssml kttsd.lsm Makefile.in configure.in.bot cvs2dist clean_obsolete.sh configure.in.in README.kttsd Makefile.am
++KDE_DIST=sample.polish configure.in.bot TODO.french cvs2dist sample.ssml clean_obsolete.sh kttsd.lsm configure.in.in Makefile.in README.kttsd Makefile.am
+
+ #>+ 2
+ docs-am:
+--- kttsd/players/akodeplayer/Makefile.in
++++ kttsd/players/akodeplayer/Makefile.in
+@@ -229,6 +229,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -438,7 +441,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -476,9 +479,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kttsd/players/alsaplayer/Makefile.in
++++ kttsd/players/alsaplayer/Makefile.in
+@@ -226,6 +226,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -437,7 +440,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -475,9 +478,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kttsd/players/artsplayer/Makefile.in
+++ kttsd/players/artsplayer/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9682,7 +14287,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -438,7 +441,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9691,7 +14296,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -476,9 +479,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9703,9 +14308,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -776,7 +779,7 @@
+ -rm -f artsplayer.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in kttsd_artsplugin.desktop Makefile.am
++KDE_DIST=kttsd_artsplugin.desktop Makefile.in Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kttsd/players/gstplayer/Makefile.in
+++ kttsd/players/gstplayer/Makefile.in
-@@ -221,6 +221,9 @@
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9715,7 +14329,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9724,7 +14338,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9736,9 +14350,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -778,7 +781,7 @@
+ -rm -f gstreamerplayer.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in kttsd_gstplugin.desktop Makefile.am
++KDE_DIST=kttsd_gstplugin.desktop Makefile.in Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kttsd/players/Makefile.in
+++ kttsd/players/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -203,6 +203,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9748,7 +14371,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -373,7 +376,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9757,7 +14380,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -411,9 +414,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9771,7 +14394,7 @@
mostlyclean-libtool:
--- kttsd/plugins/command/Makefile.in
+++ kttsd/plugins/command/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9781,7 +14404,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -425,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9790,7 +14413,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9802,9 +14425,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -771,7 +774,7 @@
+ -rm -f commandproc.moc commandconf.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in kttsd_commandplugin.desktop commandconfwidget.ui configure.in.in commandconf.h Makefile.am commandproc.h
++KDE_DIST=commandconfwidget.ui configure.in.in commandconf.h Makefile.in Makefile.am commandproc.h kttsd_commandplugin.desktop
+
+ #>+ 4
+ clean-ui:
--- kttsd/plugins/epos/Makefile.in
+++ kttsd/plugins/epos/Makefile.in
-@@ -221,6 +221,9 @@
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9814,7 +14446,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -428,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9823,7 +14455,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -466,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9835,9 +14467,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -774,7 +777,7 @@
+ -rm -f eposproc.moc eposconf.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in configure.in.bot kttsd_eposplugin.desktop configure.in.in eposconfwidget.ui Makefile.am
++KDE_DIST=configure.in.bot kttsd_eposplugin.desktop configure.in.in Makefile.in eposconfwidget.ui Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kttsd/plugins/festivalint/Makefile.in
+++ kttsd/plugins/festivalint/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -234,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9847,7 +14488,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -432,7 +435,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9856,7 +14497,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +473,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9868,9 +14509,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -827,7 +830,7 @@
+ -rm -f festivalintproc.moc festivalintconf.moc
+
+ #>+ 2
+-KDE_DIST=festivalintproc.h kttsd_festivalintplugin.desktop voices SSMLtoSable.xsl Makefile.in festivalintconf.h configure.in.bot sabletowave.scm configure.in.in festivalintconfwidget.ui Makefile.am
++KDE_DIST=configure.in.bot festivalintproc.h kttsd_festivalintplugin.desktop sabletowave.scm voices configure.in.in SSMLtoSable.xsl Makefile.in festivalintconfwidget.ui festivalintconf.h Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kttsd/plugins/flite/Makefile.in
+++ kttsd/plugins/flite/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -229,6 +229,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9880,7 +14530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -429,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9889,7 +14539,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -467,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9901,9 +14551,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -775,7 +778,7 @@
+ -rm -f fliteproc.moc fliteconf.moc
+
+ #>+ 2
+-KDE_DIST=fliteconfwidget.ui kttsd_fliteplugin.desktop Makefile.in configure.in.bot configure.in.in Makefile.am
++KDE_DIST=configure.in.bot fliteconfwidget.ui kttsd_fliteplugin.desktop configure.in.in Makefile.in Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kttsd/plugins/freetts/Makefile.in
+++ kttsd/plugins/freetts/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9913,7 +14572,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -425,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9922,7 +14581,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9934,9 +14593,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -771,7 +774,7 @@
+ -rm -f freettsproc.moc freettsconf.moc
+
+ #>+ 2
+-KDE_DIST=kttsd_freettsplugin.desktop freettsconfigwidget.ui Makefile.in freettsconf.h configure.in.bot configure.in.in freettsproc.h Makefile.am
++KDE_DIST=configure.in.bot kttsd_freettsplugin.desktop freettsconfigwidget.ui configure.in.in Makefile.in freettsproc.h freettsconf.h Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kttsd/plugins/hadifix/Makefile.in
+++ kttsd/plugins/hadifix/Makefile.in
-@@ -223,6 +223,9 @@
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9946,7 +14614,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9955,7 +14623,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9967,9 +14635,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -801,7 +804,7 @@
+ -rm -f hadifixproc.moc hadifixconf.moc
+
+ #>+ 2
+-KDE_DIST=SSMLtoTxt2pho.xsl hadifixconfigui.ui.h hadifixconf.h voicefileui.ui.h kttsd_hadifixplugin.desktop hadifixconfigui.ui Makefile.in voicefileui.ui configure.in.bot hadifixproc.h configure.in.in initialconfig.h Makefile.am
++KDE_DIST=SSMLtoTxt2pho.xsl configure.in.bot hadifixproc.h hadifixconfigui.ui.h hadifixconf.h voicefileui.ui.h kttsd_hadifixplugin.desktop configure.in.in hadifixconfigui.ui Makefile.in voicefileui.ui initialconfig.h Makefile.am
+
+ #>+ 5
+ clean-ui:
--- kttsd/plugins/Makefile.in
+++ kttsd/plugins/Makefile.in
-@@ -186,6 +186,9 @@
+@@ -193,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9979,7 +14656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -395,7 +398,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9988,7 +14665,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -433,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10002,7 +14679,7 @@
mostlyclean-libtool:
--- Makefile.in
+++ Makefile.in
-@@ -203,6 +203,9 @@
+@@ -210,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10012,7 +14689,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -379,7 +382,7 @@
+@@ -393,7 +396,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -10021,7 +14698,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -421,12 +424,12 @@
+@@ -435,12 +438,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -10036,7 +14713,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -438,7 +441,7 @@
+@@ -452,7 +455,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -10045,7 +14722,7 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -854,7 +857,7 @@
+@@ -868,7 +871,7 @@
.NOEXPORT:
#>+ 2
More information about the pkg-kde-commits
mailing list