[Pkg-kde-commits] rev 2247 - trunk/packages/kdeutils/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Nov 13 18:48:34 UTC 2005
Author: chrsmrtn
Date: 2005-11-13 18:48:28 +0000 (Sun, 13 Nov 2005)
New Revision: 2247
Modified:
trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
kdeutils 3.5.0 new buildprep
Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2005-11-13 18:01:42 UTC (rev 2246)
+++ trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2005-11-13 18:48:28 UTC (rev 2247)
@@ -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,16 +2983,15 @@
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])
- ])
-
+@@ -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
--- aclocal.m4
+++ aclocal.m4
@@ -501,6 +501,35 @@
@@ -1557,7 +3032,7 @@
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- ark/Makefile.in
+++ ark/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -285,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1567,7 +3042,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -531,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1576,7 +3051,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1588,7 +3063,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1170,18 +1173,18 @@
+@@ -1180,18 +1183,18 @@
ark_DEPENDENCIES = libkdeinit_ark.la
#>+ 3
@@ -1613,89 +3088,70 @@
#>+ 3
arch.moc: $(srcdir)/arch.h
-@@ -1205,18 +1208,18 @@
- mocs: rar.moc
+@@ -1341,10 +1344,10 @@
#>+ 3
--arktoplevelwindow.moc: $(srcdir)/arktoplevelwindow.h
-- $(MOC) $(srcdir)/arktoplevelwindow.h -o arktoplevelwindow.moc
-+shellOutputDlg.moc: $(srcdir)/shellOutputDlg.h
-+ $(MOC) $(srcdir)/shellOutputDlg.h -o shellOutputDlg.moc
-
- #>+ 2
--mocs: arktoplevelwindow.moc
-+mocs: shellOutputDlg.moc
-
- #>+ 3
--shellOutputDlg.moc: $(srcdir)/shellOutputDlg.h
-- $(MOC) $(srcdir)/shellOutputDlg.h -o shellOutputDlg.moc
-+arktoplevelwindow.moc: $(srcdir)/arktoplevelwindow.h
-+ $(MOC) $(srcdir)/arktoplevelwindow.h -o arktoplevelwindow.moc
-
- #>+ 2
--mocs: shellOutputDlg.moc
-+mocs: arktoplevelwindow.moc
-
- #>+ 3
- searchbar.moc: $(srcdir)/searchbar.h
-@@ -1338,10 +1341,10 @@
-
- #>+ 3
clean-metasources:
-- -rm -f tar.moc arkwidget.moc arch.moc filelistview.moc rar.moc arktoplevelwindow.moc shellOutputDlg.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc zoo.moc selectDlg.moc ar.moc zip.moc arkapp.moc sevenzip.moc archiveformatdlg.moc
-+ -rm -f arkwidget.moc tar.moc arch.moc filelistview.moc rar.moc shellOutputDlg.moc arktoplevelwindow.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc zoo.moc selectDlg.moc ar.moc zip.moc arkapp.moc sevenzip.moc archiveformatdlg.moc
+- -rm -f tar.moc arkwidget.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc zoo.moc ar.moc zip.moc mainwindow.moc arkapp.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
++ -rm -f arkwidget.moc tar.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc zoo.moc ar.moc zip.moc mainwindow.moc arkapp.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
#>+ 2
--KDE_DIST=extraction.ui arkui.rc common_texts.cpp ark.kcfg crsc-app-ark.svgz arkapp.h cr48-app-ark.png cr32-app-ark.png ark_part_readonly.rc cr128-app-ark.png cr16-app-ark.png addition.ui ark_part.desktop settings.kcfgc configure.in.in general.ui ark_part.rc Makefile.in ark.desktop Makefile.am cr64-app-ark.png
-+KDE_DIST=extraction.ui arkui.rc common_texts.cpp ark.kcfg crsc-app-ark.svgz arkapp.h cr48-app-ark.png ark_part_readonly.rc cr32-app-ark.png cr128-app-ark.png cr16-app-ark.png addition.ui ark_part.desktop settings.kcfgc configure.in.in general.ui ark_part.rc Makefile.in ark.desktop Makefile.am cr64-app-ark.png
+-KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc tar.h common_texts.cpp ark.kcfg hi32-app-ark.png hi16-app-ark.png arkfactory.h arkapp.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h archiveformatdlg.h arch.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui ark_part.rc Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png
++KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc common_texts.cpp tar.h ark.kcfg hi32-app-ark.png hi16-app-ark.png arkapp.h arkfactory.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h arch.h archiveformatdlg.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui ark_part.rc Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png
#>+ 6
clean-ui:
-@@ -1364,26 +1367,26 @@
+@@ -1367,29 +1370,29 @@
- #>+ 22
+ #>+ 25
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-ark.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ark.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ark.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ark.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ark.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-ark.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-ark.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ark.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-ark.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ark.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ark.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ark.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ark.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ark.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ark.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ark.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ark.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ark.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ark.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ark.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ark.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
#>+ 15
force-reedit:
-@@ -1460,7 +1463,7 @@
+@@ -1466,7 +1469,7 @@
rm -f libark_common_la.all_cpp.final libark_common_la.all_cpp.files
#>+ 11
--libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/selectDlg.cpp $(srcdir)/lha.cpp $(srcdir)/shellOutputDlg.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/extractdlg.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp addition.cpp extraction.cpp general.cpp general.moc arkwidget.moc tar.moc extraction.moc arch.moc filelistview.moc rar.moc shellOutputDlg.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc addition.moc zoo.moc selectDlg.moc ar.moc zip.moc sevenzip.moc archiveformatdlg.moc
-+libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/selectDlg.cpp $(srcdir)/lha.cpp $(srcdir)/shellOutputDlg.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/extractdlg.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp addition.cpp extraction.cpp general.cpp general.moc tar.moc arkwidget.moc extraction.moc arch.moc filelistview.moc rar.moc shellOutputDlg.moc searchbar.moc compressedfile.moc ark_part.moc arkviewer.moc extractdlg.moc lha.moc addition.moc zoo.moc selectDlg.moc ar.moc zip.moc sevenzip.moc archiveformatdlg.moc
+-libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp addition.cpp extraction.cpp general.cpp general.moc arkwidget.moc tar.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
++libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp addition.cpp extraction.cpp general.cpp general.moc tar.moc arkwidget.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
@echo 'creating libarkpart_la.all_cpp.cpp ...'; \
rm -f libarkpart_la.all_cpp.files libarkpart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libarkpart_la.all_cpp.final; \
--- ark/pics/Makefile.in
+++ ark/pics/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1705,7 +3161,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -1714,7 +3170,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1726,77 +3182,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -531,7 +534,7 @@
+@@ -553,7 +556,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_help.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr22-action-ark_options.png cr32-action-ark_view.png cr22-action-ark_open.png cr22-action-ark_new.png Makefile.in cr22-action-ark_view.png cr22-action-ark_selectall.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am
-+KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_help.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr22-action-ark_options.png cr32-action-ark_view.png cr22-action-ark_open.png cr22-action-ark_new.png Makefile.in cr22-action-ark_selectall.png cr22-action-ark_view.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am
+-KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr32-action-ark_view.png Makefile.in cr22-action-ark_view.png cr22-action-ark_selectall.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am
++KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr32-action-ark_view.png Makefile.in cr22-action-ark_selectall.png cr22-action-ark_view.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am
#>+ 2
docs-am:
-@@ -539,39 +542,39 @@
- #>+ 36
+@@ -561,31 +564,31 @@
+ #>+ 28
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_selectall.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
+- $(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
-- $(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_addfile.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_help.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_addfile.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
+ $(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/32x32/actions
$(INSTALL_DATA) $(srcdir)/cr32-action-ark_addfile.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_addfile.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_new.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_new.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_options.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_open.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
$(INSTALL_DATA) $(srcdir)/cr22-action-ark_view.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_view.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_selectall.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_help.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_options.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
$(INSTALL_DATA) $(srcdir)/cr32-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_extract.png
$(INSTALL_DATA) $(srcdir)/cr32-action-ark_view.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_view.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-ark_open.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
- -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
-- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_addfile.png
- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_new.png
-- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
-- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
-- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
-- -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
- -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_view.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
-+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_help.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
-+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_options.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_extract.png
-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_view.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
-+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_open.png
#>+ 15
force-reedit:
--- charselectapplet/Makefile.in
+++ charselectapplet/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -221,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1806,7 +3248,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -425,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1815,7 +3257,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1829,7 +3271,7 @@
@$(NORMAL_INSTALL)
--- config.h.in
+++ config.h.in
-@@ -394,9 +394,6 @@
+@@ -403,9 +403,6 @@
#endif
@@ -1841,12 +3283,31 @@
#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_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_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_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_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 QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBGMP include_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES MY_LIBKNEWSTUFF LIBKVM TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE superkaramba_SUBDIR_included_TRUE superkaramba_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 QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBGMP include_kmilo_powerbook_TRUE include_kmilo_powerbook_FALSE include_kmilo_pbb_TRUE include_kmilo_pbb_FALSE include_kmilo_delli8k_TRUE include_kmilo_delli8k_FALSE include_kmilo_kvaio_TRUE include_kmilo_kvaio_FALSE KEYBOARD_LIBS supports_i8k_TRUE supports_i8k_FALSE include_nv_TRUE include_nv_FALSE LIB_DEVSTAT LIBSNMP include_ksim_monitors_snmp_TRUE include_ksim_monitors_snmp_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES MY_LIBKNEWSTUFF LIBKVM TOPSUBDIRS ark_SUBDIR_included_TRUE ark_SUBDIR_included_FALSE charselectapplet_SUBDIR_included_TRUE charselectapplet_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcalc_SUBDIR_included_TRUE kcalc_SUBDIR_included_FALSE kcharselect_SUBDIR_included_TRUE kcharselect_SUBDIR_included_FALSE kdelirc_SUBDIR_included_TRUE kdelirc_SUBDIR_included_FALSE kdessh_SUBDIR_included_TRUE kdessh_SUBDIR_included_FALSE kdf_SUBDIR_included_TRUE kdf_SUBDIR_included_FALSE kedit_SUBDIR_included_TRUE kedit_SUBDIR_included_FALSE kfloppy_SUBDIR_included_TRUE kfloppy_SUBDIR_included_FALSE kgpg_SUBDIR_included_TRUE kgpg_SUBDIR_included_FALSE khexedit_SUBDIR_included_TRUE khexedit_SUBDIR_included_FALSE kjots_SUBDIR_included_TRUE kjots_SUBDIR_included_FALSE klaptopdaemon_SUBDIR_included_TRUE klaptopdaemon_SUBDIR_included_FALSE kmilo_SUBDIR_included_TRUE kmilo_SUBDIR_included_FALSE kregexpeditor_SUBDIR_included_TRUE kregexpeditor_SUBDIR_included_FALSE ksim_SUBDIR_included_TRUE ksim_SUBDIR_included_FALSE ktimer_SUBDIR_included_TRUE ktimer_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE superkaramba_SUBDIR_included_TRUE superkaramba_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1859,7 +3320,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
-@@ -1179,7 +1181,7 @@
+@@ -1186,7 +1188,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -1868,10 +3329,19 @@
done
fi
-@@ -2082,6 +2084,31 @@
+@@ -1958,7 +1960,7 @@
+ # Define the identity of the package.
+- PACKAGE=kdeutils
++ PACKAGE=kdeutils-rc1
+ VERSION="3.5"
+
+@@ -2089,6 +2091,31 @@
+
+
+
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -1900,7 +3370,7 @@
unset CDPATH
-@@ -3015,8 +3042,7 @@
+@@ -3022,8 +3049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1910,7 +3380,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3074,8 +3100,7 @@
+@@ -3081,8 +3107,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1920,7 +3390,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3191,8 +3216,7 @@
+@@ -3198,8 +3223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1930,7 +3400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3246,8 +3270,7 @@
+@@ -3253,8 +3277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1940,7 +3410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3292,8 +3315,7 @@
+@@ -3299,8 +3322,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1950,7 +3420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3337,8 +3359,7 @@
+@@ -3344,8 +3366,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1960,7 +3430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3895,8 +3916,7 @@
+@@ -3902,8 +3923,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1970,7 +3440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3954,8 +3974,7 @@
+@@ -3961,8 +3981,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1980,7 +3450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4026,8 +4045,7 @@
+@@ -4033,8 +4052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1990,7 +3460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4071,8 +4089,7 @@
+@@ -4078,8 +4096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2000,7 +3470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4250,8 +4267,7 @@
+@@ -4257,8 +4274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2010,7 +3480,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4362,8 +4378,7 @@
+@@ -4369,8 +4385,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2020,7 +3490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4451,8 +4466,7 @@
+@@ -4458,8 +4473,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2030,7 +3500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4554,8 +4568,7 @@
+@@ -4561,8 +4575,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2040,7 +3510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4654,8 +4667,7 @@
+@@ -4661,8 +4674,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2050,7 +3520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4739,8 +4751,7 @@
+@@ -4746,8 +4758,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2060,7 +3530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4829,8 +4840,7 @@
+@@ -4836,8 +4847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2070,7 +3540,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4917,8 +4927,7 @@
+@@ -4924,8 +4934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2080,7 +3550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5005,8 +5014,7 @@
+@@ -5012,8 +5021,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2090,7 +3560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5112,8 +5120,7 @@
+@@ -5119,8 +5127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2100,7 +3570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5200,8 +5207,7 @@
+@@ -5207,8 +5214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2110,7 +3580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5288,8 +5294,7 @@
+@@ -5295,8 +5301,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2120,7 +3590,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5376,8 +5381,7 @@
+@@ -5383,8 +5388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2130,7 +3600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5508,8 +5512,7 @@
+@@ -5515,8 +5519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2140,7 +3610,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5597,8 +5600,7 @@
+@@ -5604,8 +5607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2150,7 +3620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5685,8 +5687,7 @@
+@@ -5692,8 +5694,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2160,7 +3630,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5773,8 +5774,7 @@
+@@ -5780,8 +5781,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2170,7 +3640,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5861,8 +5861,7 @@
+@@ -5868,8 +5868,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2180,7 +3650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5949,8 +5948,7 @@
+@@ -5956,8 +5955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2190,7 +3660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6373,8 +6371,7 @@
+@@ -6380,8 +6378,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2200,7 +3670,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6500,8 +6497,7 @@
+@@ -6507,8 +6504,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2210,7 +3680,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6589,8 +6585,7 @@
+@@ -6596,8 +6592,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2220,7 +3690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6673,185 +6668,6 @@
+@@ -6680,185 +6675,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -2406,19 +3876,58 @@
fi
-@@ -7040,10 +6856,10 @@
- fi
- done
- done
-+SED=$lt_cv_path_SED
+@@ -7022,7 +6838,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
+@@ -7127,7 +6943,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'*)
+@@ -7161,7 +6977,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
+@@ -7191,6 +7007,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
+@@ -7277,44 +7102,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
-
-@@ -7277,31 +7093,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*)
@@ -2453,12 +3962,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 )
-@@ -7340,42 +7148,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.*`
+ ;;
+@@ -7330,7 +7147,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
+@@ -7347,42 +7164,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2508,9 +4033,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
-@@ -7404,9 +7191,6 @@
+@@ -7401,19 +7197,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'
@@ -2518,7 +4055,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7416,7 +7200,6 @@
+@@ -7423,7 +7214,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2526,18 +4063,21 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7493,7 +7276,7 @@
+@@ -7500,7 +7290,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7496 "configure"' > conftest.$ac_ext
-+ echo '#line 7279 "configure"' > conftest.$ac_ext
+- echo '#line 7503 "configure"' > conftest.$ac_ext
++ echo '#line 7293 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7538,12 +7321,11 @@
+@@ -7543,14 +7333,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
@@ -2549,7 +4089,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7555,7 +7337,6 @@
+@@ -7562,7 +7351,6 @@
esac
;;
*64-bit*)
@@ -2557,7 +4097,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7615,8 +7396,7 @@
+@@ -7622,8 +7410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2567,7 +4107,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7691,8 +7471,7 @@
+@@ -7698,8 +7485,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2577,7 +4117,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7862,8 +7641,7 @@
+@@ -7869,8 +7655,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2587,7 +4127,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7930,8 +7708,7 @@
+@@ -7937,8 +7722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2597,16 +4137,260 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8138,7 +7915,7 @@
+@@ -8053,6 +7837,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'
+@@ -8145,7 +8166,7 @@
+
+
# Provide some information about the compiler.
--echo "$as_me:8141:" \
-+echo "$as_me:7918:" \
+-echo "$as_me:8148:" \
++echo "$as_me:8169:" \
"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
-@@ -8184,8 +7961,7 @@
+@@ -8191,8 +8212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2616,7 +4400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8234,8 +8010,7 @@
+@@ -8241,8 +8261,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2626,7 +4410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8293,7 +8068,7 @@
+@@ -8300,7 +8319,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -2635,24 +4419,52 @@
case $build_os in
msdosdjgpp*)
-@@ -8322,20 +8097,26 @@
+@@ -8329,20 +8348,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 &&
@@ -2667,7 +4479,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.
-@@ -8403,7 +8184,7 @@
+@@ -8379,9 +8431,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'"
+
+@@ -8403,6 +8452,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]'
+ ;;
+@@ -8410,7 +8466,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -2676,7 +4512,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8421,7 +8202,7 @@
+@@ -8428,14 +8484,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2685,35 +4521,256 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9170,11 +8951,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
+@@ -8597,7 +8656,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.
+@@ -8617,7 +8676,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"
+@@ -8902,6 +8961,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*)
+@@ -8927,7 +8997,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
+@@ -8989,7 +9059,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
+@@ -9088,6 +9158,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.
+ #
+@@ -9124,11 +9208,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
+@@ -9174,18 +9263,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:9173: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8954: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9180: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9269: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9177: \$? = $ac_status" >&5
-+ echo "$as_me:8958: \$? = $ac_status" >&5
+- echo "$as_me:9184: \$? = $ac_status" >&5
++ echo "$as_me:9273: \$? = $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
-@@ -9403,11 +9184,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
+@@ -9262,7 +9353,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
+ ;;
+@@ -9288,6 +9379,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
+@@ -9299,7 +9400,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
+ ;;
+@@ -9323,12 +9424,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.
+@@ -9349,9 +9457,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*)
+@@ -9373,6 +9486,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'
+@@ -9407,18 +9525,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:9406: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9187: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9413: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9531: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9410: \$? = $ac_status" >&5
-+ echo "$as_me:9191: \$? = $ac_status" >&5
+- echo "$as_me:9417: \$? = $ac_status" >&5
++ echo "$as_me:9535: \$? = $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
-@@ -9454,13 +9235,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
+@@ -9439,7 +9559,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=
+@@ -9461,38 +9581,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2727,26 +4784,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.
-@@ -9470,11 +9244,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:9473: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9247: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9480: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9477: \$? = $ac_status" >&5
-+ echo "$as_me:9251: \$? = $ac_status" >&5
+- echo "$as_me:9484: \$? = $ac_status" >&5
++ echo "$as_me:9597: \$? = $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
-@@ -9484,8 +9258,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
@@ -2755,7 +4821,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9613,7 +9390,7 @@
+@@ -9563,6 +9681,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*)
+@@ -9583,6 +9711,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*)
+@@ -9620,7 +9769,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -2764,7 +4875,7 @@
else
ld_shlibs=no
fi
-@@ -9623,13 +9400,13 @@
+@@ -9630,13 +9779,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'
@@ -2772,7 +4883,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'
@@ -2780,12 +4892,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
-@@ -9638,19 +9415,19 @@
+@@ -9645,19 +9794,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
@@ -2804,7 +4948,7 @@
fi
;;
-@@ -9668,8 +9445,8 @@
+@@ -9675,8 +9856,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2815,36 +4959,8 @@
else
ld_shlibs=no
fi
-@@ -9682,10 +9459,36 @@
- hardcode_shlibpath_var=no
- ;;
+@@ -9691,24 +9872,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'
@@ -2854,7 +4970,28 @@
else
ld_shlibs=no
fi
-@@ -9735,9 +9538,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)
+@@ -9742,9 +9918,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
@@ -2877,7 +5014,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9783,21 +9597,22 @@
+@@ -9761,7 +9948,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`
+@@ -9782,6 +9969,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
+@@ -9790,21 +9980,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2905,7 +5061,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9821,8 +9636,7 @@
+@@ -9828,8 +10019,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2915,7 +5071,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9849,14 +9663,13 @@
+@@ -9856,14 +10046,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -2933,7 +5089,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9883,8 +9696,7 @@
+@@ -9890,8 +10079,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2943,16 +5099,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9922,7 +9734,7 @@
+@@ -9928,8 +10116,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
;;
-@@ -9945,13 +9757,13 @@
+@@ -9942,7 +10130,7 @@
+ ld_shlibs=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+@@ -9952,13 +10140,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -2969,14 +5136,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.
-@@ -9965,21 +9777,21 @@
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+@@ -9968,52 +10156,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
@@ -2989,58 +5159,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
-@@ -9988,18 +9800,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
-@@ -10040,8 +9852,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
;;
+@@ -10047,8 +10235,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
-@@ -10049,7 +9861,7 @@
+@@ -10056,7 +10244,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3049,9 +5249,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
-@@ -10067,10 +9879,10 @@
+@@ -10072,16 +10260,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'
@@ -3062,7 +5265,21 @@
;;
esac
else
-@@ -10117,7 +9929,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -10091,7 +10279,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'
+@@ -10124,7 +10312,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3071,7 +5288,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'
-@@ -10127,7 +9939,7 @@
+@@ -10134,7 +10322,7 @@
link_all_deplibs=yes
;;
@@ -3080,16 +5297,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10150,7 +9962,7 @@
+@@ -10157,7 +10345,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
-@@ -10160,7 +9972,7 @@
+@@ -10167,7 +10356,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -3098,7 +5316,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10171,14 +9983,14 @@
+@@ -10178,14 +10367,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -3115,7 +5333,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'
-@@ -10190,7 +10002,7 @@
+@@ -10197,13 +10386,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3124,19 +5342,50 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10215,9 +10027,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'
+@@ -10222,10 +10411,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~
-@@ -10237,7 +10049,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -10234,8 +10425,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
+ ;;
+@@ -10244,7 +10445,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.
@@ -3145,7 +5394,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10297,9 +10109,9 @@
+@@ -10304,9 +10505,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -3157,7 +5406,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10405,7 +10217,7 @@
+@@ -10412,7 +10613,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3166,7 +5415,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10415,7 +10227,20 @@
+@@ -10422,7 +10623,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3188,7 +5437,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10480,7 +10305,7 @@
+@@ -10487,7 +10701,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3197,8 +5446,17 @@
;;
beos*)
-@@ -10505,7 +10330,7 @@
+@@ -10496,7 +10710,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}'
+@@ -10512,7 +10726,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -3206,34 +5464,85 @@
need_version=no
need_lib_prefix=no
-@@ -10570,7 +10395,7 @@
+@@ -10524,7 +10738,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'
+@@ -10554,7 +10769,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
+ ;;
+@@ -10577,7 +10792,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"`
-@@ -10593,7 +10418,7 @@
+@@ -10600,7 +10815,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10653,7 +10478,7 @@
+@@ -10612,8 +10827,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*)
+@@ -10631,7 +10855,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -10658,9 +10882,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
-@@ -10668,7 +10493,7 @@
+@@ -10675,7 +10899,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3242,7 +5551,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10679,7 +10504,7 @@
+@@ -10686,7 +10910,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3251,7 +5560,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10741,22 +10566,19 @@
+@@ -10748,22 +10972,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'
@@ -3273,14 +5582,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,
-@@ -10766,6 +10588,30 @@
+@@ -10773,6 +10994,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3311,7 +5620,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10775,7 +10621,7 @@
+@@ -10782,7 +11027,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3320,16 +5629,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10804,7 +10650,7 @@
+@@ -10811,7 +11056,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
-@@ -10824,7 +10670,7 @@
+@@ -10831,7 +11080,7 @@
os2*)
libname_spec='$name'
@@ -3338,7 +5651,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11053,8 +10899,7 @@
+@@ -10933,8 +11182,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 &&
+@@ -11060,8 +11309,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3348,7 +5672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11157,8 +11002,7 @@
+@@ -11164,8 +11412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3358,7 +5682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11223,8 +11067,7 @@
+@@ -11230,8 +11477,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3368,7 +5692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11317,8 +11160,7 @@
+@@ -11324,8 +11570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3378,7 +5702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11383,8 +11225,7 @@
+@@ -11390,8 +11635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3388,7 +5712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11450,8 +11291,7 @@
+@@ -11457,8 +11701,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3398,7 +5722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11517,8 +11357,7 @@
+@@ -11524,8 +11767,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3408,25 +5732,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11593,7 +11432,7 @@
+@@ -11600,7 +11842,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11596 "configure"
-+#line 11435 "configure"
+-#line 11603 "configure"
++#line 11845 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11691,7 +11530,7 @@
+@@ -11666,7 +11908,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 ;;
+@@ -11698,7 +11940,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11694 "configure"
-+#line 11533 "configure"
+-#line 11701 "configure"
++#line 11943 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11816,7 +11655,7 @@
+@@ -11764,7 +12006,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 ;;
+@@ -11814,7 +12056,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
+@@ -11823,47 +12065,10 @@
fi
;;
@@ -3435,18 +5786,18 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11826,29 +11665,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'
@@ -3455,31 +5806,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
-@@ -11882,7 +11721,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
+@@ -11889,7 +12094,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.
@@ -3489,7 +5836,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 \
-@@ -12060,7 +11900,7 @@
+@@ -12003,11 +12209,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=
+@@ -12037,6 +12243,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
+@@ -12067,7 +12279,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3498,7 +5872,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12091,7 +11931,7 @@
+@@ -12098,7 +12310,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3507,7 +5881,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12333,7 +12173,10 @@
+@@ -12113,7 +12325,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?
+@@ -12340,7 +12552,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.
@@ -3519,7 +5902,84 @@
fi
-@@ -12601,8 +12444,8 @@
+@@ -12405,7 +12620,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'
+@@ -12442,7 +12659,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
+@@ -12463,6 +12680,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
+@@ -12484,7 +12715,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
+@@ -12555,7 +12795,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'*)
+@@ -12589,7 +12829,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
+@@ -12608,8 +12848,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
@@ -3530,7 +5990,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12628,7 +12471,7 @@
+@@ -12635,7 +12875,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.
@@ -3539,7 +5999,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12659,8 +12502,22 @@
+@@ -12666,8 +12906,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3564,7 +6024,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12706,15 +12563,16 @@
+@@ -12684,7 +12938,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`
+@@ -12705,6 +12959,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
+@@ -12713,15 +12970,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3585,7 +6064,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.
-@@ -12744,8 +12602,7 @@
+@@ -12751,8 +13009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3595,7 +6074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12774,13 +12631,12 @@
+@@ -12781,13 +13038,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3611,7 +6090,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12807,8 +12663,7 @@
+@@ -12814,8 +13070,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3621,16 +6100,23 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12846,7 +12701,7 @@
+@@ -12852,8 +13107,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
;;
-@@ -12863,12 +12718,12 @@
+@@ -12866,16 +13121,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'
@@ -3645,7 +6131,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
-@@ -12877,7 +12732,7 @@
+@@ -12884,70 +13140,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3654,87 +6140,170 @@
else
ld_shlibs_CXX=no
fi
-@@ -12888,20 +12743,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
-@@ -12911,19 +12766,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
-@@ -12958,7 +12813,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
+@@ -12958,14 +13225,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
-@@ -12980,7 +12835,7 @@
+@@ -12982,12 +13249,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.
-@@ -12989,11 +12844,11 @@
+@@ -12996,11 +13263,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
@@ -3743,7 +6312,38 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13050,7 +12905,7 @@
+@@ -13010,7 +13277,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'
+@@ -13026,7 +13293,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+@@ -13047,17 +13314,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'
;;
*)
@@ -3752,7 +6352,13 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13071,7 +12926,7 @@
+@@ -13073,12 +13340,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'
;;
*)
@@ -3761,28 +6367,38 @@
;;
esac
fi
-@@ -13086,7 +12941,7 @@
+@@ -13091,9 +13358,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
-@@ -13097,9 +12952,9 @@
+@@ -13104,9 +13371,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
-@@ -13116,8 +12971,8 @@
+@@ -13117,14 +13384,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.
@@ -3793,19 +6409,49 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13139,16 +12994,16 @@
+@@ -13142,20 +13409,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'
@@ -3814,8 +6460,17 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13186,7 +13041,7 @@
+@@ -13183,7 +13474,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
;;
+@@ -13193,7 +13484,7 @@
+ ;;
esac
;;
- netbsd*)
@@ -3823,7 +6478,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=
-@@ -13205,7 +13060,7 @@
+@@ -13204,15 +13495,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.
@@ -3832,25 +6512,41 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13222,7 +13077,7 @@
+@@ -13222,14 +13529,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=:
-@@ -13240,7 +13095,7 @@
+@@ -13247,7 +13554,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=:
-@@ -13265,7 +13120,7 @@
+@@ -13266,13 +13573,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.
@@ -3859,50 +6555,123 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13281,10 +13136,10 @@
+@@ -13281,17 +13588,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'
-@@ -13303,7 +13158,7 @@
+@@ -13310,7 +13617,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=:
-@@ -13360,9 +13215,9 @@
- CC)
+@@ -13334,7 +13641,7 @@
+ sco*)
+ archive_cmds_need_lc_CXX=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+@@ -13346,12 +13653,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
+@@ -13364,36 +13671,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
-@@ -13396,7 +13251,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
+@@ -13401,9 +13705,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'
-@@ -13406,9 +13261,9 @@
+@@ -13413,9 +13717,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
@@ -3914,7 +6683,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13417,9 +13272,9 @@
+@@ -13424,9 +13728,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -3926,7 +6695,25 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13534,7 +13389,7 @@
+@@ -13444,7 +13748,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13501,7 +13805,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
+@@ -13541,7 +13845,7 @@
fi
;;
@@ -3935,17 +6722,142 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13669,7 +13524,7 @@
+@@ -13577,6 +13881,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
+@@ -13632,7 +13950,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*)
+ ;;
+ *)
+@@ -13657,18 +13975,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'
+ ;;
+@@ -13676,22 +14004,22 @@
+ ;;
esac
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13745,7 +13600,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
+ ;;
+@@ -13706,7 +14034,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.
+@@ -13717,18 +14045,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.
+@@ -13745,25 +14079,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ lt_prog_compiler_pic_CXX='-W c,exportall'
+ ;;
+ *)
+ ;;
esac
;;
- netbsd*)
@@ -3953,21 +6865,105 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13856,11 +13711,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
+@@ -13779,7 +14113,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+ *)
+@@ -13788,13 +14122,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'
+ ;;
+@@ -13804,12 +14138,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'
+ ;;
+@@ -13819,7 +14153,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ lt_prog_compiler_pic_CXX='-KPIC'
+ ;;
+@@ -13860,18 +14194,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:13859: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13714: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13866: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14200: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13863: \$? = $ac_status" >&5
-+ echo "$as_me:13718: \$? = $ac_status" >&5
+- echo "$as_me:13870: \$? = $ac_status" >&5
++ echo "$as_me:14204: \$? = $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
-@@ -13907,13 +13762,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
+@@ -13892,7 +14228,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=
+@@ -13914,38 +14250,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3981,26 +6977,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.
-@@ -13923,11 +13771,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:13926: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13774: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13933: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14262: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13930: \$? = $ac_status" >&5
-+ echo "$as_me:13778: \$? = $ac_status" >&5
+- echo "$as_me:13937: \$? = $ac_status" >&5
++ echo "$as_me:14266: \$? = $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
-@@ -13937,8 +13785,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
@@ -4009,17 +7014,19 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13990,6 +13841,9 @@
+@@ -13995,7 +14329,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'
- ;;
-@@ -14071,7 +13925,7 @@
+@@ -14078,7 +14415,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4028,7 +7035,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14081,7 +13935,20 @@
+@@ -14088,7 +14425,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4050,7 +7057,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14146,7 +14013,7 @@
+@@ -14153,7 +14503,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4059,8 +7066,17 @@
;;
beos*)
-@@ -14171,7 +14038,7 @@
+@@ -14162,7 +14512,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}'
+@@ -14178,7 +14528,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -4068,34 +7084,85 @@
need_version=no
need_lib_prefix=no
-@@ -14236,7 +14103,7 @@
+@@ -14190,7 +14540,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'
+@@ -14220,7 +14571,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
+ ;;
+@@ -14243,7 +14594,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"`
-@@ -14259,7 +14126,7 @@
+@@ -14266,7 +14617,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14319,7 +14186,7 @@
+@@ -14278,8 +14629,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*)
+@@ -14297,7 +14657,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -14324,9 +14684,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
-@@ -14334,7 +14201,7 @@
+@@ -14341,7 +14701,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4104,7 +7171,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14345,7 +14212,7 @@
+@@ -14352,7 +14712,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4113,7 +7180,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14407,22 +14274,19 @@
+@@ -14414,22 +14774,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'
@@ -4135,14 +7202,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,
-@@ -14432,6 +14296,30 @@
+@@ -14439,6 +14796,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4173,7 +7240,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14441,7 +14329,7 @@
+@@ -14448,7 +14829,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4182,16 +7249,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14470,7 +14358,7 @@
+@@ -14477,7 +14858,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
-@@ -14490,7 +14378,7 @@
+@@ -14497,7 +14882,7 @@
os2*)
libname_spec='$name'
@@ -4200,7 +7271,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14719,8 +14607,7 @@
+@@ -14599,8 +14984,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 &&
+@@ -14726,8 +15111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4210,7 +7292,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14823,8 +14710,7 @@
+@@ -14830,8 +15214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4220,7 +7302,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14889,8 +14775,7 @@
+@@ -14896,8 +15279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4230,7 +7312,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14983,8 +14868,7 @@
+@@ -14990,8 +15372,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4240,7 +7322,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15049,8 +14933,7 @@
+@@ -15056,8 +15437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4250,7 +7332,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15116,8 +14999,7 @@
+@@ -15123,8 +15503,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4260,7 +7342,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15183,8 +15065,7 @@
+@@ -15190,8 +15569,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4270,25 +7352,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15259,7 +15140,7 @@
+@@ -15266,7 +15644,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15262 "configure"
-+#line 15143 "configure"
+-#line 15269 "configure"
++#line 15647 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15357,7 +15238,7 @@
+@@ -15332,7 +15710,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 ;;
+@@ -15364,7 +15742,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15360 "configure"
-+#line 15241 "configure"
+-#line 15367 "configure"
++#line 15745 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15474,7 +15355,8 @@
+@@ -15430,7 +15808,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 ;;
+@@ -15481,7 +15859,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.
@@ -4298,7 +7398,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 \
-@@ -15604,7 +15486,7 @@
+@@ -15581,6 +15960,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
+@@ -15611,7 +15996,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4307,7 +7420,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15635,7 +15517,7 @@
+@@ -15642,7 +16027,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4316,7 +7429,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15852,7 +15734,10 @@
+@@ -15657,7 +16042,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?
+@@ -15859,7 +16244,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.
@@ -4328,30 +7450,185 @@
fi
-@@ -15954,7 +15839,7 @@
+@@ -15935,12 +16323,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
+@@ -15953,7 +16364,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
+@@ -15961,8 +16372,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
-@@ -16180,11 +16065,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -16039,7 +16452,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
+ ;;
+@@ -16065,6 +16478,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
+@@ -16076,7 +16499,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
+ ;;
+@@ -16100,12 +16523,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.
+@@ -16126,9 +16556,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*)
+@@ -16150,6 +16585,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'
+@@ -16184,18 +16624,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:16183: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16068: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16190: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16630: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16187: \$? = $ac_status" >&5
-+ echo "$as_me:16072: \$? = $ac_status" >&5
+- echo "$as_me:16194: \$? = $ac_status" >&5
++ echo "$as_me:16634: \$? = $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
-@@ -16231,13 +16116,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
+@@ -16216,7 +16658,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=
+@@ -16238,38 +16680,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4365,26 +7642,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.
-@@ -16247,11 +16125,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:16250: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16128: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16257: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16692: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16254: \$? = $ac_status" >&5
-+ echo "$as_me:16132: \$? = $ac_status" >&5
+- echo "$as_me:16261: \$? = $ac_status" >&5
++ echo "$as_me:16696: \$? = $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
-@@ -16261,8 +16139,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
@@ -4393,7 +7679,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16390,7 +16271,7 @@
+@@ -16340,6 +16780,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*)
+@@ -16360,6 +16810,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*)
+@@ -16397,7 +16868,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4402,7 +7733,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16400,13 +16281,13 @@
+@@ -16407,13 +16878,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'
@@ -4410,7 +7741,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'
@@ -4418,18 +7750,51 @@
# 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
-@@ -16415,19 +16296,19 @@
+@@ -16422,19 +16893,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_F77=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
++ 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_F77=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4442,7 +7807,7 @@
fi
;;
-@@ -16445,8 +16326,8 @@
+@@ -16452,8 +16955,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4453,36 +7818,8 @@
else
ld_shlibs_F77=no
fi
-@@ -16459,10 +16340,36 @@
- hardcode_shlibpath_var_F77=no
- ;;
+@@ -16468,24 +16971,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'
@@ -4492,7 +7829,28 @@
else
ld_shlibs_F77=no
fi
-@@ -16512,9 +16419,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)
+@@ -16519,9 +17017,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
@@ -4515,7 +7873,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16560,21 +16478,22 @@
+@@ -16538,7 +17047,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`
+@@ -16559,6 +17068,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
+@@ -16567,21 +17079,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4543,7 +7920,7 @@
program main
end
-@@ -16588,8 +16507,7 @@
+@@ -16595,8 +17108,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4553,7 +7930,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16616,14 +16534,13 @@
+@@ -16623,14 +17135,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4571,7 +7948,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16640,8 +16557,7 @@
+@@ -16647,8 +17158,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4581,16 +7958,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16679,7 +16595,7 @@
+@@ -16685,8 +17195,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
;;
-@@ -16702,13 +16618,13 @@
+@@ -16699,7 +17209,7 @@
+ ld_shlibs_F77=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_F77=-rdynamic
+ ;;
+
+@@ -16709,68 +17219,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -4606,79 +7994,121 @@
+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
- # FIXME: Should let the user specify the lib program.
-@@ -16722,21 +16638,21 @@
- archive_cmds_need_lc_F77=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+- # FIXME: Should let the user specify the lib program.
+- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`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
- ;;
+- ;;
++ # FIXME: Should let the user specify the lib program.
++ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
++ enable_shared_with_static_runtimes_F77=yes
++ ;;
++
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -16745,18 +16661,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
-@@ -16797,8 +16713,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
;;
+@@ -16804,8 +17314,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
-@@ -16806,7 +16722,7 @@
+@@ -16813,7 +17323,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4687,9 +8117,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
-@@ -16824,10 +16740,10 @@
+@@ -16829,16 +17339,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'
@@ -4700,7 +8133,21 @@
;;
esac
else
-@@ -16874,7 +16790,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'
+ ;;
+@@ -16848,7 +17358,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'
+@@ -16881,7 +17391,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4709,7 +8156,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'
-@@ -16884,7 +16800,7 @@
+@@ -16891,7 +17401,7 @@
link_all_deplibs_F77=yes
;;
@@ -4718,16 +8165,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
-@@ -16907,7 +16823,7 @@
+@@ -16914,7 +17424,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
-@@ -16917,7 +16833,7 @@
+@@ -16924,7 +17435,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -4736,7 +8184,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16928,14 +16844,14 @@
+@@ -16935,14 +17446,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -4753,7 +8201,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'
-@@ -16947,7 +16863,7 @@
+@@ -16954,13 +17465,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -4762,19 +8210,50 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16972,9 +16888,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'
+@@ -16979,10 +17490,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~
-@@ -16994,7 +16910,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -16991,8 +17504,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
+ ;;
+@@ -17001,7 +17524,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.
@@ -4783,7 +8262,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17054,9 +16970,9 @@
+@@ -17061,9 +17584,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -4795,7 +8274,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17162,7 +17078,7 @@
+@@ -17169,7 +17692,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4804,7 +8283,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17172,7 +17088,20 @@
+@@ -17179,7 +17702,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4826,7 +8305,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17237,7 +17166,7 @@
+@@ -17244,7 +17780,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4835,8 +8314,17 @@
;;
beos*)
-@@ -17262,7 +17191,7 @@
+@@ -17253,7 +17789,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}'
+@@ -17269,7 +17805,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -4844,34 +8332,85 @@
need_version=no
need_lib_prefix=no
-@@ -17327,7 +17256,7 @@
+@@ -17281,7 +17817,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'
+@@ -17311,7 +17848,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
+ ;;
+@@ -17334,7 +17871,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"`
-@@ -17350,7 +17279,7 @@
+@@ -17357,7 +17894,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17410,7 +17339,7 @@
+@@ -17369,8 +17906,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*)
+@@ -17388,7 +17934,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -17415,9 +17961,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
-@@ -17425,7 +17354,7 @@
+@@ -17432,7 +17978,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4880,7 +8419,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17436,7 +17365,7 @@
+@@ -17443,7 +17989,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4889,7 +8428,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17498,22 +17427,19 @@
+@@ -17505,22 +18051,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'
@@ -4911,14 +8450,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,
-@@ -17523,6 +17449,30 @@
+@@ -17530,6 +18073,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4949,7 +8488,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17532,7 +17482,7 @@
+@@ -17539,7 +18106,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4958,16 +8497,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17561,7 +17511,7 @@
+@@ -17568,7 +18135,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
-@@ -17581,7 +17531,7 @@
+@@ -17588,7 +18159,7 @@
os2*)
libname_spec='$name'
@@ -4976,7 +8519,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17760,7 +17710,8 @@
+@@ -17690,8 +18261,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 &&
+@@ -17767,7 +18338,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.
@@ -4986,7 +8540,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 \
-@@ -17890,7 +17841,7 @@
+@@ -17867,6 +18439,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
+@@ -17897,7 +18475,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4995,7 +8562,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17921,7 +17872,7 @@
+@@ -17928,7 +18506,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5004,7 +8571,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18138,7 +18089,10 @@
+@@ -17943,7 +18521,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?
+@@ -18145,7 +18723,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.
@@ -5016,35 +8592,203 @@
fi
-@@ -18220,11 +18174,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+@@ -18178,7 +18759,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.
+
+@@ -18189,15 +18770,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
+@@ -18224,18 +18831,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:18223: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18177: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18230: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18837: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18227: \$? = $ac_status" >&5
-+ echo "$as_me:18181: \$? = $ac_status" >&5
+- echo "$as_me:18234: \$? = $ac_status" >&5
++ echo "$as_me:18841: \$? = $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
-@@ -18453,11 +18407,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
+@@ -18312,7 +18921,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
+ ;;
+@@ -18338,6 +18947,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
+@@ -18349,7 +18968,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
+ ;;
+@@ -18373,12 +18992,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.
+@@ -18399,9 +19025,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*)
+@@ -18423,6 +19054,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'
+@@ -18457,18 +19093,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:18456: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18410: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18463: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19099: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18460: \$? = $ac_status" >&5
-+ echo "$as_me:18414: \$? = $ac_status" >&5
+- echo "$as_me:18467: \$? = $ac_status" >&5
++ echo "$as_me:19103: \$? = $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
-@@ -18504,13 +18458,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
+@@ -18489,7 +19127,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=
+@@ -18511,38 +19149,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5058,26 +8802,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.
-@@ -18520,11 +18467,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:18523: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18470: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18530: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19161: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18527: \$? = $ac_status" >&5
-+ echo "$as_me:18474: \$? = $ac_status" >&5
+- echo "$as_me:18534: \$? = $ac_status" >&5
++ echo "$as_me:19165: \$? = $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
-@@ -18534,8 +18481,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
@@ -5086,7 +8839,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18663,7 +18613,7 @@
+@@ -18613,6 +19249,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*)
+@@ -18633,6 +19279,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*)
+@@ -18670,7 +19337,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5095,7 +8893,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18673,13 +18623,13 @@
+@@ -18680,13 +19347,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'
@@ -5103,7 +8901,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'
@@ -5111,14 +8910,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
-@@ -18688,19 +18638,19 @@
+@@ -18695,19 +19362,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
;;
@@ -5135,7 +8967,7 @@
fi
;;
-@@ -18718,8 +18668,8 @@
+@@ -18725,8 +19424,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5146,36 +8978,8 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18732,10 +18682,36 @@
- hardcode_shlibpath_var_GCJ=no
- ;;
+@@ -18741,24 +19440,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'
@@ -5185,7 +8989,28 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18785,9 +18761,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)
+@@ -18792,9 +19486,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
@@ -5208,7 +9033,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18833,21 +18820,22 @@
+@@ -18811,7 +19516,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`
+@@ -18832,6 +19537,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
+@@ -18840,21 +19548,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5236,7 +9080,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18871,8 +18859,7 @@
+@@ -18878,8 +19587,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5246,7 +9090,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18899,14 +18886,13 @@
+@@ -18906,14 +19614,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5264,7 +9108,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18933,8 +18919,7 @@
+@@ -18940,8 +19647,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5274,16 +9118,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18972,7 +18957,7 @@
+@@ -18978,8 +19684,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
;;
-@@ -18995,13 +18980,13 @@
+@@ -18992,7 +19698,7 @@
+ ld_shlibs_GCJ=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_GCJ=-rdynamic
+ ;;
+
+@@ -19002,68 +19708,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5300,78 +9155,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.
-@@ -19015,21 +19000,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
-@@ -19038,18 +19023,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
-@@ -19090,8 +19075,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
;;
+@@ -19097,8 +19803,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
-@@ -19099,7 +19084,7 @@
+@@ -19106,7 +19812,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5380,9 +9271,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
-@@ -19117,10 +19102,10 @@
+@@ -19122,16 +19828,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'
@@ -5393,7 +9287,21 @@
;;
esac
else
-@@ -19167,7 +19152,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'
+ ;;
+@@ -19141,7 +19847,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'
+@@ -19174,7 +19880,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5402,7 +9310,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'
-@@ -19177,7 +19162,7 @@
+@@ -19184,7 +19890,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5411,16 +9319,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
-@@ -19200,7 +19185,7 @@
+@@ -19207,7 +19913,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
-@@ -19210,7 +19195,7 @@
+@@ -19217,7 +19924,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5429,7 +9338,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19221,14 +19206,14 @@
+@@ -19228,14 +19935,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5446,7 +9355,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'
-@@ -19240,7 +19225,7 @@
+@@ -19247,13 +19954,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5455,19 +9364,50 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19265,9 +19250,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'
+@@ -19272,10 +19979,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~
-@@ -19287,7 +19272,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -19284,8 +19993,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
+ ;;
+@@ -19294,7 +20013,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.
@@ -5476,7 +9416,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19347,9 +19332,9 @@
+@@ -19354,9 +20073,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5488,7 +9428,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19455,7 +19440,7 @@
+@@ -19462,7 +20181,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5497,7 +9437,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19465,7 +19450,20 @@
+@@ -19472,7 +20191,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5519,7 +9459,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19530,7 +19528,7 @@
+@@ -19537,7 +20269,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5528,8 +9468,17 @@
;;
beos*)
-@@ -19555,7 +19553,7 @@
+@@ -19546,7 +20278,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}'
+@@ -19562,7 +20294,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -5537,34 +9486,85 @@
need_version=no
need_lib_prefix=no
-@@ -19620,7 +19618,7 @@
+@@ -19574,7 +20306,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'
+@@ -19604,7 +20337,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
+ ;;
+@@ -19627,7 +20360,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"`
-@@ -19643,7 +19641,7 @@
+@@ -19650,7 +20383,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19703,7 +19701,7 @@
+@@ -19662,8 +20395,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*)
+@@ -19681,7 +20423,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -19708,9 +20450,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
-@@ -19718,7 +19716,7 @@
+@@ -19725,7 +20467,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5573,7 +9573,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19729,7 +19727,7 @@
+@@ -19736,7 +20478,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5582,7 +9582,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19791,22 +19789,19 @@
+@@ -19798,22 +20540,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'
@@ -5604,14 +9604,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,
-@@ -19816,6 +19811,30 @@
+@@ -19823,6 +20562,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5642,7 +9642,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19825,7 +19844,7 @@
+@@ -19832,7 +20595,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5651,16 +9651,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19854,7 +19873,7 @@
+@@ -19861,7 +20624,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
-@@ -19874,7 +19893,7 @@
+@@ -19881,7 +20648,7 @@
os2*)
libname_spec='$name'
@@ -5669,7 +9673,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20103,8 +20122,7 @@
+@@ -19983,8 +20750,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 &&
+@@ -20110,8 +20877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5679,7 +9694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20207,8 +20225,7 @@
+@@ -20214,8 +20980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5689,7 +9704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20273,8 +20290,7 @@
+@@ -20280,8 +21045,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5699,7 +9714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20367,8 +20383,7 @@
+@@ -20374,8 +21138,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5709,7 +9724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20433,8 +20448,7 @@
+@@ -20440,8 +21203,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5719,7 +9734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20500,8 +20514,7 @@
+@@ -20507,8 +21269,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5729,7 +9744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20567,8 +20580,7 @@
+@@ -20574,8 +21335,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5739,25 +9754,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20643,7 +20655,7 @@
+@@ -20650,7 +21410,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20646 "configure"
-+#line 20658 "configure"
+-#line 20653 "configure"
++#line 21413 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20741,7 +20753,7 @@
+@@ -20716,7 +21476,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 ;;
+@@ -20748,7 +21508,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20744 "configure"
-+#line 20756 "configure"
+-#line 20751 "configure"
++#line 21511 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20858,7 +20870,8 @@
+@@ -20814,7 +21574,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 ;;
+@@ -20865,7 +21625,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.
@@ -5767,7 +9800,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 \
-@@ -20988,7 +21001,7 @@
+@@ -20965,6 +21726,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
+@@ -20995,7 +21762,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5776,7 +9822,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21019,7 +21032,7 @@
+@@ -21026,7 +21793,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5785,7 +9831,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21236,7 +21249,10 @@
+@@ -21041,7 +21808,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?
+@@ -21243,7 +22010,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.
@@ -5797,7 +9852,43 @@
fi
-@@ -21299,7 +21315,8 @@
+@@ -21286,11 +22056,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
+@@ -21306,7 +22100,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.
@@ -5807,7 +9898,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 \
-@@ -21429,7 +21446,7 @@
+@@ -21406,6 +22201,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
+@@ -21436,7 +22237,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5816,7 +9920,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21460,7 +21477,7 @@
+@@ -21467,7 +22268,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5825,7 +9929,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21677,7 +21694,10 @@
+@@ -21482,7 +22283,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?
+@@ -21684,7 +22485,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.
@@ -5837,7 +9950,7 @@
fi
-@@ -21724,7 +21744,7 @@
+@@ -21731,7 +22535,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -5846,7 +9959,7 @@
# Prevent multiple expansion
-@@ -21961,8 +21981,7 @@
+@@ -21972,8 +22776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5856,7 +9969,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22036,9 +22055,6 @@
+@@ -22047,9 +22850,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5866,7 +9979,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22072,8 +22088,7 @@
+@@ -22083,8 +22883,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5876,7 +9989,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22177,8 +22192,7 @@
+@@ -22188,8 +22987,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5886,7 +9999,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22257,9 +22271,6 @@
+@@ -22268,9 +23066,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5896,7 +10009,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22292,8 +22303,7 @@
+@@ -22303,8 +23098,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5906,7 +10019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22396,8 +22406,7 @@
+@@ -22407,8 +23201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5916,7 +10029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22487,8 +22496,7 @@
+@@ -22498,8 +23291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5926,7 +10039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22549,8 +22557,7 @@
+@@ -22560,8 +23352,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5936,7 +10049,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22618,8 +22625,7 @@
+@@ -22629,8 +23420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5946,7 +10059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22685,8 +22691,7 @@
+@@ -22696,8 +23486,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5956,7 +10069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22779,8 +22784,7 @@
+@@ -22790,8 +23579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5966,7 +10079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22858,8 +22862,7 @@
+@@ -22869,8 +23657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5976,7 +10089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22943,8 +22946,7 @@
+@@ -22954,8 +23741,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5986,7 +10099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23012,8 +23014,7 @@
+@@ -23023,8 +23809,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5996,7 +10109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23108,8 +23109,7 @@
+@@ -23119,8 +23904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6006,7 +10119,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23173,8 +23173,7 @@
+@@ -23184,8 +23968,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6016,7 +10129,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23269,8 +23268,7 @@
+@@ -23280,8 +24063,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6026,7 +10139,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23334,8 +23332,7 @@
+@@ -23345,8 +24127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6036,7 +10149,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23431,8 +23428,7 @@
+@@ -23442,8 +24223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6046,7 +10159,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23496,8 +23492,7 @@
+@@ -23507,8 +24287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6056,7 +10169,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23594,8 +23589,7 @@
+@@ -23605,8 +24384,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6066,7 +10179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23660,8 +23654,7 @@
+@@ -23671,8 +24449,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6076,7 +10189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23729,8 +23722,7 @@
+@@ -23740,8 +24517,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6086,7 +10199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23881,8 +23873,7 @@
+@@ -23892,8 +24668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6096,7 +10209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24037,8 +24028,7 @@
+@@ -24048,8 +24823,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6106,7 +10219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24103,8 +24093,7 @@
+@@ -24114,8 +24888,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6116,7 +10229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24251,8 +24240,7 @@
+@@ -24262,8 +25035,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6126,7 +10239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24407,8 +24395,7 @@
+@@ -24418,8 +25190,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6136,7 +10249,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24464,9 +24451,6 @@
+@@ -24475,9 +25246,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6146,7 +10259,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24500,8 +24484,7 @@
+@@ -24511,8 +25279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6156,7 +10269,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24605,8 +24588,7 @@
+@@ -24616,8 +25383,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6166,7 +10279,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24706,8 +24688,7 @@
+@@ -24717,8 +25483,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6176,7 +10289,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24781,8 +24762,7 @@
+@@ -24792,8 +25557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6186,7 +10299,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24845,8 +24825,7 @@
+@@ -24856,8 +25620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6196,7 +10309,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24908,8 +24887,7 @@
+@@ -24919,8 +25682,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6206,7 +10319,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24949,8 +24927,7 @@
+@@ -24960,8 +25722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6216,7 +10329,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25006,8 +24983,7 @@
+@@ -25017,8 +25778,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6226,7 +10339,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25047,8 +25023,7 @@
+@@ -25058,8 +25818,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6236,7 +10349,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25112,8 +25087,7 @@
+@@ -25123,8 +25882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6246,7 +10359,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25144,10 +25118,8 @@
+@@ -25155,10 +25913,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6259,7 +10372,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25258,8 +25230,7 @@
+@@ -25269,8 +26025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6269,7 +10382,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25321,8 +25292,7 @@
+@@ -25332,8 +26087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6279,7 +10392,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25362,8 +25332,7 @@
+@@ -25373,8 +26127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6289,7 +10402,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25419,8 +25388,7 @@
+@@ -25430,8 +26183,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6299,7 +10412,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25460,8 +25428,7 @@
+@@ -25471,8 +26223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6309,7 +10422,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25525,8 +25492,7 @@
+@@ -25536,8 +26287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6319,7 +10432,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25557,10 +25523,8 @@
+@@ -25568,10 +26318,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6332,7 +10445,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25671,8 +25635,7 @@
+@@ -25682,8 +26430,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6342,7 +10455,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25734,8 +25697,7 @@
+@@ -25745,8 +26492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6352,7 +10465,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25775,8 +25737,7 @@
+@@ -25786,8 +26532,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6362,7 +10475,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25832,8 +25793,7 @@
+@@ -25843,8 +26588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6372,7 +10485,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25873,8 +25833,7 @@
+@@ -25884,8 +26628,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6382,7 +10495,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25938,8 +25897,7 @@
+@@ -25949,8 +26692,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6392,7 +10505,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25970,10 +25928,8 @@
+@@ -25981,10 +26723,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6405,7 +10518,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26084,8 +26040,7 @@
+@@ -26095,8 +26835,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6415,7 +10528,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26147,8 +26102,7 @@
+@@ -26158,8 +26897,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6425,7 +10538,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26188,8 +26142,7 @@
+@@ -26199,8 +26937,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6435,7 +10548,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26245,8 +26198,7 @@
+@@ -26256,8 +26993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6445,7 +10558,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26286,8 +26238,7 @@
+@@ -26297,8 +27033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6455,7 +10568,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26351,8 +26302,7 @@
+@@ -26362,8 +27097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6465,7 +10578,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26383,10 +26333,8 @@
+@@ -26394,10 +27128,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6478,7 +10591,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26505,8 +26453,7 @@
+@@ -26516,8 +27248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6488,7 +10601,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26577,8 +26524,7 @@
+@@ -26588,8 +27319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6498,7 +10611,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26648,8 +26594,7 @@
+@@ -26659,8 +27389,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6508,7 +10621,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26711,8 +26656,7 @@
+@@ -26722,8 +27451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6518,7 +10631,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26752,8 +26696,7 @@
+@@ -26763,8 +27491,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6528,7 +10641,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26809,8 +26752,7 @@
+@@ -26820,8 +27547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6538,7 +10651,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26850,8 +26792,7 @@
+@@ -26861,8 +27587,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6548,7 +10661,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26915,8 +26856,7 @@
+@@ -26926,8 +27651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6558,7 +10671,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26947,10 +26887,8 @@
+@@ -26958,10 +27682,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6571,7 +10684,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27062,8 +27000,7 @@
+@@ -27073,8 +27795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6581,7 +10694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27125,8 +27062,7 @@
+@@ -27136,8 +27857,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6591,7 +10704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27166,8 +27102,7 @@
+@@ -27177,8 +27897,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6601,7 +10714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27223,8 +27158,7 @@
+@@ -27234,8 +27953,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6611,7 +10724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27264,8 +27198,7 @@
+@@ -27275,8 +27993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6621,7 +10734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27329,8 +27262,7 @@
+@@ -27340,8 +28057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6631,7 +10744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27361,10 +27293,8 @@
+@@ -27372,10 +28088,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6644,7 +10757,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27475,8 +27405,7 @@
+@@ -27486,8 +28200,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6654,17 +10767,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27546,8 +27475,7 @@
+@@ -27568,8 +28281,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=$?
+@@ -27669,8 +28381,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=$?
-@@ -27727,8 +27655,7 @@
+@@ -27850,8 +28561,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6674,7 +10797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27837,8 +27764,7 @@
+@@ -27960,8 +28670,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6684,7 +10807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28062,8 +27988,7 @@
+@@ -28185,8 +28894,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6694,7 +10817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28286,8 +28211,7 @@
+@@ -28409,8 +29117,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6704,7 +10827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28363,8 +28287,7 @@
+@@ -28486,8 +29193,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6714,7 +10837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28590,8 +28513,7 @@
+@@ -28713,8 +29419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6724,7 +10847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28666,8 +28588,7 @@
+@@ -28789,8 +29494,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6734,7 +10857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28727,8 +28648,7 @@
+@@ -28850,8 +29554,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6744,7 +10867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28811,8 +28731,7 @@
+@@ -28934,8 +29637,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6754,7 +10877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28905,8 +28824,7 @@
+@@ -29028,8 +29730,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6764,7 +10887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29080,8 +28998,7 @@
+@@ -29203,8 +29904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6774,7 +10897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29179,8 +29096,7 @@
+@@ -29302,8 +30002,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6784,7 +10907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29273,8 +29189,7 @@
+@@ -29390,8 +30089,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6794,7 +10917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29357,8 +29272,7 @@
+@@ -29468,8 +30166,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6804,25 +10927,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29411,7 +29325,7 @@
+@@ -29522,7 +30219,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29414: $i/$j" >&5
-+ echo "configure: 29328: $i/$j" >&5
+- echo "configure: 29525: $i/$j" >&5
++ echo "configure: 30222: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29714,7 +29628,7 @@
+@@ -29820,7 +30517,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29717: $i/$j" >&5
-+ echo "configure: 29631: $i/$j" >&5
+- echo "configure: 29823: $i/$j" >&5
++ echo "configure: 30520: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30391,8 +30305,7 @@
+@@ -30497,8 +31194,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6832,47 +10955,99 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30551,7 +30464,7 @@
+@@ -30657,7 +31353,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30554: $i/$j" >&5
-+ echo "configure: 30467: $i/$j" >&5
+- echo "configure: 30660: $i/$j" >&5
++ echo "configure: 31356: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30581,7 +30494,7 @@
+@@ -30687,7 +31383,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30584: $i/$j" >&5
-+ echo "configure: 30497: $i/$j" >&5
+- echo "configure: 30690: $i/$j" >&5
++ echo "configure: 31386: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30599,7 +30512,7 @@
+@@ -30705,7 +31401,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30602: $i/$j" >&5
-+ echo "configure: 30515: $i/$j" >&5
+- echo "configure: 30708: $i/$j" >&5
++ echo "configure: 31404: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32117,7 +32030,7 @@
+@@ -32228,7 +32924,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32120: $i/$j" >&5
-+ echo "configure: 32033: $i/$j" >&5
+- echo "configure: 32231: $i/$j" >&5
++ echo "configure: 32927: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32273,290 +32186,6 @@
+@@ -32388,345 +33084,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__%'`
@@ -7040,7 +11215,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
@@ -7156,10 +11331,22 @@
-
-fi
-
- fi
-
-
-@@ -32599,8 +32228,7 @@
+- fi
+-
+-
+ echo "$as_me:$LINENO: checking for Qt docs" >&5
+ echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
+ kde_qtdir=
+@@ -32740,7 +33097,7 @@
+ do
+ for j in qsql.html;
+ do
+- echo "configure: 32743: $i/$j" >&5
++ echo "configure: 33100: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ QTDOCDIR=$i
+@@ -32937,8 +33294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7169,7 +11356,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32672,8 +32300,7 @@
+@@ -33010,8 +33366,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7179,7 +11366,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32727,8 +32354,7 @@
+@@ -33065,8 +33420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7189,7 +11376,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32799,8 +32425,7 @@
+@@ -33137,8 +33491,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7199,7 +11386,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32854,8 +32479,7 @@
+@@ -33192,8 +33545,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7209,7 +11396,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32922,8 +32546,7 @@
+@@ -33260,8 +33612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7219,7 +11406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33097,8 +32720,7 @@
+@@ -33436,8 +33787,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7229,17 +11416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33241,8 +32863,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=$?
-@@ -33296,9 +32917,6 @@
+@@ -33575,9 +33925,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7249,7 +11426,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33329,8 +32947,7 @@
+@@ -33608,8 +33955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7259,7 +11436,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33431,8 +33048,7 @@
+@@ -33710,8 +34056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7269,7 +11446,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33511,9 +33127,6 @@
+@@ -33790,9 +34135,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7279,7 +11456,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33544,8 +33157,7 @@
+@@ -33823,8 +34165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7289,7 +11466,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33646,8 +33258,7 @@
+@@ -33925,8 +34266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7299,7 +11476,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33774,9 +33385,6 @@
+@@ -34054,9 +34394,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7309,7 +11486,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33811,8 +33419,7 @@
+@@ -34091,8 +34428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7319,7 +11496,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33919,8 +33526,7 @@
+@@ -34199,8 +34535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7329,7 +11506,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34012,8 +33618,7 @@
+@@ -34291,8 +34626,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7339,7 +11516,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34198,8 +33803,7 @@
+@@ -34477,8 +34811,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7349,7 +11526,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34353,8 +33957,7 @@
+@@ -34632,8 +34965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7359,7 +11536,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34429,8 +34032,7 @@
+@@ -34708,8 +35040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7369,7 +11546,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34519,8 +34121,7 @@
+@@ -34798,8 +35129,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7379,7 +11556,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34593,8 +34194,7 @@
+@@ -34872,8 +35202,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7389,7 +11566,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34667,8 +34267,7 @@
+@@ -34946,8 +35275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7399,27 +11576,75 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34748,8 +34347,7 @@
+@@ -34986,6 +35314,7 @@
+ kcalc_gmp_found=yes
+ LIBGMP=
+
++
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+@@ -35029,8 +35358,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=$?
+@@ -35179,8 +35507,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=$?
+@@ -35359,8 +35686,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=$?
-@@ -34791,8 +34389,7 @@
+@@ -35450,8 +35776,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=$?
+@@ -35602,8 +35927,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=$?
+@@ -35692,8 +36016,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=$?
-@@ -34849,8 +34446,7 @@
+@@ -35735,8 +36058,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7429,7 +11654,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35052,8 +34648,7 @@
+@@ -35793,8 +36115,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7439,7 +11664,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35229,8 +34824,7 @@
+@@ -35996,8 +36317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7449,7 +11674,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35317,8 +34911,7 @@
+@@ -36186,8 +36506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7459,7 +11684,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35432,8 +35025,7 @@
+@@ -36274,8 +36593,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7469,7 +11694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35626,8 +35218,7 @@
+@@ -36395,8 +36713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7479,7 +11704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35704,8 +35295,7 @@
+@@ -36589,8 +36906,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7489,17 +11714,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35792,8 +35382,7 @@
+@@ -36667,8 +36983,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=$?
+@@ -36754,8 +37069,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=$?
-@@ -35965,8 +35554,7 @@
+@@ -36927,8 +37241,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7509,7 +11744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36035,8 +35623,7 @@
+@@ -36997,8 +37310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7519,7 +11754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36113,8 +35700,7 @@
+@@ -37077,8 +37389,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7529,7 +11764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36260,8 +35846,7 @@
+@@ -37262,8 +37573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7539,27 +11774,37 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36363,8 +35948,7 @@
+@@ -37351,8 +37661,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=$?
+@@ -37522,8 +37831,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=$?
-@@ -36442,8 +36026,7 @@
+@@ -37611,8 +37919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
+- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_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=$?
-@@ -36615,8 +36198,7 @@
+@@ -37710,8 +38017,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7569,7 +11814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36705,8 +36287,7 @@
+@@ -37753,8 +38059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7579,7 +11824,1151 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37287,6 +36868,13 @@
+@@ -37811,8 +38116,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=$?
+@@ -38007,7 +38311,7 @@
+ do
+ for j in Python.h;
+ do
+- echo "configure: 38010: $i/$j" >&5
++ echo "configure: 38314: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38023,7 +38327,7 @@
+ do
+ for j in python$version/Python.h;
+ do
+- echo "configure: 38026: $i/$j" >&5
++ echo "configure: 38330: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38047,7 +38351,7 @@
+ do
+ for j in libpython$version.so;
+ do
+- echo "configure: 38050: $i/$j" >&5
++ echo "configure: 38354: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38063,7 +38367,7 @@
+ do
+ for j in libpython$version.a;
+ do
+- echo "configure: 38066: $i/$j" >&5
++ echo "configure: 38370: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38079,7 +38383,7 @@
+ do
+ for j in python$version/config/libpython$version.a;
+ do
+- echo "configure: 38082: $i/$j" >&5
++ echo "configure: 38386: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38107,7 +38411,7 @@
+ do
+ for j in python$version/copy.py;
+ do
+- echo "configure: 38110: $i/$j" >&5
++ echo "configure: 38414: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_moddir=$i
+@@ -38151,7 +38455,7 @@
+ do
+ for j in Python.h;
+ do
+- echo "configure: 38154: $i/$j" >&5
++ echo "configure: 38458: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38167,7 +38471,7 @@
+ do
+ for j in python$version/Python.h;
+ do
+- echo "configure: 38170: $i/$j" >&5
++ echo "configure: 38474: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38191,7 +38495,7 @@
+ do
+ for j in libpython$version.so;
+ do
+- echo "configure: 38194: $i/$j" >&5
++ echo "configure: 38498: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38207,7 +38511,7 @@
+ do
+ for j in libpython$version.a;
+ do
+- echo "configure: 38210: $i/$j" >&5
++ echo "configure: 38514: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38223,7 +38527,7 @@
+ do
+ for j in python$version/config/libpython$version.a;
+ do
+- echo "configure: 38226: $i/$j" >&5
++ echo "configure: 38530: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38251,7 +38555,7 @@
+ do
+ for j in python$version/copy.py;
+ do
+- echo "configure: 38254: $i/$j" >&5
++ echo "configure: 38558: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_moddir=$i
+@@ -38295,7 +38599,7 @@
+ do
+ for j in Python.h;
+ do
+- echo "configure: 38298: $i/$j" >&5
++ echo "configure: 38602: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38311,7 +38615,7 @@
+ do
+ for j in python$version/Python.h;
+ do
+- echo "configure: 38314: $i/$j" >&5
++ echo "configure: 38618: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38335,7 +38639,7 @@
+ do
+ for j in libpython$version.so;
+ do
+- echo "configure: 38338: $i/$j" >&5
++ echo "configure: 38642: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38351,7 +38655,7 @@
+ do
+ for j in libpython$version.a;
+ do
+- echo "configure: 38354: $i/$j" >&5
++ echo "configure: 38658: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38367,7 +38671,7 @@
+ do
+ for j in python$version/config/libpython$version.a;
+ do
+- echo "configure: 38370: $i/$j" >&5
++ echo "configure: 38674: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38395,7 +38699,7 @@
+ do
+ for j in python$version/copy.py;
+ do
+- echo "configure: 38398: $i/$j" >&5
++ echo "configure: 38702: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_moddir=$i
+@@ -38439,7 +38743,7 @@
+ do
+ for j in Python.h;
+ do
+- echo "configure: 38442: $i/$j" >&5
++ echo "configure: 38746: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38455,7 +38759,7 @@
+ do
+ for j in python$version/Python.h;
+ do
+- echo "configure: 38458: $i/$j" >&5
++ echo "configure: 38762: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38479,7 +38783,7 @@
+ do
+ for j in libpython$version.so;
+ do
+- echo "configure: 38482: $i/$j" >&5
++ echo "configure: 38786: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38495,7 +38799,7 @@
+ do
+ for j in libpython$version.a;
+ do
+- echo "configure: 38498: $i/$j" >&5
++ echo "configure: 38802: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38511,7 +38815,7 @@
+ do
+ for j in python$version/config/libpython$version.a;
+ do
+- echo "configure: 38514: $i/$j" >&5
++ echo "configure: 38818: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38539,7 +38843,7 @@
+ do
+ for j in python$version/copy.py;
+ do
+- echo "configure: 38542: $i/$j" >&5
++ echo "configure: 38846: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_moddir=$i
+@@ -38583,7 +38887,7 @@
+ do
+ for j in Python.h;
+ do
+- echo "configure: 38586: $i/$j" >&5
++ echo "configure: 38890: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38599,7 +38903,7 @@
+ do
+ for j in python$version/Python.h;
+ do
+- echo "configure: 38602: $i/$j" >&5
++ echo "configure: 38906: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38623,7 +38927,7 @@
+ do
+ for j in libpython$version.so;
+ do
+- echo "configure: 38626: $i/$j" >&5
++ echo "configure: 38930: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38639,7 +38943,7 @@
+ do
+ for j in libpython$version.a;
+ do
+- echo "configure: 38642: $i/$j" >&5
++ echo "configure: 38946: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38655,7 +38959,7 @@
+ do
+ for j in python$version/config/libpython$version.a;
+ do
+- echo "configure: 38658: $i/$j" >&5
++ echo "configure: 38962: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38683,7 +38987,7 @@
+ do
+ for j in python$version/copy.py;
+ do
+- echo "configure: 38686: $i/$j" >&5
++ echo "configure: 38990: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_moddir=$i
+@@ -38727,7 +39031,7 @@
+ do
+ for j in Python.h;
+ do
+- echo "configure: 38730: $i/$j" >&5
++ echo "configure: 39034: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38743,7 +39047,7 @@
+ do
+ for j in python$version/Python.h;
+ do
+- echo "configure: 38746: $i/$j" >&5
++ echo "configure: 39050: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38767,7 +39071,7 @@
+ do
+ for j in libpython$version.so;
+ do
+- echo "configure: 38770: $i/$j" >&5
++ echo "configure: 39074: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38783,7 +39087,7 @@
+ do
+ for j in libpython$version.a;
+ do
+- echo "configure: 38786: $i/$j" >&5
++ echo "configure: 39090: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38799,7 +39103,7 @@
+ do
+ for j in python$version/config/libpython$version.a;
+ do
+- echo "configure: 38802: $i/$j" >&5
++ echo "configure: 39106: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38827,7 +39131,7 @@
+ do
+ for j in python$version/copy.py;
+ do
+- echo "configure: 38830: $i/$j" >&5
++ echo "configure: 39134: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_moddir=$i
+@@ -38903,8 +39207,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=$?
+@@ -39000,8 +39303,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=$?
+@@ -39097,8 +39399,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=$?
+@@ -39194,8 +39495,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=$?
+@@ -39291,8 +39591,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=$?
+@@ -39388,8 +39687,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=$?
+@@ -39485,8 +39783,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=$?
+@@ -39582,8 +39879,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=$?
+@@ -39679,8 +39975,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=$?
+@@ -39776,8 +40071,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=$?
+@@ -39873,8 +40167,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=$?
+@@ -39970,8 +40263,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=$?
+@@ -40067,8 +40359,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=$?
+@@ -40186,8 +40477,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=$?
+@@ -40283,8 +40573,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=$?
+@@ -40380,8 +40669,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=$?
+@@ -40477,8 +40765,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=$?
+@@ -40574,8 +40861,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=$?
+@@ -40671,8 +40957,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=$?
+@@ -40768,8 +41053,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=$?
+@@ -40865,8 +41149,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=$?
+@@ -40962,8 +41245,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=$?
+@@ -41059,8 +41341,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=$?
+@@ -41156,8 +41437,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=$?
+@@ -41253,8 +41533,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=$?
+@@ -41350,8 +41629,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=$?
+@@ -41470,8 +41748,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=$?
+@@ -41567,8 +41844,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=$?
+@@ -41664,8 +41940,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=$?
+@@ -41761,8 +42036,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=$?
+@@ -41858,8 +42132,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=$?
+@@ -41955,8 +42228,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=$?
+@@ -42052,8 +42324,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=$?
+@@ -42149,8 +42420,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=$?
+@@ -42246,8 +42516,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=$?
+@@ -42343,8 +42612,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=$?
+@@ -42440,8 +42708,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=$?
+@@ -42537,8 +42804,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=$?
+@@ -42634,8 +42900,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=$?
+@@ -42754,8 +43019,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=$?
+@@ -42851,8 +43115,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=$?
+@@ -42948,8 +43211,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=$?
+@@ -43045,8 +43307,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=$?
+@@ -43142,8 +43403,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=$?
+@@ -43239,8 +43499,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=$?
+@@ -43336,8 +43595,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=$?
+@@ -43433,8 +43691,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=$?
+@@ -43530,8 +43787,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=$?
+@@ -43627,8 +43883,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=$?
+@@ -43724,8 +43979,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=$?
+@@ -43821,8 +44075,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=$?
+@@ -43918,8 +44171,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=$?
+@@ -44038,8 +44290,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=$?
+@@ -44135,8 +44386,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=$?
+@@ -44232,8 +44482,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=$?
+@@ -44329,8 +44578,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=$?
+@@ -44426,8 +44674,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=$?
+@@ -44523,8 +44770,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=$?
+@@ -44620,8 +44866,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=$?
+@@ -44717,8 +44962,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=$?
+@@ -44814,8 +45058,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=$?
+@@ -44911,8 +45154,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=$?
+@@ -45008,8 +45250,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=$?
+@@ -45105,8 +45346,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=$?
+@@ -45202,8 +45442,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=$?
+@@ -45322,8 +45561,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=$?
+@@ -45419,8 +45657,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=$?
+@@ -45516,8 +45753,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=$?
+@@ -45613,8 +45849,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=$?
+@@ -45710,8 +45945,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=$?
+@@ -45807,8 +46041,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=$?
+@@ -45904,8 +46137,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=$?
+@@ -46001,8 +46233,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=$?
+@@ -46098,8 +46329,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=$?
+@@ -46195,8 +46425,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=$?
+@@ -46292,8 +46521,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=$?
+@@ -46389,8 +46617,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=$?
+@@ -46486,8 +46713,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=$?
+@@ -46603,8 +46829,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=$?
+@@ -46705,8 +46930,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=$?
+@@ -46772,8 +46996,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=$?
+@@ -47359,6 +47582,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7593,7 +12982,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
-@@ -38176,6 +37764,9 @@
+@@ -48263,6 +48493,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -7603,7 +12992,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
-@@ -38568,11 +38159,6 @@
+@@ -48677,11 +48910,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7615,7 +13004,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. */
-@@ -38611,6 +38197,12 @@
+@@ -48720,6 +48948,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7630,18 +13019,20 @@
sed "$ac_vpsub
--- configure.in
+++ configure.in
-@@ -42,6 +42,8 @@
+@@ -40,7 +40,9 @@
+ AC_ARG_PROGRAM
+
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeutils, "3.4.3") dnl searches for some needed programs
+-AM_INIT_AUTOMAKE(kdeutils, "3.5") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdeutils-rc1, "3.5") dnl searches for some needed programs
++
++AM_MAINTAINER_MODE
-+AM_MAINTAINER_MODE
-+
KDE_SET_PREFIX
- dnl generate the config header
--- doc/ark/Makefile.in
+++ doc/ark/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7651,7 +13042,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -371,7 +374,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7660,7 +13051,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -409,9 +412,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7674,7 +13065,7 @@
mostlyclean-libtool:
--- doc/kcalc/Makefile.in
+++ doc/kcalc/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7684,7 +13075,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7693,7 +13084,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7705,7 +13096,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -536,7 +539,7 @@
+@@ -558,7 +561,7 @@
KDE_DIST=index.docbook kcalc_on_OSF.txt index.cache.bz2 kcalc_on_Aix.txt Makefile.in Makefile.am
#>+ 24
@@ -7714,7 +13105,7 @@
@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
-@@ -563,20 +566,20 @@
+@@ -585,20 +588,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc
@@ -7740,7 +13131,7 @@
--- doc/kcharselect/Makefile.in
+++ doc/kcharselect/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7750,7 +13141,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7759,7 +13150,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7773,7 +13164,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmlowbatcrit/Makefile.in
+++ doc/kcontrol/kcmlowbatcrit/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7783,7 +13174,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7792,7 +13183,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7806,7 +13197,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmlowbatwarn/Makefile.in
+++ doc/kcontrol/kcmlowbatwarn/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7816,7 +13207,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7825,7 +13216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7839,7 +13230,7 @@
mostlyclean-libtool:
--- doc/kcontrol/laptop/Makefile.in
+++ doc/kcontrol/laptop/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7849,7 +13240,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7858,7 +13249,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7872,7 +13263,7 @@
mostlyclean-libtool:
--- doc/kcontrol/Makefile.in
+++ doc/kcontrol/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7882,7 +13273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -381,7 +384,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -7891,7 +13282,7 @@
KDE_LANG = en
KDE_DOCS = AUTO
#>- all: all-recursive
-@@ -367,7 +370,7 @@
+@@ -389,7 +392,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7900,7 +13291,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -427,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7914,7 +13305,7 @@
mostlyclean-libtool:
--- doc/kcontrol/powerctrl/Makefile.in
+++ doc/kcontrol/powerctrl/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7924,7 +13315,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7933,7 +13324,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7947,7 +13338,7 @@
mostlyclean-libtool:
--- doc/kdelirc/irkick/Makefile.in
+++ doc/kdelirc/irkick/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7957,7 +13348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7966,7 +13357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7980,7 +13371,7 @@
mostlyclean-libtool:
--- doc/kdelirc/kcmlirc/Makefile.in
+++ doc/kdelirc/kcmlirc/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7990,7 +13381,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7999,7 +13390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8013,7 +13404,7 @@
mostlyclean-libtool:
--- doc/kdelirc/Makefile.in
+++ doc/kdelirc/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8023,7 +13414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,7 @@
+@@ -389,7 +392,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8032,7 +13423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -427,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8046,7 +13437,7 @@
mostlyclean-libtool:
--- doc/kdf/Makefile.in
+++ doc/kdf/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8056,7 +13447,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8065,7 +13456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8077,7 +13468,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -536,7 +539,7 @@
+@@ -558,7 +561,7 @@
KDE_DIST=index.docbook kdf_config.png index.cache.bz2 kdf.png Makefile.in Makefile.am
#>+ 24
@@ -8086,7 +13477,7 @@
@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
-@@ -563,20 +566,20 @@
+@@ -585,20 +588,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf
@@ -8112,7 +13503,7 @@
--- doc/kedit/Makefile.in
+++ doc/kedit/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8122,7 +13513,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8131,7 +13522,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8145,7 +13536,7 @@
mostlyclean-libtool:
--- doc/kfloppy/Makefile.in
+++ doc/kfloppy/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8155,7 +13546,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8164,7 +13555,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8178,7 +13569,7 @@
mostlyclean-libtool:
--- doc/kgpg/Makefile.in
+++ doc/kgpg/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8188,7 +13579,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8197,7 +13588,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8209,7 +13600,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -533,10 +536,10 @@
+@@ -555,10 +558,10 @@
.NOEXPORT:
#>+ 2
@@ -8222,7 +13613,7 @@
@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
-@@ -563,20 +566,20 @@
+@@ -585,20 +588,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg
@@ -8248,7 +13639,7 @@
--- doc/khexedit/Makefile.in
+++ doc/khexedit/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8258,7 +13649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8267,7 +13658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8279,7 +13670,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -536,7 +539,7 @@
+@@ -558,7 +561,7 @@
KDE_DIST=index.docbook index.cache.bz2 Makefile.in khexedit1.png Makefile.am
#>+ 24
@@ -8288,7 +13679,7 @@
@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
-@@ -563,20 +566,20 @@
+@@ -585,20 +588,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit
@@ -8314,7 +13705,7 @@
--- doc/kinfocenter/blockdevices/Makefile.in
+++ doc/kinfocenter/blockdevices/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8324,7 +13715,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8333,7 +13724,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8347,7 +13738,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/Makefile.in
+++ doc/kinfocenter/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8357,7 +13748,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,7 @@
+@@ -389,7 +392,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8366,7 +13757,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -427,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8380,7 +13771,7 @@
mostlyclean-libtool:
--- doc/kjots/Makefile.in
+++ doc/kjots/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8390,7 +13781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8399,7 +13790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8413,7 +13804,7 @@
mostlyclean-libtool:
--- doc/KRegExpEditor/Makefile.in
+++ doc/KRegExpEditor/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8423,7 +13814,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -349,7 +352,7 @@
+@@ -371,7 +374,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8432,7 +13823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -387,9 +390,9 @@
+@@ -409,9 +412,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8444,7 +13835,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -534,10 +537,10 @@
+@@ -556,10 +559,10 @@
.NOEXPORT:
#>+ 2
@@ -8457,7 +13848,7 @@
@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
-@@ -564,20 +567,20 @@
+@@ -586,20 +589,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor
@@ -8483,7 +13874,7 @@
--- doc/ksim/Makefile.in
+++ doc/ksim/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8493,7 +13884,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8502,7 +13893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8516,7 +13907,7 @@
mostlyclean-libtool:
--- doc/ktimer/Makefile.in
+++ doc/ktimer/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8526,7 +13917,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8535,7 +13926,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8549,7 +13940,7 @@
mostlyclean-libtool:
--- doc/kwallet/Makefile.in
+++ doc/kwallet/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8559,7 +13950,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8568,7 +13959,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8580,9 +13971,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -558,7 +561,7 @@
+ KDE_DIST=index.docbook edit1.png cr22-action-wallet_open.png cr22-action-wallet_closed.png password2.png index.cache.bz2 edit3.png edit2.png Makefile.in kwalletmanager.png Makefile.am password1.png
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.png 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
+@@ -585,20 +588,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet
+- @for base in kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png ; do \
++ @for base in password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png ; do \
++ for base in password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png ; do \
++ for file in password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8592,12 +14016,12 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -361,13 +364,13 @@
+@@ -383,13 +386,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
--SUBDIRS =. kfloppy kgpg kcharselect kjots ktimer kcontrol kedit ksim kwallet kdf khexedit kinfocenter KRegExpEditor kdelirc kcalc ark
-+SUBDIRS =. ark kdf kgpg ksim kdelirc kfloppy khexedit kcalc kedit kjots kwallet kcontrol ktimer kcharselect KRegExpEditor kinfocenter
+-SUBDIRS =. kfloppy kgpg kcharselect kjots ktimer kcontrol kedit ksim kwallet kdf khexedit kinfocenter KRegExpEditor kdelirc kcalc ark superkaramba
++SUBDIRS =. ark kdf kgpg ksim kdelirc kfloppy khexedit kcalc kedit kjots kwallet kcontrol ktimer kcharselect superkaramba KRegExpEditor kinfocenter
#>- all: all-recursive
#>+ 1
all: docs-am all-recursive
@@ -8608,7 +14032,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -427,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8620,9 +14044,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kcalc/Makefile.in
-+++ kcalc/Makefile.in
-@@ -232,6 +232,9 @@
+--- doc/superkaramba/Makefile.in
++++ doc/superkaramba/Makefile.in
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8632,16 +14056,82 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -370,7 +373,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*) \
+@@ -408,9 +411,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:
+--- kcalc/knumber/Makefile.in
++++ kcalc/knumber/Makefile.in
+@@ -238,6 +238,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@
+@@ -440,7 +443,7 @@
+
+ .SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -478,9 +481,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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kcalc/knumber/tests/Makefile.in
++++ kcalc/knumber/tests/Makefile.in
+@@ -228,6 +228,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@
+@@ -429,7 +432,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*) \
-@@ -486,9 +489,9 @@
+@@ -467,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8651,9 +14141,42 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-checkPROGRAMS:
+--- kcalc/Makefile.in
++++ kcalc/Makefile.in
+@@ -259,6 +259,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@
+@@ -487,7 +490,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -525,9 +528,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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -940,18 +943,18 @@
+@@ -1179,18 +1182,18 @@
mocs: kcalc_const_button.moc
#>+ 3
@@ -8678,7 +14201,7 @@
#>+ 3
kcalc_button.moc: $(srcdir)/kcalc_button.h
-@@ -962,7 +965,7 @@
+@@ -1201,7 +1204,7 @@
#>+ 3
clean-metasources:
@@ -8686,40 +14209,46 @@
+ -rm -f kcalc.moc kcalcdisplay.moc kcalc_const_button.moc kcalc_const_menu.moc dlabel.moc kcalc_button.moc
#>+ 2
- KDE_DIST=cr32-app-kcalc.png cr48-app-kcalc.png cr64-app-kcalc.png kcalc.kcfg kcalc.desktop confvalues.h colors.ui kcalcui.rc constants.ui configure.in.in kcalcrc.upd general.ui kcalc_settings.kcfgc Makefile.in cr16-app-kcalc.png ToDo crsc-app-kcalc.svgz version.h Makefile.am
-@@ -984,23 +987,23 @@
+ KDE_DIST=configure.in.bot hi16-app-kcalc.png kcalc.kcfg hisc-app-kcalc.svgz kcalc.desktop confvalues.h hi22-app-kcalc.png colors.ui hi48-app-kcalc.png kcalcui.rc constants.ui configure.in.in kcalcrc.upd general.ui kcalc_settings.kcfgc Makefile.in hi32-app-kcalc.png version.h hi64-app-kcalc.png Makefile.am
+@@ -1223,26 +1226,26 @@
- #>+ 19
+ #>+ 22
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcalc.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcalc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcalc.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcalc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcalc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcalc.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcalc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcalc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcalc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcalc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcalc.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcalc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcalc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcalc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
#>+ 15
force-reedit:
--- kcharselect/Makefile.in
+++ kcharselect/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8729,7 +14258,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -8738,7 +14267,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
@@ -8750,27 +14279,30 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -781,14 +784,14 @@
+@@ -803,17 +806,17 @@
- #>+ 10
+ #>+ 13
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcharselect.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcharselect.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcharselect.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcharselect.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcharselect.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcharselect.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcharselect.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcharselect.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcharselect.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcharselect.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
#>+ 15
force-reedit:
--- kdelirc/icons/Makefile.in
+++ kdelirc/icons/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8780,7 +14312,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8789,7 +14321,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8801,7 +14333,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -531,7 +534,7 @@
+@@ -553,7 +556,7 @@
.NOEXPORT:
#>+ 2
@@ -8810,7 +14342,7 @@
#>+ 2
docs-am:
-@@ -539,41 +542,41 @@
+@@ -561,41 +564,41 @@
#>+ 38
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions
@@ -8877,7 +14409,7 @@
force-reedit:
--- kdelirc/irkick/icons/Makefile.in
+++ kdelirc/irkick/icons/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8887,7 +14419,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8896,7 +14428,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8910,7 +14442,7 @@
mostlyclean-libtool:
--- kdelirc/irkick/Makefile.in
+++ kdelirc/irkick/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -264,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8920,7 +14452,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -489,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8929,7 +14461,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -527,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8941,7 +14473,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1056,22 +1059,22 @@
+@@ -1078,22 +1081,22 @@
#>+ 19
install-kde-icons:
@@ -8972,7 +14504,7 @@
#>+ 15
--- kdelirc/kcmlirc/Makefile.in
+++ kdelirc/kcmlirc/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -227,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8982,7 +14514,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8991,7 +14523,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9003,7 +14535,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -759,18 +762,18 @@
+@@ -781,18 +784,18 @@
mocs: editmode.moc
#>+ 3
@@ -9028,7 +14560,7 @@
#>+ 3
modeslist.moc: $(srcdir)/modeslist.h
-@@ -788,7 +791,7 @@
+@@ -810,7 +813,7 @@
#>+ 3
clean-metasources:
@@ -9037,7 +14569,7 @@
#>+ 2
KDE_DIST=newmode.ui selectprofile.ui newmode.ui.h editmodebase.ui kcmlirc.desktop editaction.h addactionbase.ui kcmlircbase.ui editactionbase.ui Makefile.in kcmlircbase.ui.h modeslist.h editmode.h Makefile.am
-@@ -854,7 +857,7 @@
+@@ -876,7 +879,7 @@
#>+ 11
@@ -9048,7 +14580,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_kcmlirc_la.all_cpp.final; \
--- kdelirc/kdelirc/Makefile.in
+++ kdelirc/kdelirc/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -216,6 +216,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9058,7 +14590,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -445,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9067,7 +14599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -483,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9081,7 +14613,7 @@
clean-noinstLTLIBRARIES:
--- kdelirc/Makefile.in
+++ kdelirc/Makefile.in
-@@ -180,6 +180,9 @@
+@@ -192,6 +192,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9091,7 +14623,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -364,7 +367,7 @@
+@@ -386,7 +389,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9100,7 +14632,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -402,9 +405,9 @@
+@@ -424,9 +427,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9114,7 +14646,7 @@
mostlyclean-libtool:
--- kdelirc/profiles/Makefile.in
+++ kdelirc/profiles/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9124,7 +14656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -381,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9133,7 +14665,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9145,7 +14677,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -559,7 +562,7 @@
+@@ -581,7 +584,7 @@
.NOEXPORT:
#>+ 2
@@ -9156,7 +14688,7 @@
docs-am:
--- kdelirc/remotes/Makefile.in
+++ kdelirc/remotes/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9166,7 +14698,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -361,7 +364,7 @@
+@@ -383,7 +386,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9175,7 +14707,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -399,9 +402,9 @@
+@@ -421,9 +424,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9189,7 +14721,7 @@
mostlyclean-libtool:
--- kdessh/Makefile.in
+++ kdessh/Makefile.in
-@@ -203,6 +203,9 @@
+@@ -215,6 +215,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9199,7 +14731,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -416,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9208,7 +14740,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -454,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9222,7 +14754,7 @@
@$(NORMAL_INSTALL)
--- kdf/Makefile.in
+++ kdf/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9232,7 +14764,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -481,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9241,7 +14773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -519,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9253,7 +14785,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -999,13 +1002,6 @@
+@@ -1021,13 +1024,6 @@
mocs: disks.moc
#>+ 3
@@ -9267,7 +14799,7 @@
listview.moc: $(srcdir)/listview.h
$(MOC) $(srcdir)/listview.h -o listview.moc
-@@ -1020,6 +1016,13 @@
+@@ -1042,6 +1038,13 @@
mocs: kcmdf.moc
#>+ 3
@@ -9281,7 +14813,7 @@
kdf.moc: $(srcdir)/kdf.h
$(MOC) $(srcdir)/kdf.h -o kdf.moc
-@@ -1042,7 +1045,7 @@
+@@ -1064,7 +1067,7 @@
#>+ 3
clean-metasources:
@@ -9290,7 +14822,7 @@
#>+ 2
KDE_DIST=kdfui.rc kconftest.cpp kwikdisk.desktop kdf.desktop Makefile.in kcmdf.desktop Makefile.am
-@@ -1093,7 +1096,7 @@
+@@ -1115,7 +1118,7 @@
#>+ 11
@@ -9301,7 +14833,7 @@
echo "#define KDE_USE_FINAL 1" >> libkdf_common_la.all_cpp.final; \
--- kdf/pics/Makefile.in
+++ kdf/pics/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9311,7 +14843,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -381,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9320,7 +14852,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9332,78 +14864,92 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -562,47 +565,47 @@
+@@ -584,54 +587,54 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr32-app-kcmdf.png delete.png cr48-app-kdf.png cr16-app-kcmdf.png cr128-app-kwikdisk.png cr22-app-kwikdisk.png cr128-app-kdf.png mini-root.png cr48-app-kwikdisk.png cr32-app-kwikdisk.png cr16-app-kdf.png cr64-app-kdf.png Makefile.in cr64-app-kwikdisk.png tick.png cr16-app-kwikdisk.png cr32-app-kdf.png Makefile.am
-+KDE_DIST=cr32-app-kcmdf.png delete.png cr48-app-kdf.png cr16-app-kcmdf.png cr128-app-kwikdisk.png cr22-app-kwikdisk.png cr128-app-kdf.png cr48-app-kwikdisk.png mini-root.png cr32-app-kwikdisk.png cr16-app-kdf.png cr64-app-kdf.png Makefile.in tick.png cr64-app-kwikdisk.png cr16-app-kwikdisk.png cr32-app-kdf.png Makefile.am
+-KDE_DIST=cr32-app-kcmdf.png hi32-app-kwikdisk.png hi16-app-kwikdisk.png hi48-app-kdf.png delete.png cr16-app-kcmdf.png hi128-app-kdf.png cr22-app-kcmdf.png hi64-app-kwikdisk.png hi64-app-kdf.png mini-root.png hi22-app-kwikdisk.png hi32-app-kdf.png hi48-app-kwikdisk.png hi128-app-kwikdisk.png Makefile.in hi22-app-kdf.png tick.png hi16-app-kdf.png Makefile.am
++KDE_DIST=cr32-app-kcmdf.png hi32-app-kwikdisk.png hi16-app-kwikdisk.png hi48-app-kdf.png delete.png cr16-app-kcmdf.png hi128-app-kdf.png cr22-app-kcmdf.png hi64-app-kwikdisk.png hi64-app-kdf.png mini-root.png hi22-app-kwikdisk.png hi48-app-kwikdisk.png hi32-app-kdf.png hi128-app-kwikdisk.png Makefile.in tick.png hi22-app-kdf.png hi16-app-kdf.png Makefile.am
#>+ 2
docs-am:
- #>+ 36
+ #>+ 43
install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwikdisk.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdf.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwikdisk.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwikdisk.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdf.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwikdisk.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwikdisk.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwikdisk.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwikdisk.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdf.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdf.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdf.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdf.png
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwikdisk.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdf.png
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwikdisk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwikdisk.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwikdisk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwikdisk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwikdisk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwikdisk.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwikdisk.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwikdisk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
#>+ 15
force-reedit:
--- kedit/Makefile.in
+++ kedit/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9413,7 +14959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -478,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9422,7 +14968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -516,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9436,7 +14982,7 @@
@$(NORMAL_INSTALL)
--- kedit/pixmaps/Makefile.in
+++ kedit/pixmaps/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9446,7 +14992,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,7 @@
+@@ -369,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9455,7 +15001,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -385,9 +388,9 @@
+@@ -407,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9467,36 +15013,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -537,20 +540,20 @@
+@@ -559,21 +562,21 @@
- #>+ 16
+ #>+ 19
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kedit.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kedit.png
- #>+ 15
- force-reedit:
--- kfloppy/Makefile.in
+++ kfloppy/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9506,7 +15050,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9515,7 +15059,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9527,40 +15071,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -741,7 +744,7 @@
+@@ -785,33 +788,33 @@
-rm -f format.moc floppy.moc
#>+ 2
--KDE_DIST=cr48-app-kfloppy.png format.h cr32-app-kfloppy.png cr64-app-kfloppy.png debug.h cr16-app-kfloppy.png Makefile.in KFloppy.desktop cr128-app-kfloppy.png Makefile.am
-+KDE_DIST=cr48-app-kfloppy.png format.h cr32-app-kfloppy.png cr64-app-kfloppy.png debug.h cr16-app-kfloppy.png KFloppy.desktop Makefile.in cr128-app-kfloppy.png Makefile.am
+-KDE_DIST=zip.cpp format.h hi128-app-kfloppy.png floppy_format.desktop hi32-app-kfloppy.png debug.h hi48-app-kfloppy.png hi22-app-kfloppy.png Makefile.in KFloppy.desktop hi64-app-kfloppy.png hi16-app-kfloppy.png zip.h Makefile.am
++KDE_DIST=zip.cpp format.h hi128-app-kfloppy.png floppy_format.desktop hi32-app-kfloppy.png debug.h hi48-app-kfloppy.png hi22-app-kfloppy.png KFloppy.desktop Makefile.in hi64-app-kfloppy.png hi16-app-kfloppy.png zip.h Makefile.am
#>+ 2
docs-am:
-@@ -752,18 +755,18 @@
- $(INSTALL_DATA) $(srcdir)/cr128-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfloppy.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfloppy.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfloppy.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kfloppy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfloppy.png
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfloppy.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfloppy.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kfloppy.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
+
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfloppy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfloppy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfloppy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfloppy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfloppy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfloppy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfloppy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kfloppy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
#>+ 15
+ force-reedit:
--- kgpg/icons/Makefile.in
+++ kgpg/icons/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9570,7 +15127,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9579,7 +15136,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9591,7 +15148,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -539,37 +542,37 @@
+@@ -561,37 +564,37 @@
#>+ 34
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions
@@ -9645,7 +15202,7 @@
force-reedit:
--- kgpg/Makefile.in
+++ kgpg/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9655,7 +15212,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -481,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9664,7 +15221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -519,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9676,7 +15233,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1056,18 +1059,18 @@
+@@ -1078,18 +1081,18 @@
mocs: kgpgview.moc
#>+ 3
@@ -9701,7 +15258,7 @@
#>+ 3
keyservers.moc: $(srcdir)/keyservers.h
-@@ -1078,10 +1081,10 @@
+@@ -1100,10 +1103,10 @@
#>+ 3
clean-metasources:
@@ -9709,39 +15266,39 @@
+ -rm -f kgpglibrary.moc keygener.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc listkeys.moc kgpgview.moc keyinfowidget.moc popuppublic.moc keyservers.moc
#>+ 2
--KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui encryptfile.desktop kgpgwizard.ui kgpginterface.h cr22-app-kgpg.png listkeys.h tips newkey.ui.h cr32-app-kgpg.png conf_gpg.ui groupedit.ui kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h cr16-app-kgpg.png keyproperties.ui dcopiface.h conf_misc.ui keyservers.h adduid.ui kgpgview.h keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h cr16-app-kgpg2.png kgpg.desktop conf_decryption.ui Makefile.am popuppublic.h detailedconsole.h cr48-app-kgpg.png kgpgsettings.kcfgc keyexport.ui
-+KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui encryptfile.desktop kgpgwizard.ui kgpginterface.h cr22-app-kgpg.png listkeys.h tips newkey.ui.h cr32-app-kgpg.png conf_gpg.ui groupedit.ui kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h cr16-app-kgpg.png keyproperties.ui conf_misc.ui dcopiface.h keyservers.h adduid.ui kgpgview.h keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h cr16-app-kgpg2.png kgpg.desktop conf_decryption.ui detailedconsole.h Makefile.am popuppublic.h kgpgsettings.kcfgc cr48-app-kgpg.png keyexport.ui
+-KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui hi22-app-kgpg.png encryptfile.desktop kgpgwizard.ui kgpginterface.h listkeys.h tips newkey.ui.h conf_gpg.ui groupedit.ui hi48-app-kgpg.png kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h keyproperties.ui dcopiface.h conf_misc.ui keyservers.h adduid.ui kgpgview.h hi32-app-kgpg.png keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h kgpg.desktop hi16-app-kgpg.png conf_decryption.ui Makefile.am popuppublic.h detailedconsole.h kgpgsettings.kcfgc keyexport.ui
++KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui hi22-app-kgpg.png encryptfile.desktop kgpgwizard.ui kgpginterface.h listkeys.h tips newkey.ui.h conf_gpg.ui groupedit.ui hi48-app-kgpg.png kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h keyproperties.ui conf_misc.ui dcopiface.h keyservers.h adduid.ui hi32-app-kgpg.png kgpgview.h keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h kgpg.desktop hi16-app-kgpg.png conf_decryption.ui detailedconsole.h Makefile.am popuppublic.h kgpgsettings.kcfgc keyexport.ui
#>+ 4
clean-idl:
-@@ -1118,20 +1121,20 @@
+@@ -1140,20 +1143,20 @@
#>+ 16
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kgpg.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kgpg.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kgpg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgpg.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kgpg.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kgpg.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kgpg.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kgpg.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kgpg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgpg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kgpg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
#>+ 15
force-reedit:
-@@ -1172,7 +1175,7 @@
+@@ -1194,7 +1197,7 @@
#>+ 11
@@ -9752,7 +15309,7 @@
echo "#define KDE_USE_FINAL 1" >> kgpg.all_cpp.final; \
--- khexedit/lib/codecs/Makefile.in
+++ khexedit/lib/codecs/Makefile.in
-@@ -205,6 +205,9 @@
+@@ -217,6 +217,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9762,7 +15319,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9771,7 +15328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9785,7 +15342,7 @@
clean-noinstLTLIBRARIES:
--- khexedit/lib/controller/Makefile.in
+++ khexedit/lib/controller/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9795,7 +15352,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -420,7 +423,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9804,7 +15361,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -458,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9818,7 +15375,7 @@
clean-noinstLTLIBRARIES:
--- khexedit/lib/Makefile.in
+++ khexedit/lib/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9828,7 +15385,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -488,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9837,7 +15394,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -526,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9851,7 +15408,7 @@
@$(NORMAL_INSTALL)
--- khexedit/Makefile.in
+++ khexedit/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9861,7 +15418,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -480,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -9870,7 +15427,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -518,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9882,7 +15439,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -980,11 +983,11 @@
+@@ -1002,11 +1005,11 @@
mocs: listview.moc
#>+ 3
@@ -9897,7 +15454,7 @@
#>+ 3
searchbar.moc: $(srcdir)/searchbar.h
-@@ -994,11 +997,11 @@
+@@ -1016,11 +1019,11 @@
mocs: searchbar.moc
#>+ 3
@@ -9912,7 +15469,7 @@
#>+ 3
optiondialog.moc: $(srcdir)/optiondialog.h
-@@ -1065,7 +1068,7 @@
+@@ -1087,7 +1090,7 @@
#>+ 3
clean-metasources:
@@ -9920,10 +15477,31 @@
+ -rm -f hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc chartabledialog.moc searchbar.moc hexmanagerwidget.moc optiondialog.moc bitswapwidget.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
#>+ 2
- KDE_DIST=bitswapwidget.h khexedit.desktop stringdialog.h cr16-app-khexedit.png cr32-app-khexedit.png configure.in.in khexeditui.rc Makefile.in cr48-app-khexedit.png version.h Makefile.am
-@@ -1126,7 +1129,7 @@
+ KDE_DIST=bitswapwidget.h khexedit.desktop stringdialog.h hi16-app-khexedit.png hi48-app-khexedit.png configure.in.in khexeditui.rc hi32-app-khexedit.png Makefile.in version.h Makefile.am
+@@ -1097,17 +1100,17 @@
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khexedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khexedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khexedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khexedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
+
+ #>+ 15
+ force-reedit:
+@@ -1148,7 +1151,7 @@
+
+
#>+ 11
-khexedit.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/toplevel.cc $(srcdir)/hexmanagerwidget.cc $(srcdir)/hexeditorwidget.cc $(srcdir)/hextoolwidget.cc $(srcdir)/hexviewwidget.cc $(srcdir)/hexbuffer.cc $(srcdir)/conversion.cc $(srcdir)/dialog.cc $(srcdir)/hexvalidator.cc $(srcdir)/hexclipboard.cc $(srcdir)/optiondialog.cc $(srcdir)/printdialogpage.cc $(srcdir)/statusbarprogress.cc $(srcdir)/hexprinter.cc $(srcdir)/hexerror.cc $(srcdir)/draglabel.cc $(srcdir)/stringdialog.cc $(srcdir)/bitswapwidget.cc $(srcdir)/chartabledialog.cc $(srcdir)/hexdrag.cc $(srcdir)/exportdialog.cc $(srcdir)/fileinfodialog.cc $(srcdir)/converterdialog.cc $(srcdir)/listview.cc $(srcdir)/searchbar.cc hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc chartabledialog.moc searchbar.moc hexmanagerwidget.moc bitswapwidget.moc optiondialog.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
+khexedit.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/toplevel.cc $(srcdir)/hexmanagerwidget.cc $(srcdir)/hexeditorwidget.cc $(srcdir)/hextoolwidget.cc $(srcdir)/hexviewwidget.cc $(srcdir)/hexbuffer.cc $(srcdir)/conversion.cc $(srcdir)/dialog.cc $(srcdir)/hexvalidator.cc $(srcdir)/hexclipboard.cc $(srcdir)/optiondialog.cc $(srcdir)/printdialogpage.cc $(srcdir)/statusbarprogress.cc $(srcdir)/hexprinter.cc $(srcdir)/hexerror.cc $(srcdir)/draglabel.cc $(srcdir)/stringdialog.cc $(srcdir)/bitswapwidget.cc $(srcdir)/chartabledialog.cc $(srcdir)/hexdrag.cc $(srcdir)/exportdialog.cc $(srcdir)/fileinfodialog.cc $(srcdir)/converterdialog.cc $(srcdir)/listview.cc $(srcdir)/searchbar.cc hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc hexmanagerwidget.moc searchbar.moc chartabledialog.moc bitswapwidget.moc optiondialog.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
@@ -9932,7 +15510,7 @@
echo "#define KDE_USE_FINAL 1" >> khexedit.all_cc.final; \
--- khexedit/parts/kbytesedit/Makefile.in
+++ khexedit/parts/kbytesedit/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9942,7 +15520,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9951,7 +15529,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9965,7 +15543,7 @@
@$(NORMAL_INSTALL)
--- khexedit/parts/kpart/Makefile.in
+++ khexedit/parts/kpart/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9975,7 +15553,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9984,7 +15562,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9998,7 +15576,7 @@
@$(NORMAL_INSTALL)
--- khexedit/parts/Makefile.in
+++ khexedit/parts/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10008,7 +15586,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -363,7 +366,7 @@
+@@ -385,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10017,7 +15595,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -401,9 +404,9 @@
+@@ -423,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10031,7 +15609,7 @@
mostlyclean-libtool:
--- khexedit/pics/Makefile.in
+++ khexedit/pics/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10041,7 +15619,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -380,7 +383,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10050,7 +15628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -418,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10064,7 +15642,7 @@
mostlyclean-libtool:
--- kjots/icons/Makefile.in
+++ kjots/icons/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10074,7 +15652,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -381,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10083,7 +15661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10095,36 +15673,33 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -569,20 +572,20 @@
-
- #>+ 16
+@@ -593,20 +596,20 @@
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjots.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjots.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kjots.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjots.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjots.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjots.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjots.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjots.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjots.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjots.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjots.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjots.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjots.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjots.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjots.png
#>+ 15
- force-reedit:
--- kjots/Makefile.in
+++ kjots/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10134,7 +15709,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -464,7 +467,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10143,7 +15718,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10155,7 +15730,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -913,22 +916,22 @@
+@@ -935,22 +938,22 @@
mocs: KJotsMain.moc
#>+ 3
@@ -10185,7 +15760,7 @@
#>+ 2
KDE_DIST=kjotsbookmarks.h kjots.kcfg kjotsedit.h kjotsui.rc ANNOUNCE confpagemisc.ui kjotsentry.h confpagefont.ui KJotsSettings.kcfgc CHANGES KJotsMain.h Makefile.in Kjots.desktop BUGS Makefile.am
-@@ -986,7 +989,7 @@
+@@ -1008,7 +1011,7 @@
#>+ 11
@@ -10196,7 +15771,7 @@
echo "#define KDE_USE_FINAL 1" >> kjots.all_cpp.final; \
--- klaptopdaemon/applnk/Makefile.in
+++ klaptopdaemon/applnk/Makefile.in
-@@ -174,6 +174,9 @@
+@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10206,7 +15781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -360,7 +363,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10215,7 +15790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -398,9 +401,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10229,7 +15804,7 @@
mostlyclean-libtool:
--- klaptopdaemon/Makefile.in
+++ klaptopdaemon/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -282,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10239,7 +15814,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -505,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -10248,7 +15823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -543,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10260,7 +15835,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1060,18 +1063,18 @@
+@@ -1082,18 +1085,18 @@
mocs: profile.moc
#>+ 3
@@ -10285,7 +15860,7 @@
#>+ 3
battery.moc: $(srcdir)/battery.h
-@@ -1137,18 +1140,18 @@
+@@ -1159,18 +1162,18 @@
mocs: main.moc
#>+ 3
@@ -10310,7 +15885,7 @@
#>+ 3
buttons.moc: $(srcdir)/buttons.h
-@@ -1172,10 +1175,10 @@
+@@ -1194,10 +1197,10 @@
#>+ 3
clean-metasources:
@@ -10325,7 +15900,7 @@
clean-idl:
--- klaptopdaemon/pics/actions/Makefile.in
+++ klaptopdaemon/pics/actions/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10335,7 +15910,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,7 +351,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10344,7 +15919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -386,9 +389,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10356,7 +15931,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -539,41 +542,41 @@
+@@ -561,41 +564,41 @@
#>+ 39
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions
@@ -10419,7 +15994,7 @@
#>+ 15
--- klaptopdaemon/pics/Makefile.in
+++ klaptopdaemon/pics/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10429,7 +16004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,7 @@
+@@ -389,7 +392,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10438,7 +16013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -427,9 +430,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10450,7 +16025,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -705,32 +708,32 @@
+@@ -727,32 +730,32 @@
#>+ 28
install-kde-icons:
@@ -10503,7 +16078,7 @@
force-reedit:
--- kmilo/asus/Makefile.in
+++ kmilo/asus/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10513,7 +16088,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10522,7 +16097,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10536,7 +16111,7 @@
@$(NORMAL_INSTALL)
--- kmilo/delli8k/Makefile.in
+++ kmilo/delli8k/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10546,7 +16121,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -444,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10555,7 +16130,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -482,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10569,7 +16144,7 @@
@$(NORMAL_INSTALL)
--- kmilo/demo/Makefile.in
+++ kmilo/demo/Makefile.in
-@@ -228,6 +228,9 @@
+@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10579,7 +16154,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10588,7 +16163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10602,7 +16177,7 @@
@$(NORMAL_INSTALL)
--- kmilo/generic/Makefile.in
+++ kmilo/generic/Makefile.in
-@@ -228,6 +228,9 @@
+@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10612,7 +16187,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10621,7 +16196,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10635,7 +16210,7 @@
@$(NORMAL_INSTALL)
--- kmilo/kmilod/Makefile.in
+++ kmilo/kmilod/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10645,7 +16220,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -468,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10654,7 +16229,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10668,7 +16243,7 @@
@$(NORMAL_INSTALL)
--- kmilo/kmilo_kvaio/kcmkvaio/Makefile.in
+++ kmilo/kmilo_kvaio/kcmkvaio/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10678,7 +16253,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -425,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10687,7 +16262,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10701,7 +16276,7 @@
@$(NORMAL_INSTALL)
--- kmilo/kmilo_kvaio/Makefile.in
+++ kmilo/kmilo_kvaio/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10711,7 +16286,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -462,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10720,7 +16295,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -500,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10732,9 +16307,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -897,18 +900,18 @@
+
+
+ #>+ 3
+-kmilo_kvaio.moc.cpp: $(srcdir)/kmilo_kvaio.h
+- $(MOC) $(srcdir)/kmilo_kvaio.h -o kmilo_kvaio.moc.cpp
++kvaio.moc: $(srcdir)/kvaio.h
++ $(MOC) $(srcdir)/kvaio.h -o kvaio.moc
+
+ #>+ 2
+-mocs: kmilo_kvaio.moc.cpp
++mocs: kvaio.moc
+
+ #>+ 3
+-kvaio.moc: $(srcdir)/kvaio.h
+- $(MOC) $(srcdir)/kvaio.h -o kvaio.moc
++kmilo_kvaio.moc.cpp: $(srcdir)/kmilo_kvaio.h
++ $(MOC) $(srcdir)/kmilo_kvaio.h -o kmilo_kvaio.moc.cpp
+
+ #>+ 2
+-mocs: kvaio.moc
++mocs: kmilo_kvaio.moc.cpp
+
+ #>+ 3
+ kvaiodriverinterface.moc: $(srcdir)/kvaiodriverinterface.h
+@@ -919,7 +922,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kmilo_kvaio.moc.cpp kvaio.moc kvaiodriverinterface.moc
++ -rm -f kvaio.moc kmilo_kvaio.moc.cpp kvaiodriverinterface.moc
+
+ #>+ 2
+ KDE_DIST=README.sonypi.h sonypi.h kmilo_kvaio.desktop Makefile.in Makefile.am
--- kmilo/Makefile.in
+++ kmilo/Makefile.in
-@@ -180,6 +180,9 @@
+@@ -192,6 +192,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10744,7 +16353,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -368,7 +371,7 @@
+@@ -390,7 +393,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10753,7 +16362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -406,9 +409,9 @@
+@@ -428,9 +431,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10767,7 +16376,7 @@
mostlyclean-libtool:
--- kmilo/powerbook/Makefile.in
+++ kmilo/powerbook/Makefile.in
-@@ -228,6 +228,9 @@
+@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10777,7 +16386,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10786,7 +16395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10800,7 +16409,7 @@
@$(NORMAL_INSTALL)
--- kmilo/powerbook2/Makefile.in
+++ kmilo/powerbook2/Makefile.in
-@@ -228,6 +228,9 @@
+@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10810,7 +16419,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10819,7 +16428,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10833,7 +16442,7 @@
@$(NORMAL_INSTALL)
--- kmilo/thinkpad/kcmthinkpad/Makefile.in
+++ kmilo/thinkpad/kcmthinkpad/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -221,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10843,7 +16452,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -424,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10852,7 +16461,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10866,7 +16475,7 @@
@$(NORMAL_INSTALL)
--- kmilo/thinkpad/Makefile.in
+++ kmilo/thinkpad/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10876,7 +16485,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -458,7 +461,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10885,7 +16494,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -496,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10899,7 +16508,7 @@
@$(NORMAL_INSTALL)
--- kregexpeditor/KMultiFormListBox/Makefile.in
+++ kregexpeditor/KMultiFormListBox/Makefile.in
-@@ -216,6 +216,9 @@
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10909,7 +16518,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -437,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10918,7 +16527,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -475,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10932,7 +16541,7 @@
clean-noinstLTLIBRARIES:
--- kregexpeditor/KWidgetStreamer/Makefile.in
+++ kregexpeditor/KWidgetStreamer/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -216,6 +216,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10942,7 +16551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -416,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10951,7 +16560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -454,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10965,7 +16574,7 @@
clean-noinstLTLIBRARIES:
--- kregexpeditor/Makefile.in
+++ kregexpeditor/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -291,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10975,7 +16584,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -533,7 +536,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -10984,7 +16593,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -571,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10996,7 +16605,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1115,13 +1118,6 @@
+@@ -1137,13 +1140,6 @@
#>+ 3
@@ -11010,7 +16619,7 @@
textwidget.moc: $(srcdir)/textwidget.h
$(MOC) $(srcdir)/textwidget.h -o textwidget.moc
-@@ -1136,6 +1132,13 @@
+@@ -1158,6 +1154,13 @@
mocs: verifier.moc
#>+ 3
@@ -11024,7 +16633,7 @@
regexpwidget.moc: $(srcdir)/regexpwidget.h
$(MOC) $(srcdir)/regexpwidget.h -o regexpwidget.moc
-@@ -1150,18 +1153,18 @@
+@@ -1172,18 +1175,18 @@
mocs: kregexpeditorgui.moc
#>+ 3
@@ -11049,7 +16658,7 @@
#>+ 3
compoundwidget.moc: $(srcdir)/compoundwidget.h
-@@ -1178,18 +1181,18 @@
+@@ -1200,18 +1203,18 @@
mocs: scrollededitorwindow.moc
#>+ 3
@@ -11074,7 +16683,7 @@
#>+ 3
userdefinedregexps.moc: $(srcdir)/userdefinedregexps.h
-@@ -1258,7 +1261,7 @@
+@@ -1280,7 +1283,7 @@
#>+ 3
clean-metasources:
@@ -11082,44 +16691,44 @@
+ -rm -f textwidget.moc verifier.moc kregexpeditorprivate.moc regexpwidget.moc kregexpeditorgui.moc singlecontainerwidget.moc verifybuttons.moc compoundwidget.moc scrollededitorwindow.moc charselector.moc editorwindow.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
#>+ 2
- KDE_DIST=gen_qregexpparser.hh kregexpeditor.svgz kregexpeditor.desktop qregexpparser.l cr48-app-kregexpeditor.png cr32-app-kregexpeditor.png altnwidget.h extractrc-from-regexp cr16-app-kregexpeditor.png Comments Makefile.in qregexpparser.y kregexpeditorgui.desktop Makefile.am cr64-app-kregexpeditor.png cr128-app-kregexpeditor.png
-@@ -1272,23 +1275,23 @@
+ KDE_DIST=hi64-app-kregexpeditor.png gen_qregexpparser.hh hi16-app-kregexpeditor.png kregexpeditor.svgz kregexpeditor.desktop qregexpparser.l altnwidget.h extractrc-from-regexp hi32-app-kregexpeditor.png hi48-app-kregexpeditor.png hi22-app-kregexpeditor.png Comments Makefile.in qregexpparser.y kregexpeditorgui.desktop hi128-app-kregexpeditor.png Makefile.am
+@@ -1294,26 +1297,26 @@
- #>+ 19
+ #>+ 22
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kregexpeditor.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kregexpeditor.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kregexpeditor.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kregexpeditor.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kregexpeditor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kregexpeditor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kregexpeditor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kregexpeditor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kregexpeditor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kregexpeditor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kregexpeditor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kregexpeditor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
#>+ 15
force-reedit:
-@@ -1329,7 +1332,7 @@
+@@ -1354,7 +1357,7 @@
#>+ 11
@@ -11130,7 +16739,7 @@
echo "#define KDE_USE_FINAL 1" >> libkregexpeditorcommon_la.all_cpp.final; \
--- kregexpeditor/picts/Makefile.in
+++ kregexpeditor/picts/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11140,7 +16749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -380,7 +383,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11149,7 +16758,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -418,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11161,7 +16770,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -557,7 +560,7 @@
+@@ -579,7 +582,7 @@
.NOEXPORT:
#>+ 2
@@ -11172,7 +16781,7 @@
docs-am:
--- kregexpeditor/predefined/General/Makefile.in
+++ kregexpeditor/predefined/General/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11182,7 +16791,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -381,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11191,7 +16800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11205,7 +16814,7 @@
mostlyclean-libtool:
--- kregexpeditor/predefined/Makefile.in
+++ kregexpeditor/predefined/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11215,7 +16824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -363,7 +366,7 @@
+@@ -385,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11224,7 +16833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -401,9 +404,9 @@
+@@ -423,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11238,7 +16847,7 @@
mostlyclean-libtool:
--- kregexpeditor/test-without-dl/Makefile.in
+++ kregexpeditor/test-without-dl/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11248,7 +16857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -384,7 +387,7 @@
+@@ -406,7 +409,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11257,7 +16866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -422,9 +425,9 @@
+@@ -444,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11271,7 +16880,7 @@
clean-checkPROGRAMS:
--- ksim/library/Makefile.in
+++ ksim/library/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11281,7 +16890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11290,7 +16899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +459,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11302,7 +16911,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -777,22 +780,22 @@
+@@ -799,22 +802,22 @@
mocs: progress.moc
#>+ 3
@@ -11332,7 +16941,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -843,7 +846,7 @@
+@@ -865,7 +868,7 @@
#>+ 11
@@ -11343,7 +16952,7 @@
echo "#define KDE_USE_FINAL 1" >> libksimcore_la.all_cpp.final; \
--- ksim/Makefile.in
+++ ksim/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11353,7 +16962,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -472,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11362,7 +16971,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11374,7 +16983,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1015,7 +1018,7 @@
+@@ -1038,7 +1041,7 @@
-rm -f ksim.moc ksimpref.moc themeprefs.moc generalprefs.moc ksimframe.moc ksimview.moc ksimsysinfo.moc monitorprefs.moc
#>+ 2
@@ -11385,7 +16994,7 @@
clean-idl:
--- ksim/monitors/cpu/Makefile.in
+++ ksim/monitors/cpu/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -216,6 +216,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11395,7 +17004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -422,7 +425,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11404,7 +17013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11418,7 +17027,7 @@
@$(NORMAL_INSTALL)
--- ksim/monitors/disk/Makefile.in
+++ ksim/monitors/disk/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11428,7 +17037,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -423,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11437,7 +17046,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -461,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11451,7 +17060,7 @@
@$(NORMAL_INSTALL)
--- ksim/monitors/filesystem/Makefile.in
+++ ksim/monitors/filesystem/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -221,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11461,7 +17070,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -431,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11470,7 +17079,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -469,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11482,7 +17091,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -769,7 +772,7 @@
+@@ -791,7 +794,7 @@
-rm -f filesystemwidget.moc ksimfsystem.moc fsystemconfig.moc
#>+ 2
@@ -11493,7 +17102,7 @@
clean-idl:
--- ksim/monitors/i8k/Makefile.in
+++ ksim/monitors/i8k/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -216,6 +216,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11503,7 +17112,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -421,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11512,7 +17121,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -459,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11526,7 +17135,7 @@
@$(NORMAL_INSTALL)
--- ksim/monitors/lm_sensors/Makefile.in
+++ ksim/monitors/lm_sensors/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -239,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11536,7 +17145,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -432,7 +435,7 @@
+@@ -454,7 +457,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -11545,7 +17154,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +473,9 @@
+@@ -492,9 +495,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11557,7 +17166,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -788,18 +791,18 @@
+@@ -810,18 +813,18 @@
mocs: ksimsensors.moc
#>+ 3
@@ -11582,7 +17191,7 @@
#>+ 5
ksimsensorsiface.kidl: $(srcdir)/ksimsensorsiface.h $(DCOP_DEPENDENCIES)
-@@ -809,7 +812,7 @@
+@@ -831,7 +834,7 @@
#>+ 3
clean-metasources:
@@ -11591,7 +17200,7 @@
#>+ 2
KDE_DIST=ksimsensorsiface.h sensorsconfig.h NVCtrl.h nv_control.h NVCtrlLib.h Makefile.in ksimsensors.h sensorbase.h Makefile.am
-@@ -861,7 +864,7 @@
+@@ -883,7 +886,7 @@
#>+ 11
@@ -11602,7 +17211,7 @@
echo "#define KDE_USE_FINAL 1" >> ksim_sensors_la.all_cpp.final; \
--- ksim/monitors/mail/Makefile.in
+++ ksim/monitors/mail/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11612,7 +17221,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -423,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11621,7 +17230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -461,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11635,7 +17244,7 @@
@$(NORMAL_INSTALL)
--- ksim/monitors/Makefile.in
+++ ksim/monitors/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11645,7 +17254,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -365,7 +368,7 @@
+@@ -387,7 +390,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11654,7 +17263,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -403,9 +406,9 @@
+@@ -425,9 +428,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11668,7 +17277,7 @@
mostlyclean-libtool:
--- ksim/monitors/net/Makefile.in
+++ ksim/monitors/net/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -221,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11678,7 +17287,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -424,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11687,7 +17296,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11701,7 +17310,7 @@
@$(NORMAL_INSTALL)
--- ksim/monitors/snmp/Makefile.in
+++ ksim/monitors/snmp/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -229,6 +229,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11711,7 +17320,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -442,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11720,7 +17329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -480,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11732,7 +17341,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -828,22 +831,22 @@
+@@ -850,22 +853,22 @@
mocs: hostdialog.moc
#>+ 3
@@ -11762,7 +17371,7 @@
#>+ 2
KDE_DIST=snmp.h browsedialogbase.ui identifier.h hostconfig.h plugin.h monitorconfig.h walker.h snmp_p.h value.h labelmonitor.h probedialog.h pdu.h hostdialogbase.ui proberesultdialog.h monitor.h snmplib.h monitordialogbase.ui proberesultdialogbase.ui chartmonitor.h monitordialog.h configure.in.in hostdialog.h value_p.h view.h Makefile.in browsedialog.h configpage.h session.h Snmp.desktop configwidget.ui Makefile.am
-@@ -903,7 +906,7 @@
+@@ -925,7 +928,7 @@
#>+ 11
@@ -11773,7 +17382,7 @@
echo "#define KDE_USE_FINAL 1" >> ksim_snmp_la.all_cpp.final; \
--- ksim/pics/Makefile.in
+++ ksim/pics/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11783,7 +17392,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -364,7 +367,7 @@
+@@ -386,7 +389,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11792,7 +17401,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -402,9 +405,9 @@
+@@ -424,9 +427,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11804,7 +17413,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -695,23 +698,23 @@
+@@ -717,23 +720,23 @@
.NOEXPORT:
#>+ 2
@@ -11834,7 +17443,7 @@
#>+ 15
--- ksim/pics/misc/Makefile.in
+++ ksim/pics/misc/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11844,7 +17453,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -360,7 +363,7 @@
+@@ -382,7 +385,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11853,7 +17462,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -398,9 +401,9 @@
+@@ -420,9 +423,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11867,7 +17476,7 @@
mostlyclean-libtool:
--- ksim/themes/ksim/host/Makefile.in
+++ ksim/themes/ksim/host/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11877,7 +17486,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
+@@ -381,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11886,7 +17495,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11900,7 +17509,7 @@
mostlyclean-libtool:
--- ksim/themes/ksim/mail/Makefile.in
+++ ksim/themes/ksim/mail/Makefile.in
-@@ -173,6 +173,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11910,7 +17519,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,7 +361,7 @@
+@@ -380,7 +383,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11919,7 +17528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +399,9 @@
+@@ -418,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11933,7 +17542,7 @@
mostlyclean-libtool:
--- ksim/themes/ksim/Makefile.in
+++ ksim/themes/ksim/Makefile.in
-@@ -190,6 +190,9 @@
+@@ -202,6 +202,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11943,7 +17552,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -416,7 +419,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11952,7 +17561,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -454,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11966,7 +17575,7 @@
mostlyclean-libtool:
--- ksim/themes/Makefile.in
+++ ksim/themes/Makefile.in
-@@ -179,6 +179,9 @@
+@@ -191,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11976,7 +17585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -363,7 +366,7 @@
+@@ -385,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11985,7 +17594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -401,9 +404,9 @@
+@@ -423,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11999,7 +17608,7 @@
mostlyclean-libtool:
--- ktimer/Makefile.in
+++ ktimer/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12009,7 +17618,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12018,7 +17627,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
@@ -12030,30 +17639,36 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -754,17 +757,17 @@
+@@ -774,20 +777,20 @@
+
+ #>+ 16
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktimer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-ktimer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktimer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktimer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktimer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktimer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktimer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktimer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktimer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
#>+ 15
+ force-reedit:
--- kwallet/icons/Makefile.in
+++ kwallet/icons/Makefile.in
-@@ -163,6 +163,9 @@
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12063,7 +17678,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -349,7 +352,7 @@
+@@ -371,7 +374,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12072,7 +17687,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -387,9 +390,9 @@
+@@ -409,9 +412,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12084,7 +17699,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -540,16 +543,16 @@
+@@ -562,16 +565,16 @@
#>+ 13
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions
@@ -12107,7 +17722,7 @@
force-reedit:
--- kwallet/konfigurator/Makefile.in
+++ kwallet/konfigurator/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12117,7 +17732,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -428,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12126,7 +17741,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -466,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12140,7 +17755,7 @@
@$(NORMAL_INSTALL)
--- kwallet/Makefile.in
+++ kwallet/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12150,7 +17765,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -460,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12159,7 +17774,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -498,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12171,54 +17786,41 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -930,7 +933,7 @@
- -rm -f kwalletmanager.moc kwalletpopup.moc kwmapeditor.moc allyourbase.moc kwalleteditor.moc
+@@ -970,25 +973,25 @@
- #>+ 2
--KDE_DIST=cr16-app-kwalletmanager.png kwalletmanager.rc cr16-app-kwalletmanager2.png cr48-app-kwalletmanager.png kwalleteditor.rc cr128-app-kwalletmanager.png kwalletmanager.desktop kbetterthankdialogbase.ui.h walletwidget.ui cr48-app-kwalletmanager2.png cr32-app-kwalletmanager2.png cr128-app-kwalletmanager2.png kwalletmanager-kwalletd.desktop cr32-app-kwalletmanager.png Makefile.in cr22-app-kwalletmanager.png cr64-app-kwalletmanager2.png cr64-app-kwalletmanager.png Makefile.am kbetterthankdialogbase.ui
-+KDE_DIST=cr16-app-kwalletmanager.png kwalletmanager.rc cr16-app-kwalletmanager2.png cr48-app-kwalletmanager.png cr128-app-kwalletmanager.png kwalleteditor.rc kwalletmanager.desktop kbetterthankdialogbase.ui.h walletwidget.ui cr48-app-kwalletmanager2.png cr32-app-kwalletmanager2.png cr128-app-kwalletmanager2.png kwalletmanager-kwalletd.desktop cr32-app-kwalletmanager.png Makefile.in cr22-app-kwalletmanager.png cr64-app-kwalletmanager.png cr64-app-kwalletmanager2.png Makefile.am kbetterthankdialogbase.ui
-
- #>+ 4
- clean-idl:
-@@ -948,26 +951,26 @@
-
#>+ 22
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwalletmanager.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwalletmanager.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwalletmanager.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwalletmanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwalletmanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwalletmanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwalletmanager.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwalletmanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwalletmanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwalletmanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwalletmanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwalletmanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwalletmanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwalletmanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwalletmanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwalletmanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwalletmanager.png
#>+ 15
- force-reedit:
--- Makefile.in
+++ Makefile.in
-@@ -196,6 +196,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12228,16 +17830,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
.SUFFIXES:
am--refresh:
@:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -428,12 +431,12 @@
+@@ -451,12 +454,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -12252,7 +17854,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -445,7 +448,7 @@
+@@ -468,7 +471,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -12261,12 +17863,361 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -862,7 +865,7 @@
+@@ -978,7 +981,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
+--- superkaramba/doc/Makefile.in
++++ superkaramba/doc/Makefile.in
+@@ -194,6 +194,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@
+@@ -392,7 +395,7 @@
+ all: docs-am all-recursive
+
+ .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*) \
+@@ -430,9 +433,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:
+--- superkaramba/icons/Makefile.in
++++ superkaramba/icons/Makefile.in
+@@ -175,6 +175,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@
+@@ -369,7 +372,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*) \
+@@ -407,9 +410,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:
+@@ -559,49 +562,49 @@
+
+ #>+ 46
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr128-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/superkaramba_theme.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr64-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr48-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/superkaramba.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/superkaramba.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
+- $(INSTALL_DATA) $(srcdir)/crsc-mime-superkaramba_theme.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr22-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/superkaramba.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-superkaramba_theme.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/superkaramba.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/crsc-app-superkaramba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/superkaramba.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/superkaramba_theme.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/superkaramba_theme.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/superkaramba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/superkaramba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/superkaramba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/superkaramba.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/superkaramba.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/superkaramba_theme.png
+
+ #>+ 15
+--- superkaramba/Makefile.in
++++ superkaramba/Makefile.in
+@@ -193,6 +193,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@
+@@ -387,7 +390,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -425,9 +428,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:
+--- superkaramba/mimetypes/Makefile.in
++++ superkaramba/mimetypes/Makefile.in
+@@ -185,6 +185,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@
+@@ -380,7 +383,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*) \
+@@ -418,9 +421,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:
+--- superkaramba/src/Makefile.in
++++ superkaramba/src/Makefile.in
+@@ -281,6 +281,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@
+@@ -533,7 +536,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*) \
+@@ -571,9 +574,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-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -941,18 +944,18 @@
+ mocs: input.moc
+
+ #>+ 3
+-taskmanager.moc: $(srcdir)/taskmanager.h
+- $(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
++sensor.moc: $(srcdir)/sensor.h
++ $(MOC) $(srcdir)/sensor.h -o sensor.moc
+
+ #>+ 2
+-mocs: taskmanager.moc
++mocs: sensor.moc
+
+ #>+ 3
+-sensor.moc: $(srcdir)/sensor.h
+- $(MOC) $(srcdir)/sensor.h -o sensor.moc
++taskmanager.moc: $(srcdir)/taskmanager.h
++ $(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
+
+ #>+ 2
+-mocs: sensor.moc
++mocs: taskmanager.moc
+
+ #>+ 3
+ datesensor.moc: $(srcdir)/datesensor.h
+@@ -969,18 +972,18 @@
+ mocs: themesdlg.moc
+
+ #>+ 3
+-textlabel.moc: $(srcdir)/textlabel.h
+- $(MOC) $(srcdir)/textlabel.h -o textlabel.moc
++programsensor.moc: $(srcdir)/programsensor.h
++ $(MOC) $(srcdir)/programsensor.h -o programsensor.moc
+
+ #>+ 2
+-mocs: textlabel.moc
++mocs: programsensor.moc
+
+ #>+ 3
+-programsensor.moc: $(srcdir)/programsensor.h
+- $(MOC) $(srcdir)/programsensor.h -o programsensor.moc
++textlabel.moc: $(srcdir)/textlabel.h
++ $(MOC) $(srcdir)/textlabel.h -o textlabel.moc
+
+ #>+ 2
+-mocs: programsensor.moc
++mocs: textlabel.moc
+
+ #>+ 3
+ bar.moc: $(srcdir)/bar.h
+@@ -1004,18 +1007,18 @@
+ mocs: themewidget.moc
+
+ #>+ 3
+-imagelabel.moc: $(srcdir)/imagelabel.h
+- $(MOC) $(srcdir)/imagelabel.h -o imagelabel.moc
++karamba.moc: $(srcdir)/karamba.h
++ $(MOC) $(srcdir)/karamba.h -o karamba.moc
+
+ #>+ 2
+-mocs: imagelabel.moc
++mocs: karamba.moc
+
+ #>+ 3
+-karamba.moc: $(srcdir)/karamba.h
+- $(MOC) $(srcdir)/karamba.h -o karamba.moc
++imagelabel.moc: $(srcdir)/imagelabel.h
++ $(MOC) $(srcdir)/imagelabel.h -o imagelabel.moc
+
+ #>+ 2
+-mocs: karamba.moc
++mocs: imagelabel.moc
+
+ #>+ 3
+ richtextlabel.moc: $(srcdir)/richtextlabel.h
+@@ -1088,18 +1091,18 @@
+ mocs: meter.moc
+
+ #>+ 3
+-networksensor.moc: $(srcdir)/networksensor.h
+- $(MOC) $(srcdir)/networksensor.h -o networksensor.moc
++xmmssensor.moc: $(srcdir)/xmmssensor.h
++ $(MOC) $(srcdir)/xmmssensor.h -o xmmssensor.moc
+
+ #>+ 2
+-mocs: networksensor.moc
++mocs: xmmssensor.moc
+
+ #>+ 3
+-xmmssensor.moc: $(srcdir)/xmmssensor.h
+- $(MOC) $(srcdir)/xmmssensor.h -o xmmssensor.moc
++networksensor.moc: $(srcdir)/networksensor.h
++ $(MOC) $(srcdir)/networksensor.h -o networksensor.moc
+
+ #>+ 2
+-mocs: xmmssensor.moc
++mocs: networksensor.moc
+
+ #>+ 3
+ graph.moc: $(srcdir)/graph.h
+@@ -1124,10 +1127,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f cpusensor.moc input.moc taskmanager.moc sensor.moc datesensor.moc themesdlg.moc textlabel.moc programsensor.moc bar.moc rsssensor.moc themewidget.moc imagelabel.moc karamba.moc richtextlabel.moc sensorsensor.moc clickmap.moc clickarea.moc kwidgetlistbox.moc systemtray.moc disksensor.moc memsensor.moc showdesktop.moc meter.moc networksensor.moc xmmssensor.moc graph.moc karambaapp.moc textfilesensor.moc
++ -rm -f cpusensor.moc input.moc sensor.moc taskmanager.moc datesensor.moc themesdlg.moc programsensor.moc textlabel.moc bar.moc rsssensor.moc themewidget.moc karamba.moc imagelabel.moc richtextlabel.moc sensorsensor.moc clickmap.moc clickarea.moc kwidgetlistbox.moc systemtray.moc disksensor.moc memsensor.moc showdesktop.moc meter.moc xmmssensor.moc networksensor.moc graph.moc karambaapp.moc textfilesensor.moc
+
+ #>+ 2
+-KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h karambasessionmanaged.h richtextlabel.h showdesktop.h superkaramba.kcfg imagelabel.h uptimesensor.h systray_python.h taskbartest.h disksensor.h misc_python.h datesensor.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp widget_python.h bar.h taskbartest.cpp systemtray.h superkarambasettings.kcfgc rsssensor.h clickable.h graph.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h sensorparams.h themewidget_layout.ui clickarea.h karambarootpixmap.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h
++KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h richtextlabel.h karambasessionmanaged.h showdesktop.h superkaramba.kcfg imagelabel.h uptimesensor.h systray_python.h disksensor.h taskbartest.h datesensor.h misc_python.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp bar.h taskbartest.cpp widget_python.h superkarambasettings.kcfgc systemtray.h rsssensor.h graph.h clickable.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h themewidget_layout.ui sensorparams.h karambarootpixmap.h clickarea.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h
+
+ #>+ 5
+ clean-idl:
More information about the pkg-kde-commits
mailing list