[Pkg-kde-commits] rev 2221 -
trunk/packages/kdegraphics/debian/patches
Josh Metzler
jdmetz-guest at costa.debian.org
Sat Nov 12 14:12:55 UTC 2005
Author: jdmetz-guest
Date: 2005-11-12 14:12:34 +0000 (Sat, 12 Nov 2005)
New Revision: 2221
Modified:
trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
Updated kdegraphics buildprep for 3.5-rc1
Modified: trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2005-11-12 14:05:42 UTC (rev 2220)
+++ trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2005-11-12 14:12:34 UTC (rev 2221)
@@ -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,66 +2983,46 @@
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
+--- configure
++++ configure
+@@ -278,15 +278,15 @@
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
+ # 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
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
---- configure
-+++ configure
+ 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 gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH LIBTIFF PDFINFO PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC LIBFREETYPE_RPATH XFT_CFLAGS XFT_LIBS LIBPAPER_LIBS NOREGMOVE GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
-+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 gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH LIBTIFF PDFINFO PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC LIBFREETYPE_RPATH XFT_CFLAGS XFT_LIBS LIBPAPER_LIBS NOREGMOVE GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
+-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 gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE POPPLER_CFLAGS POPPLER_LIBS include_PDF_TRUE include_PDF_FALSE LIBTIFF include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC FREETYPE_VERSION LIBFREETYPE_RPATH XFT_CFLAGS XFT_LIBS LIBPAPER_LIBS NOREGMOVE GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS CXXRPOFLAGS RPO_YES RPO_NO TIFF_LIBS TIFF_CFLAGS PTHREAD_LIBS PTHREAD_CFLAGS THREAD_LIBS THREAD_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
++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 gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE POPPLER_CFLAGS POPPLER_LIBS include_PDF_TRUE include_PDF_FALSE LIBTIFF include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC FREETYPE_VERSION LIBFREETYPE_RPATH XFT_CFLAGS XFT_LIBS LIBPAPER_LIBS NOREGMOVE GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS CXXRPOFLAGS RPO_YES RPO_NO TIFF_LIBS TIFF_CFLAGS PTHREAD_LIBS PTHREAD_CFLAGS THREAD_LIBS THREAD_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
-@@ -1025,6 +1025,8 @@
+@@ -1041,6 +1041,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -1575,7 +3031,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
-@@ -1195,7 +1197,7 @@
+@@ -1226,7 +1228,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -1584,10 +3040,19 @@
done
fi
-@@ -2098,6 +2100,31 @@
+@@ -1998,7 +2000,7 @@
+ # Define the identity of the package.
+- PACKAGE=kdegraphics
++ PACKAGE=kdegraphics-rc1
+ VERSION="3.5"
+
+@@ -2129,6 +2131,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.
@@ -1616,7 +3081,7 @@
unset CDPATH
-@@ -3031,8 +3058,7 @@
+@@ -3062,8 +3089,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1626,7 +3091,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3090,8 +3116,7 @@
+@@ -3121,8 +3147,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1636,7 +3101,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3207,8 +3232,7 @@
+@@ -3238,8 +3263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1646,7 +3111,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3262,8 +3286,7 @@
+@@ -3293,8 +3317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1656,7 +3121,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3308,8 +3331,7 @@
+@@ -3339,8 +3362,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1666,7 +3131,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3353,8 +3375,7 @@
+@@ -3384,8 +3406,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1676,7 +3141,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3911,8 +3932,7 @@
+@@ -3942,8 +3963,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1686,7 +3151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3970,8 +3990,7 @@
+@@ -4001,8 +4021,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1696,7 +3161,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4042,8 +4061,7 @@
+@@ -4073,8 +4092,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1706,7 +3171,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4087,8 +4105,7 @@
+@@ -4118,8 +4136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1716,7 +3181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4266,8 +4283,7 @@
+@@ -4297,8 +4314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1726,7 +3191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4378,8 +4394,7 @@
+@@ -4409,8 +4425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1736,7 +3201,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4467,8 +4482,7 @@
+@@ -4498,8 +4513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1746,7 +3211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4570,8 +4584,7 @@
+@@ -4601,8 +4615,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1756,7 +3221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4670,8 +4683,7 @@
+@@ -4701,8 +4714,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1766,7 +3231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4755,8 +4767,7 @@
+@@ -4786,8 +4798,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1776,7 +3241,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4845,8 +4856,7 @@
+@@ -4876,8 +4887,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1786,7 +3251,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4933,8 +4943,7 @@
+@@ -4964,8 +4974,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1796,7 +3261,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5021,8 +5030,7 @@
+@@ -5052,8 +5061,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1806,7 +3271,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5128,8 +5136,7 @@
+@@ -5159,8 +5167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1816,7 +3281,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5216,8 +5223,7 @@
+@@ -5247,8 +5254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1826,7 +3291,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5304,8 +5310,7 @@
+@@ -5335,8 +5341,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1836,7 +3301,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5392,8 +5397,7 @@
+@@ -5423,8 +5428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1846,7 +3311,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5524,8 +5528,7 @@
+@@ -5555,8 +5559,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1856,7 +3321,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5613,8 +5616,7 @@
+@@ -5644,8 +5647,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1866,7 +3331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5701,8 +5703,7 @@
+@@ -5732,8 +5734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1876,7 +3341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5789,8 +5790,7 @@
+@@ -5820,8 +5821,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1886,7 +3351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5877,8 +5877,7 @@
+@@ -5908,8 +5908,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1896,7 +3361,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5965,8 +5964,7 @@
+@@ -5996,8 +5995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1906,7 +3371,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6389,8 +6387,7 @@
+@@ -6420,8 +6418,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1916,7 +3381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6516,8 +6513,7 @@
+@@ -6547,8 +6544,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1926,7 +3391,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6605,8 +6601,7 @@
+@@ -6636,8 +6632,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1936,7 +3401,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6689,185 +6684,6 @@
+@@ -6720,185 +6715,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -2122,19 +3587,58 @@
fi
-@@ -7056,10 +6872,10 @@
- fi
- done
- done
-+SED=$lt_cv_path_SED
+@@ -7062,7 +6878,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
+@@ -7167,7 +6983,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'*)
+@@ -7201,7 +7017,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
+@@ -7231,6 +7047,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
+@@ -7317,44 +7142,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
-
-@@ -7293,31 +7109,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*)
@@ -2169,12 +3673,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 )
-@@ -7356,42 +7164,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.*`
+ ;;
+@@ -7370,7 +7187,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
+@@ -7387,42 +7204,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2224,9 +3744,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
-@@ -7420,9 +7207,6 @@
+@@ -7441,19 +7237,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'
@@ -2234,7 +3766,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7432,7 +7216,6 @@
+@@ -7463,7 +7254,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2242,18 +3774,21 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7509,7 +7292,7 @@
+@@ -7540,7 +7330,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7512 "configure"' > conftest.$ac_ext
-+ echo '#line 7295 "configure"' > conftest.$ac_ext
+- echo '#line 7543 "configure"' > conftest.$ac_ext
++ echo '#line 7333 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7554,12 +7337,11 @@
+@@ -7583,14 +7373,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
@@ -2265,7 +3800,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7571,7 +7353,6 @@
+@@ -7602,7 +7391,6 @@
esac
;;
*64-bit*)
@@ -2273,7 +3808,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7631,8 +7412,7 @@
+@@ -7662,8 +7450,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2283,7 +3818,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7707,8 +7487,7 @@
+@@ -7738,8 +7525,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2293,7 +3828,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7878,8 +7657,7 @@
+@@ -7909,8 +7695,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2303,7 +3838,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7946,8 +7724,7 @@
+@@ -7977,8 +7762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2313,16 +3848,260 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8154,7 +7931,7 @@
+@@ -8093,6 +7877,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'
+@@ -8185,7 +8206,7 @@
+
+
# Provide some information about the compiler.
--echo "$as_me:8157:" \
-+echo "$as_me:7934:" \
+-echo "$as_me:8188:" \
++echo "$as_me:8209:" \
"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
-@@ -8200,8 +7977,7 @@
+@@ -8231,8 +8252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2332,7 +4111,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8250,8 +8026,7 @@
+@@ -8281,8 +8301,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2342,7 +4121,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8309,7 +8084,7 @@
+@@ -8340,7 +8359,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -2351,24 +4130,52 @@
case $build_os in
msdosdjgpp*)
-@@ -8338,20 +8113,26 @@
+@@ -8369,20 +8388,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 &&
@@ -2383,7 +4190,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.
-@@ -8419,7 +8200,7 @@
+@@ -8419,9 +8471,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'"
+
+@@ -8443,6 +8492,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]'
+ ;;
+@@ -8450,7 +8506,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -2392,7 +4223,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8437,7 +8218,7 @@
+@@ -8468,14 +8524,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2401,35 +4232,256 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9186,11 +8967,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
+@@ -8637,7 +8696,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.
+@@ -8657,7 +8716,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"
+@@ -8942,6 +9001,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*)
+@@ -8967,7 +9037,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
+@@ -9029,7 +9099,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
+@@ -9128,6 +9198,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.
+ #
+@@ -9164,11 +9248,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
+@@ -9214,18 +9303,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:9189: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8970: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9220: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9309: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9193: \$? = $ac_status" >&5
-+ echo "$as_me:8974: \$? = $ac_status" >&5
+- echo "$as_me:9224: \$? = $ac_status" >&5
++ echo "$as_me:9313: \$? = $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
-@@ -9419,11 +9200,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
+@@ -9302,7 +9393,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
+ ;;
+@@ -9328,6 +9419,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
+@@ -9339,7 +9440,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
+ ;;
+@@ -9363,12 +9464,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.
+@@ -9389,9 +9497,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*)
+@@ -9413,6 +9526,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'
+@@ -9447,18 +9565,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:9422: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9203: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9453: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9571: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9426: \$? = $ac_status" >&5
-+ echo "$as_me:9207: \$? = $ac_status" >&5
+- echo "$as_me:9457: \$? = $ac_status" >&5
++ echo "$as_me:9575: \$? = $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
-@@ -9470,13 +9251,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
+@@ -9479,7 +9599,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=
+@@ -9501,38 +9621,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2443,26 +4495,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.
-@@ -9486,11 +9260,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:9489: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9263: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9520: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9633: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9493: \$? = $ac_status" >&5
-+ echo "$as_me:9267: \$? = $ac_status" >&5
+- echo "$as_me:9524: \$? = $ac_status" >&5
++ echo "$as_me:9637: \$? = $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
-@@ -9500,8 +9274,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
@@ -2471,7 +4532,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9629,7 +9406,7 @@
+@@ -9603,6 +9721,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*)
+@@ -9623,6 +9751,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*)
+@@ -9660,7 +9809,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -2480,7 +4586,7 @@
else
ld_shlibs=no
fi
-@@ -9639,13 +9416,13 @@
+@@ -9670,13 +9819,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'
@@ -2488,7 +4594,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'
@@ -2496,12 +4603,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
-@@ -9654,19 +9431,19 @@
+@@ -9685,19 +9834,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
@@ -2520,7 +4659,7 @@
fi
;;
-@@ -9684,8 +9461,8 @@
+@@ -9715,8 +9896,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2531,36 +4670,8 @@
else
ld_shlibs=no
fi
-@@ -9698,10 +9475,36 @@
- hardcode_shlibpath_var=no
- ;;
+@@ -9731,24 +9912,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'
@@ -2570,7 +4681,28 @@
else
ld_shlibs=no
fi
-@@ -9751,9 +9554,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)
+@@ -9782,9 +9958,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
@@ -2593,7 +4725,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9799,21 +9613,22 @@
+@@ -9801,7 +9988,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`
+@@ -9822,6 +10009,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
+@@ -9830,21 +10020,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2621,7 +4772,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9837,8 +9652,7 @@
+@@ -9868,8 +10059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2631,7 +4782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9865,14 +9679,13 @@
+@@ -9896,14 +10086,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -2649,7 +4800,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9899,8 +9712,7 @@
+@@ -9930,8 +10119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2659,16 +4810,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9938,7 +9750,7 @@
+@@ -9968,8 +10156,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
;;
-@@ -9961,13 +9773,13 @@
+@@ -9982,7 +10170,7 @@
+ ld_shlibs=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+@@ -9992,13 +10180,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -2685,14 +4847,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.
-@@ -9981,21 +9793,21 @@
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+@@ -10008,52 +10196,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
@@ -2705,58 +4870,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
-@@ -10004,18 +9816,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
-@@ -10056,8 +9868,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
;;
+@@ -10087,8 +10275,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
-@@ -10065,7 +9877,7 @@
+@@ -10096,7 +10284,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2765,9 +4960,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
-@@ -10083,10 +9895,10 @@
+@@ -10112,16 +10300,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'
@@ -2778,7 +4976,21 @@
;;
esac
else
-@@ -10133,7 +9945,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -10131,7 +10319,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'
+@@ -10164,7 +10352,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -2787,7 +4999,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'
-@@ -10143,7 +9955,7 @@
+@@ -10174,7 +10362,7 @@
link_all_deplibs=yes
;;
@@ -2796,16 +5008,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10166,7 +9978,7 @@
+@@ -10197,7 +10385,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
-@@ -10176,7 +9988,7 @@
+@@ -10207,7 +10396,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -2814,7 +5027,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10187,14 +9999,14 @@
+@@ -10218,14 +10407,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -2831,7 +5044,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'
-@@ -10206,7 +10018,7 @@
+@@ -10237,13 +10426,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -2840,19 +5053,50 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10231,9 +10043,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'
+@@ -10262,10 +10451,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~
-@@ -10253,7 +10065,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -10274,8 +10465,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
+ ;;
+@@ -10284,7 +10485,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.
@@ -2861,7 +5105,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10313,9 +10125,9 @@
+@@ -10344,9 +10545,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -2873,7 +5117,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10421,7 +10233,7 @@
+@@ -10452,7 +10653,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -2882,7 +5126,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10431,7 +10243,20 @@
+@@ -10462,7 +10663,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2904,7 +5148,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10496,7 +10321,7 @@
+@@ -10527,7 +10741,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -2913,8 +5157,17 @@
;;
beos*)
-@@ -10521,7 +10346,7 @@
+@@ -10536,7 +10750,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}'
+@@ -10552,7 +10766,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -2922,34 +5175,85 @@
need_version=no
need_lib_prefix=no
-@@ -10586,7 +10411,7 @@
+@@ -10564,7 +10778,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'
+@@ -10594,7 +10809,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
+ ;;
+@@ -10617,7 +10832,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"`
-@@ -10609,7 +10434,7 @@
+@@ -10640,7 +10855,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10669,7 +10494,7 @@
+@@ -10652,8 +10867,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*)
+@@ -10671,7 +10895,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -10698,9 +10922,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
-@@ -10684,7 +10509,7 @@
+@@ -10715,7 +10939,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -2958,7 +5262,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10695,7 +10520,7 @@
+@@ -10726,7 +10950,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -2967,7 +5271,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10757,22 +10582,19 @@
+@@ -10788,22 +11012,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'
@@ -2989,14 +5293,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,
-@@ -10782,6 +10604,30 @@
+@@ -10813,6 +11034,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3027,7 +5331,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10791,7 +10637,7 @@
+@@ -10822,7 +11067,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3036,16 +5340,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10820,7 +10666,7 @@
+@@ -10851,7 +11096,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
-@@ -10840,7 +10686,7 @@
+@@ -10871,7 +11120,7 @@
os2*)
libname_spec='$name'
@@ -3054,7 +5362,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11069,8 +10915,7 @@
+@@ -10973,8 +11222,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 &&
+@@ -11100,8 +11349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3064,7 +5383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11173,8 +11018,7 @@
+@@ -11204,8 +11452,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3074,7 +5393,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11239,8 +11083,7 @@
+@@ -11270,8 +11517,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3084,7 +5403,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11333,8 +11176,7 @@
+@@ -11364,8 +11610,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3094,7 +5413,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11399,8 +11241,7 @@
+@@ -11430,8 +11675,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3104,7 +5423,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11466,8 +11307,7 @@
+@@ -11497,8 +11741,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3114,7 +5433,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11533,8 +11373,7 @@
+@@ -11564,8 +11807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3124,25 +5443,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11609,7 +11448,7 @@
+@@ -11640,7 +11882,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11612 "configure"
-+#line 11451 "configure"
+-#line 11643 "configure"
++#line 11885 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11707,7 +11546,7 @@
+@@ -11706,7 +11948,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 ;;
+@@ -11738,7 +11980,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11710 "configure"
-+#line 11549 "configure"
+-#line 11741 "configure"
++#line 11983 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11832,7 +11671,7 @@
+@@ -11804,7 +12046,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 ;;
+@@ -11854,7 +12096,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
+@@ -11863,47 +12105,10 @@
fi
;;
@@ -3151,18 +5497,18 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11842,29 +11681,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'
@@ -3171,31 +5517,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
-@@ -11898,7 +11737,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
+@@ -11929,7 +12134,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.
@@ -3205,7 +5547,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 \
-@@ -12076,7 +11916,7 @@
+@@ -12043,11 +12249,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=
+@@ -12077,6 +12283,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
+@@ -12107,7 +12319,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3214,7 +5583,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12107,7 +11947,7 @@
+@@ -12138,7 +12350,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3223,7 +5592,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12349,7 +12189,10 @@
+@@ -12153,7 +12365,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?
+@@ -12380,7 +12592,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.
@@ -3235,7 +5613,84 @@
fi
-@@ -12617,8 +12460,8 @@
+@@ -12445,7 +12660,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'
+@@ -12482,7 +12699,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
+@@ -12503,6 +12720,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
+@@ -12524,7 +12755,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
+@@ -12595,7 +12835,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'*)
+@@ -12629,7 +12869,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
+@@ -12648,8 +12888,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
@@ -3246,7 +5701,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12644,7 +12487,7 @@
+@@ -12675,7 +12915,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.
@@ -3255,7 +5710,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12675,8 +12518,22 @@
+@@ -12706,8 +12946,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3280,7 +5735,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12722,15 +12579,16 @@
+@@ -12724,7 +12978,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`
+@@ -12745,6 +12999,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
+@@ -12753,15 +13010,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3301,7 +5775,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.
-@@ -12760,8 +12618,7 @@
+@@ -12791,8 +13049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3311,7 +5785,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12790,13 +12647,12 @@
+@@ -12821,13 +13078,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3327,7 +5801,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12823,8 +12679,7 @@
+@@ -12854,8 +13110,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3337,16 +5811,23 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12862,7 +12717,7 @@
+@@ -12892,8 +13147,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
;;
-@@ -12879,12 +12734,12 @@
+@@ -12906,16 +13161,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'
@@ -3361,7 +5842,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
-@@ -12893,7 +12748,7 @@
+@@ -12924,70 +13180,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3370,87 +5851,170 @@
else
ld_shlibs_CXX=no
fi
-@@ -12904,20 +12759,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
-@@ -12927,19 +12782,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
-@@ -12974,7 +12829,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
+@@ -12998,14 +13265,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
-@@ -12996,7 +12851,7 @@
+@@ -13022,12 +13289,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.
-@@ -13005,11 +12860,11 @@
+@@ -13036,11 +13303,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
@@ -3459,7 +6023,38 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13066,7 +12921,7 @@
+@@ -13050,7 +13317,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'
+@@ -13066,7 +13333,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+@@ -13087,17 +13354,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'
;;
*)
@@ -3468,7 +6063,13 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13087,7 +12942,7 @@
+@@ -13113,12 +13380,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'
;;
*)
@@ -3477,28 +6078,38 @@
;;
esac
fi
-@@ -13102,7 +12957,7 @@
+@@ -13131,9 +13398,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
-@@ -13113,9 +12968,9 @@
+@@ -13144,9 +13411,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
-@@ -13132,8 +12987,8 @@
+@@ -13157,14 +13424,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.
@@ -3509,19 +6120,49 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13155,16 +13010,16 @@
+@@ -13182,20 +13449,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'
@@ -3530,8 +6171,17 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13202,7 +13057,7 @@
+@@ -13223,7 +13514,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
;;
+@@ -13233,7 +13524,7 @@
+ ;;
esac
;;
- netbsd*)
@@ -3539,7 +6189,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=
-@@ -13221,7 +13076,7 @@
+@@ -13244,15 +13535,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.
@@ -3548,25 +6223,41 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13238,7 +13093,7 @@
+@@ -13262,14 +13569,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=:
-@@ -13256,7 +13111,7 @@
+@@ -13287,7 +13594,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=:
-@@ -13281,7 +13136,7 @@
+@@ -13306,13 +13613,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.
@@ -3575,50 +6266,123 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13297,10 +13152,10 @@
+@@ -13321,17 +13628,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'
-@@ -13319,7 +13174,7 @@
+@@ -13350,7 +13657,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=:
-@@ -13376,9 +13231,9 @@
- CC)
+@@ -13374,7 +13681,7 @@
+ sco*)
+ archive_cmds_need_lc_CXX=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+@@ -13386,12 +13693,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
+@@ -13404,36 +13711,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
-@@ -13412,7 +13267,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
+@@ -13441,9 +13745,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'
-@@ -13422,9 +13277,9 @@
+@@ -13453,9 +13757,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
@@ -3630,7 +6394,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13433,9 +13288,9 @@
+@@ -13464,9 +13768,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -3642,7 +6406,25 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13550,7 +13405,7 @@
+@@ -13484,7 +13788,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13541,7 +13845,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
+@@ -13581,7 +13885,7 @@
fi
;;
@@ -3651,17 +6433,142 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13685,7 +13540,7 @@
+@@ -13617,6 +13921,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
+@@ -13672,7 +13990,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*)
+ ;;
+ *)
+@@ -13697,18 +14015,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'
+ ;;
+@@ -13716,22 +14044,22 @@
+ ;;
esac
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13761,7 +13616,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
+ ;;
+@@ -13746,7 +14074,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.
+@@ -13757,18 +14085,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.
+@@ -13785,25 +14119,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ lt_prog_compiler_pic_CXX='-W c,exportall'
+ ;;
+ *)
+ ;;
esac
;;
- netbsd*)
@@ -3669,21 +6576,105 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13872,11 +13727,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
+@@ -13819,7 +14153,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+ *)
+@@ -13828,13 +14162,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'
+ ;;
+@@ -13844,12 +14178,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'
+ ;;
+@@ -13859,7 +14193,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ lt_prog_compiler_pic_CXX='-KPIC'
+ ;;
+@@ -13900,18 +14234,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:13875: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13730: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13906: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14240: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13879: \$? = $ac_status" >&5
-+ echo "$as_me:13734: \$? = $ac_status" >&5
+- echo "$as_me:13910: \$? = $ac_status" >&5
++ echo "$as_me:14244: \$? = $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
-@@ -13923,13 +13778,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
+@@ -13932,7 +14268,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=
+@@ -13954,38 +14290,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3697,26 +6688,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.
-@@ -13939,11 +13787,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:13942: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13790: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13973: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14302: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13946: \$? = $ac_status" >&5
-+ echo "$as_me:13794: \$? = $ac_status" >&5
+- echo "$as_me:13977: \$? = $ac_status" >&5
++ echo "$as_me:14306: \$? = $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
-@@ -13953,8 +13801,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
@@ -3725,17 +6725,19 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14006,6 +13857,9 @@
+@@ -14035,7 +14369,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'
- ;;
-@@ -14087,7 +13941,7 @@
+@@ -14118,7 +14455,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3744,7 +6746,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14097,7 +13951,20 @@
+@@ -14128,7 +14465,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3766,7 +6768,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14162,7 +14029,7 @@
+@@ -14193,7 +14543,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3775,8 +6777,17 @@
;;
beos*)
-@@ -14187,7 +14054,7 @@
+@@ -14202,7 +14552,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}'
+@@ -14218,7 +14568,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -3784,34 +6795,85 @@
need_version=no
need_lib_prefix=no
-@@ -14252,7 +14119,7 @@
+@@ -14230,7 +14580,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'
+@@ -14260,7 +14611,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
+ ;;
+@@ -14283,7 +14634,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"`
-@@ -14275,7 +14142,7 @@
+@@ -14306,7 +14657,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14335,7 +14202,7 @@
+@@ -14318,8 +14669,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*)
+@@ -14337,7 +14697,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -14364,9 +14724,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
-@@ -14350,7 +14217,7 @@
+@@ -14381,7 +14741,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3820,7 +6882,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14361,7 +14228,7 @@
+@@ -14392,7 +14752,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3829,7 +6891,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14423,22 +14290,19 @@
+@@ -14454,22 +14814,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'
@@ -3851,14 +6913,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,
-@@ -14448,6 +14312,30 @@
+@@ -14479,6 +14836,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3889,7 +6951,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14457,7 +14345,7 @@
+@@ -14488,7 +14869,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3898,16 +6960,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14486,7 +14374,7 @@
+@@ -14517,7 +14898,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
-@@ -14506,7 +14394,7 @@
+@@ -14537,7 +14922,7 @@
os2*)
libname_spec='$name'
@@ -3916,7 +6982,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14735,8 +14623,7 @@
+@@ -14639,8 +15024,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 &&
+@@ -14766,8 +15151,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3926,7 +7003,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14839,8 +14726,7 @@
+@@ -14870,8 +15254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3936,7 +7013,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14905,8 +14791,7 @@
+@@ -14936,8 +15319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3946,7 +7023,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14999,8 +14884,7 @@
+@@ -15030,8 +15412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3956,7 +7033,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15065,8 +14949,7 @@
+@@ -15096,8 +15477,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3966,7 +7043,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15132,8 +15015,7 @@
+@@ -15163,8 +15543,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3976,7 +7053,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15199,8 +15081,7 @@
+@@ -15230,8 +15609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3986,25 +7063,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15275,7 +15156,7 @@
+@@ -15306,7 +15684,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15278 "configure"
-+#line 15159 "configure"
+-#line 15309 "configure"
++#line 15687 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15373,7 +15254,7 @@
+@@ -15372,7 +15750,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 ;;
+@@ -15404,7 +15782,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15376 "configure"
-+#line 15257 "configure"
+-#line 15407 "configure"
++#line 15785 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15490,7 +15371,8 @@
+@@ -15470,7 +15848,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 ;;
+@@ -15521,7 +15899,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.
@@ -4014,7 +7109,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 \
-@@ -15620,7 +15502,7 @@
+@@ -15621,6 +16000,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
+@@ -15651,7 +16036,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4023,7 +7131,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15651,7 +15533,7 @@
+@@ -15682,7 +16067,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4032,7 +7140,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15868,7 +15750,10 @@
+@@ -15697,7 +16082,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?
+@@ -15899,7 +16284,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.
@@ -4044,30 +7161,185 @@
fi
-@@ -15970,7 +15855,7 @@
+@@ -15975,12 +16363,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
+@@ -15993,7 +16404,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
+@@ -16001,8 +16412,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
-@@ -16196,11 +16081,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -16079,7 +16492,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
+ ;;
+@@ -16105,6 +16518,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
+@@ -16116,7 +16539,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
+ ;;
+@@ -16140,12 +16563,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.
+@@ -16166,9 +16596,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*)
+@@ -16190,6 +16625,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'
+@@ -16224,18 +16664,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:16199: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16084: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16230: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16670: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16203: \$? = $ac_status" >&5
-+ echo "$as_me:16088: \$? = $ac_status" >&5
+- echo "$as_me:16234: \$? = $ac_status" >&5
++ echo "$as_me:16674: \$? = $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
-@@ -16247,13 +16132,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
+@@ -16256,7 +16698,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=
+@@ -16278,38 +16720,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4081,26 +7353,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.
-@@ -16263,11 +16141,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:16266: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16144: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16297: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16732: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16270: \$? = $ac_status" >&5
-+ echo "$as_me:16148: \$? = $ac_status" >&5
+- echo "$as_me:16301: \$? = $ac_status" >&5
++ echo "$as_me:16736: \$? = $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
-@@ -16277,8 +16155,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
@@ -4109,7 +7390,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16406,7 +16287,7 @@
+@@ -16380,6 +16820,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*)
+@@ -16400,6 +16850,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*)
+@@ -16437,7 +16908,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4118,7 +7444,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16416,13 +16297,13 @@
+@@ -16447,13 +16918,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'
@@ -4126,7 +7452,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'
@@ -4134,14 +7461,47 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16431,19 +16312,19 @@
+@@ -16462,19 +16933,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
++ ;;
++
++ 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
;;
@@ -4158,7 +7518,7 @@
fi
;;
-@@ -16461,8 +16342,8 @@
+@@ -16492,8 +16995,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4169,36 +7529,8 @@
else
ld_shlibs_F77=no
fi
-@@ -16475,10 +16356,36 @@
- hardcode_shlibpath_var_F77=no
- ;;
+@@ -16508,24 +17011,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'
@@ -4208,7 +7540,28 @@
else
ld_shlibs_F77=no
fi
-@@ -16528,9 +16435,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)
+@@ -16559,9 +17057,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
@@ -4231,7 +7584,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16576,21 +16494,22 @@
+@@ -16578,7 +17087,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`
+@@ -16599,6 +17108,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
+@@ -16607,21 +17119,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4259,7 +7631,7 @@
program main
end
-@@ -16604,8 +16523,7 @@
+@@ -16635,8 +17148,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4269,7 +7641,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16632,14 +16550,13 @@
+@@ -16663,14 +17175,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4287,7 +7659,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16656,8 +16573,7 @@
+@@ -16687,8 +17198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4297,16 +7669,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16695,7 +16611,7 @@
+@@ -16725,8 +17235,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
;;
-@@ -16718,13 +16634,13 @@
+@@ -16739,7 +17249,7 @@
+ ld_shlibs_F77=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_F77=-rdynamic
+ ;;
+
+@@ -16749,68 +17259,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -4323,78 +7706,114 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -16738,21 +16654,21 @@
- archive_cmds_need_lc_F77=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_F77=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- archive_cmds_need_lc_F77=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_F77='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_F77='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -16761,18 +16677,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
-@@ -16813,8 +16729,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
;;
+@@ -16844,8 +17354,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
-@@ -16822,7 +16738,7 @@
+@@ -16853,7 +17363,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4403,9 +7822,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
-@@ -16840,10 +16756,10 @@
+@@ -16869,16 +17379,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'
@@ -4416,7 +7838,21 @@
;;
esac
else
-@@ -16890,7 +16806,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'
+ ;;
+@@ -16888,7 +17398,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'
+@@ -16921,7 +17431,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4425,7 +7861,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'
-@@ -16900,7 +16816,7 @@
+@@ -16931,7 +17441,7 @@
link_all_deplibs_F77=yes
;;
@@ -4434,16 +7870,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
-@@ -16923,7 +16839,7 @@
+@@ -16954,7 +17464,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
-@@ -16933,7 +16849,7 @@
+@@ -16964,7 +17475,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -4452,7 +7889,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16944,14 +16860,14 @@
+@@ -16975,14 +17486,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -4469,7 +7906,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'
-@@ -16963,7 +16879,7 @@
+@@ -16994,13 +17505,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -4478,19 +7915,50 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16988,9 +16904,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'
+@@ -17019,10 +17530,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~
-@@ -17010,7 +16926,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -17031,8 +17544,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
+ ;;
+@@ -17041,7 +17564,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.
@@ -4499,7 +7967,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17070,9 +16986,9 @@
+@@ -17101,9 +17624,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -4511,7 +7979,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17178,7 +17094,7 @@
+@@ -17209,7 +17732,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4520,7 +7988,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17188,7 +17104,20 @@
+@@ -17219,7 +17742,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4542,7 +8010,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17253,7 +17182,7 @@
+@@ -17284,7 +17820,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4551,8 +8019,17 @@
;;
beos*)
-@@ -17278,7 +17207,7 @@
+@@ -17293,7 +17829,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}'
+@@ -17309,7 +17845,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -4560,34 +8037,85 @@
need_version=no
need_lib_prefix=no
-@@ -17343,7 +17272,7 @@
+@@ -17321,7 +17857,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'
+@@ -17351,7 +17888,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
+ ;;
+@@ -17374,7 +17911,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"`
-@@ -17366,7 +17295,7 @@
+@@ -17397,7 +17934,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17426,7 +17355,7 @@
+@@ -17409,8 +17946,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*)
+@@ -17428,7 +17974,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -17455,9 +18001,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
-@@ -17441,7 +17370,7 @@
+@@ -17472,7 +18018,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4596,7 +8124,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17452,7 +17381,7 @@
+@@ -17483,7 +18029,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4605,7 +8133,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17514,22 +17443,19 @@
+@@ -17545,22 +18091,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'
@@ -4627,14 +8155,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,
-@@ -17539,6 +17465,30 @@
+@@ -17570,6 +18113,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4665,7 +8193,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17548,7 +17498,7 @@
+@@ -17579,7 +18146,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4674,16 +8202,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17577,7 +17527,7 @@
+@@ -17608,7 +18175,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
-@@ -17597,7 +17547,7 @@
+@@ -17628,7 +18199,7 @@
os2*)
libname_spec='$name'
@@ -4692,7 +8224,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17776,7 +17726,8 @@
+@@ -17730,8 +18301,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 &&
+@@ -17807,7 +18378,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.
@@ -4702,7 +8245,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 \
-@@ -17906,7 +17857,7 @@
+@@ -17907,6 +18479,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
+@@ -17937,7 +18515,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4711,7 +8267,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17937,7 +17888,7 @@
+@@ -17968,7 +18546,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4720,7 +8276,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18154,7 +18105,10 @@
+@@ -17983,7 +18561,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?
+@@ -18185,7 +18763,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.
@@ -4732,35 +8297,203 @@
fi
-@@ -18236,11 +18190,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+@@ -18218,7 +18799,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.
+
+@@ -18229,15 +18810,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
+@@ -18264,18 +18871,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:18239: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18193: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18270: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18877: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18243: \$? = $ac_status" >&5
-+ echo "$as_me:18197: \$? = $ac_status" >&5
+- echo "$as_me:18274: \$? = $ac_status" >&5
++ echo "$as_me:18881: \$? = $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
-@@ -18469,11 +18423,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
+@@ -18352,7 +18961,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
+ ;;
+@@ -18378,6 +18987,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
+@@ -18389,7 +19008,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
+ ;;
+@@ -18413,12 +19032,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.
+@@ -18439,9 +19065,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*)
+@@ -18463,6 +19094,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'
+@@ -18497,18 +19133,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:18472: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18426: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18503: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19139: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18476: \$? = $ac_status" >&5
-+ echo "$as_me:18430: \$? = $ac_status" >&5
+- echo "$as_me:18507: \$? = $ac_status" >&5
++ echo "$as_me:19143: \$? = $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
-@@ -18520,13 +18474,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
+@@ -18529,7 +19167,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=
+@@ -18551,38 +19189,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4774,26 +8507,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.
-@@ -18536,11 +18483,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:18539: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18486: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18570: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19201: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18543: \$? = $ac_status" >&5
-+ echo "$as_me:18490: \$? = $ac_status" >&5
+- echo "$as_me:18574: \$? = $ac_status" >&5
++ echo "$as_me:19205: \$? = $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
-@@ -18550,8 +18497,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
@@ -4802,7 +8544,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18679,7 +18629,7 @@
+@@ -18653,6 +19289,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*)
+@@ -18673,6 +19319,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*)
+@@ -18710,7 +19377,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4811,7 +8598,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18689,13 +18639,13 @@
+@@ -18720,13 +19387,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'
@@ -4819,7 +8606,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'
@@ -4827,18 +8615,51 @@
# 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
-@@ -18704,19 +18654,19 @@
+@@ -18735,19 +19402,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
;;
- 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_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
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4851,7 +8672,7 @@
fi
;;
-@@ -18734,8 +18684,8 @@
+@@ -18765,8 +19464,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4862,36 +8683,8 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18748,10 +18698,36 @@
- hardcode_shlibpath_var_GCJ=no
- ;;
+@@ -18781,24 +19480,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'
@@ -4901,7 +8694,28 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18801,9 +18777,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)
+@@ -18832,9 +19526,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
@@ -4924,7 +8738,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18849,21 +18836,22 @@
+@@ -18851,7 +19556,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`
+@@ -18872,6 +19577,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
+@@ -18880,21 +19588,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4952,7 +8785,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18887,8 +18875,7 @@
+@@ -18918,8 +19627,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4962,7 +8795,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18915,14 +18902,13 @@
+@@ -18946,14 +19654,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4980,7 +8813,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18949,8 +18935,7 @@
+@@ -18980,8 +19687,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4990,16 +8823,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18988,7 +18973,7 @@
+@@ -19018,8 +19724,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
;;
-@@ -19011,13 +18996,13 @@
+@@ -19032,7 +19738,7 @@
+ ld_shlibs_GCJ=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_GCJ=-rdynamic
+ ;;
+
+@@ -19042,68 +19748,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5016,78 +8860,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.
-@@ -19031,21 +19016,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
-@@ -19054,18 +19039,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
-@@ -19106,8 +19091,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
;;
+@@ -19137,8 +19843,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
-@@ -19115,7 +19100,7 @@
+@@ -19146,7 +19852,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5096,9 +8976,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
-@@ -19133,10 +19118,10 @@
+@@ -19162,16 +19868,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'
@@ -5109,7 +8992,21 @@
;;
esac
else
-@@ -19183,7 +19168,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'
+ ;;
+@@ -19181,7 +19887,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'
+@@ -19214,7 +19920,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5118,7 +9015,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'
-@@ -19193,7 +19178,7 @@
+@@ -19224,7 +19930,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5127,16 +9024,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
-@@ -19216,7 +19201,7 @@
+@@ -19247,7 +19953,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
-@@ -19226,7 +19211,7 @@
+@@ -19257,7 +19964,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5145,7 +9043,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19237,14 +19222,14 @@
+@@ -19268,14 +19975,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5162,7 +9060,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'
-@@ -19256,7 +19241,7 @@
+@@ -19287,13 +19994,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5171,19 +9069,50 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19281,9 +19266,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'
+@@ -19312,10 +20019,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~
-@@ -19303,7 +19288,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -19324,8 +20033,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
+ ;;
+@@ -19334,7 +20053,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.
@@ -5192,7 +9121,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19363,9 +19348,9 @@
+@@ -19394,9 +20113,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5204,7 +9133,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19471,7 +19456,7 @@
+@@ -19502,7 +20221,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5213,7 +9142,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19481,7 +19466,20 @@
+@@ -19512,7 +20231,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5235,7 +9164,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19546,7 +19544,7 @@
+@@ -19577,7 +20309,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5244,8 +9173,17 @@
;;
beos*)
-@@ -19571,7 +19569,7 @@
+@@ -19586,7 +20318,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}'
+@@ -19602,7 +20334,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -5253,34 +9191,85 @@
need_version=no
need_lib_prefix=no
-@@ -19636,7 +19634,7 @@
+@@ -19614,7 +20346,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'
+@@ -19644,7 +20377,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
+ ;;
+@@ -19667,7 +20400,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"`
-@@ -19659,7 +19657,7 @@
+@@ -19690,7 +20423,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19719,7 +19717,7 @@
+@@ -19702,8 +20435,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*)
+@@ -19721,7 +20463,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -19748,9 +20490,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
-@@ -19734,7 +19732,7 @@
+@@ -19765,7 +20507,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5289,7 +9278,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19745,7 +19743,7 @@
+@@ -19776,7 +20518,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5298,7 +9287,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19807,22 +19805,19 @@
+@@ -19838,22 +20580,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'
@@ -5320,14 +9309,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,
-@@ -19832,6 +19827,30 @@
+@@ -19863,6 +20602,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5358,7 +9347,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19841,7 +19860,7 @@
+@@ -19872,7 +20635,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5367,16 +9356,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19870,7 +19889,7 @@
+@@ -19901,7 +20664,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
-@@ -19890,7 +19909,7 @@
+@@ -19921,7 +20688,7 @@
os2*)
libname_spec='$name'
@@ -5385,7 +9378,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20119,8 +20138,7 @@
+@@ -20023,8 +20790,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 &&
+@@ -20150,8 +20917,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5395,7 +9399,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20223,8 +20241,7 @@
+@@ -20254,8 +21020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5405,7 +9409,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20289,8 +20306,7 @@
+@@ -20320,8 +21085,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5415,7 +9419,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20383,8 +20399,7 @@
+@@ -20414,8 +21178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5425,7 +9429,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20449,8 +20464,7 @@
+@@ -20480,8 +21243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5435,7 +9439,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20516,8 +20530,7 @@
+@@ -20547,8 +21309,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5445,7 +9449,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20583,8 +20596,7 @@
+@@ -20614,8 +21375,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5455,25 +9459,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20659,7 +20671,7 @@
+@@ -20690,7 +21450,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20662 "configure"
-+#line 20674 "configure"
+-#line 20693 "configure"
++#line 21453 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20757,7 +20769,7 @@
+@@ -20756,7 +21516,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 ;;
+@@ -20788,7 +21548,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20760 "configure"
-+#line 20772 "configure"
+-#line 20791 "configure"
++#line 21551 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20874,7 +20886,8 @@
+@@ -20854,7 +21614,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 ;;
+@@ -20905,7 +21665,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.
@@ -5483,7 +9505,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 \
-@@ -21004,7 +21017,7 @@
+@@ -21005,6 +21766,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
+@@ -21035,7 +21802,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5492,7 +9527,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21035,7 +21048,7 @@
+@@ -21066,7 +21833,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5501,7 +9536,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21252,7 +21265,10 @@
+@@ -21081,7 +21848,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?
+@@ -21283,7 +22050,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.
@@ -5513,7 +9557,43 @@
fi
-@@ -21315,7 +21331,8 @@
+@@ -21326,11 +22096,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
+@@ -21346,7 +22140,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.
@@ -5523,7 +9603,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 \
-@@ -21445,7 +21462,7 @@
+@@ -21446,6 +22241,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
+@@ -21476,7 +22277,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5532,7 +9625,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21476,7 +21493,7 @@
+@@ -21507,7 +22308,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5541,7 +9634,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21693,7 +21710,10 @@
+@@ -21522,7 +22323,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?
+@@ -21724,7 +22525,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.
@@ -5553,7 +9655,7 @@
fi
-@@ -21740,7 +21760,7 @@
+@@ -21771,7 +22575,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -5562,7 +9664,7 @@
# Prevent multiple expansion
-@@ -21977,8 +21997,7 @@
+@@ -22012,8 +22816,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5572,7 +9674,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22052,9 +22071,6 @@
+@@ -22087,9 +22890,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5582,7 +9684,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22088,8 +22104,7 @@
+@@ -22123,8 +22923,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5592,7 +9694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22193,8 +22208,7 @@
+@@ -22228,8 +23027,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5602,7 +9704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22273,9 +22287,6 @@
+@@ -22308,9 +23106,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5612,7 +9714,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22308,8 +22319,7 @@
+@@ -22343,8 +23138,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5622,7 +9724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22412,8 +22422,7 @@
+@@ -22447,8 +23241,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5632,7 +9734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22503,8 +22512,7 @@
+@@ -22538,8 +23331,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5642,7 +9744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22565,8 +22573,7 @@
+@@ -22600,8 +23392,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5652,7 +9754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22634,8 +22641,7 @@
+@@ -22669,8 +23460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5662,7 +9764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22701,8 +22707,7 @@
+@@ -22736,8 +23526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5672,7 +9774,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22795,8 +22800,7 @@
+@@ -22830,8 +23619,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5682,7 +9784,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22874,8 +22878,7 @@
+@@ -22909,8 +23697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5692,7 +9794,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22959,8 +22962,7 @@
+@@ -22994,8 +23781,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5702,7 +9804,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23028,8 +23030,7 @@
+@@ -23063,8 +23849,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5712,7 +9814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23124,8 +23125,7 @@
+@@ -23159,8 +23944,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5722,7 +9824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23189,8 +23189,7 @@
+@@ -23224,8 +24008,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5732,7 +9834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23285,8 +23284,7 @@
+@@ -23320,8 +24103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5742,7 +9844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23350,8 +23348,7 @@
+@@ -23385,8 +24167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5752,7 +9854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23447,8 +23444,7 @@
+@@ -23482,8 +24263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5762,7 +9864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23512,8 +23508,7 @@
+@@ -23547,8 +24327,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5772,7 +9874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23610,8 +23605,7 @@
+@@ -23645,8 +24424,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5782,7 +9884,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23676,8 +23670,7 @@
+@@ -23711,8 +24489,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5792,7 +9894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23745,8 +23738,7 @@
+@@ -23780,8 +24557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5802,7 +9904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23897,8 +23889,7 @@
+@@ -23932,8 +24708,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5812,7 +9914,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24053,8 +24044,7 @@
+@@ -24088,8 +24863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5822,7 +9924,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24119,8 +24109,7 @@
+@@ -24154,8 +24928,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5832,7 +9934,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24267,8 +24256,7 @@
+@@ -24302,8 +25075,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5842,7 +9944,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24423,8 +24411,7 @@
+@@ -24458,8 +25230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5852,7 +9954,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24480,9 +24467,6 @@
+@@ -24515,9 +25286,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5862,7 +9964,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24516,8 +24500,7 @@
+@@ -24551,8 +25319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5872,7 +9974,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24621,8 +24604,7 @@
+@@ -24656,8 +25423,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5882,7 +9984,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24722,8 +24704,7 @@
+@@ -24757,8 +25523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5892,7 +9994,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24797,8 +24778,7 @@
+@@ -24832,8 +25597,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5902,7 +10004,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24861,8 +24841,7 @@
+@@ -24896,8 +25660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5912,7 +10014,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24924,8 +24903,7 @@
+@@ -24959,8 +25722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5922,7 +10024,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24965,8 +24943,7 @@
+@@ -25000,8 +25762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5932,7 +10034,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25022,8 +24999,7 @@
+@@ -25057,8 +25818,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5942,7 +10044,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25063,8 +25039,7 @@
+@@ -25098,8 +25858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5952,7 +10054,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25128,8 +25103,7 @@
+@@ -25163,8 +25922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5962,7 +10064,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25160,10 +25134,8 @@
+@@ -25195,10 +25953,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -5975,7 +10077,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25274,8 +25246,7 @@
+@@ -25309,8 +26065,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5985,7 +10087,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25337,8 +25308,7 @@
+@@ -25372,8 +26127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5995,7 +10097,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25378,8 +25348,7 @@
+@@ -25413,8 +26167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6005,7 +10107,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25435,8 +25404,7 @@
+@@ -25470,8 +26223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6015,7 +10117,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25476,8 +25444,7 @@
+@@ -25511,8 +26263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6025,7 +10127,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25541,8 +25508,7 @@
+@@ -25576,8 +26327,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6035,7 +10137,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25573,10 +25539,8 @@
+@@ -25608,10 +26358,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6048,7 +10150,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25687,8 +25651,7 @@
+@@ -25722,8 +26470,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6058,7 +10160,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25750,8 +25713,7 @@
+@@ -25785,8 +26532,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6068,7 +10170,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25791,8 +25753,7 @@
+@@ -25826,8 +26572,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6078,7 +10180,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25848,8 +25809,7 @@
+@@ -25883,8 +26628,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6088,7 +10190,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25889,8 +25849,7 @@
+@@ -25924,8 +26668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6098,7 +10200,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25954,8 +25913,7 @@
+@@ -25989,8 +26732,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6108,7 +10210,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25986,10 +25944,8 @@
+@@ -26021,10 +26763,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6121,7 +10223,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26100,8 +26056,7 @@
+@@ -26135,8 +26875,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6131,7 +10233,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26163,8 +26118,7 @@
+@@ -26198,8 +26937,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6141,7 +10243,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26204,8 +26158,7 @@
+@@ -26239,8 +26977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6151,7 +10253,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26261,8 +26214,7 @@
+@@ -26296,8 +27033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6161,7 +10263,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26302,8 +26254,7 @@
+@@ -26337,8 +27073,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6171,7 +10273,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26367,8 +26318,7 @@
+@@ -26402,8 +27137,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6181,7 +10283,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26399,10 +26349,8 @@
+@@ -26434,10 +27168,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6194,7 +10296,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26521,8 +26469,7 @@
+@@ -26556,8 +27288,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6204,7 +10306,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26593,8 +26540,7 @@
+@@ -26628,8 +27359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6214,7 +10316,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26664,8 +26610,7 @@
+@@ -26699,8 +27429,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6224,7 +10326,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26727,8 +26672,7 @@
+@@ -26762,8 +27491,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6234,7 +10336,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26768,8 +26712,7 @@
+@@ -26803,8 +27531,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6244,7 +10346,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26825,8 +26768,7 @@
+@@ -26860,8 +27587,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6254,7 +10356,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26866,8 +26808,7 @@
+@@ -26901,8 +27627,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6264,7 +10366,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26931,8 +26872,7 @@
+@@ -26966,8 +27691,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6274,7 +10376,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26963,10 +26903,8 @@
+@@ -26998,10 +27722,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6287,7 +10389,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27078,8 +27016,7 @@
+@@ -27113,8 +27835,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6297,7 +10399,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27141,8 +27078,7 @@
+@@ -27176,8 +27897,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6307,7 +10409,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27182,8 +27118,7 @@
+@@ -27217,8 +27937,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6317,7 +10419,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27239,8 +27174,7 @@
+@@ -27274,8 +27993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6327,7 +10429,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27280,8 +27214,7 @@
+@@ -27315,8 +28033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6337,7 +10439,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27345,8 +27278,7 @@
+@@ -27380,8 +28097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6347,7 +10449,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27377,10 +27309,8 @@
+@@ -27412,10 +28128,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6360,7 +10462,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27491,8 +27421,7 @@
+@@ -27526,8 +28240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6370,17 +10472,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27562,8 +27491,7 @@
+@@ -27608,8 +28321,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=$?
+@@ -27709,8 +28421,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=$?
-@@ -27743,8 +27671,7 @@
+@@ -27890,8 +28601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6390,7 +10502,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27853,8 +27780,7 @@
+@@ -28000,8 +28710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6400,7 +10512,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28078,8 +28004,7 @@
+@@ -28225,8 +28934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6410,7 +10522,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28302,8 +28227,7 @@
+@@ -28449,8 +29157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6420,7 +10532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28379,8 +28303,7 @@
+@@ -28526,8 +29233,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6430,7 +10542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28606,8 +28529,7 @@
+@@ -28753,8 +29459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6440,7 +10552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28682,8 +28604,7 @@
+@@ -28829,8 +29534,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6450,7 +10562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28743,8 +28664,7 @@
+@@ -28890,8 +29594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6460,7 +10572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28827,8 +28747,7 @@
+@@ -28974,8 +29677,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6470,7 +10582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28921,8 +28840,7 @@
+@@ -29068,8 +29770,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6480,7 +10592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29096,8 +29014,7 @@
+@@ -29243,8 +29944,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6490,7 +10602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29195,8 +29112,7 @@
+@@ -29342,8 +30042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6500,7 +10612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29289,8 +29205,7 @@
+@@ -29430,8 +30129,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6510,7 +10622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29373,8 +29288,7 @@
+@@ -29508,8 +30206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6520,25 +10632,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29427,7 +29341,7 @@
+@@ -29562,7 +30259,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29430: $i/$j" >&5
-+ echo "configure: 29344: $i/$j" >&5
+- echo "configure: 29565: $i/$j" >&5
++ echo "configure: 30262: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29730,7 +29644,7 @@
+@@ -29860,7 +30557,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29733: $i/$j" >&5
-+ echo "configure: 29647: $i/$j" >&5
+- echo "configure: 29863: $i/$j" >&5
++ echo "configure: 30560: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30407,8 +30321,7 @@
+@@ -30537,8 +31234,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6548,43 +10660,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30567,7 +30480,7 @@
+@@ -30697,7 +31393,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30570: $i/$j" >&5
-+ echo "configure: 30483: $i/$j" >&5
+- echo "configure: 30700: $i/$j" >&5
++ echo "configure: 31396: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30597,7 +30510,7 @@
+@@ -30727,7 +31423,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30600: $i/$j" >&5
-+ echo "configure: 30513: $i/$j" >&5
+- echo "configure: 30730: $i/$j" >&5
++ echo "configure: 31426: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30615,7 +30528,7 @@
+@@ -30745,7 +31441,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30618: $i/$j" >&5
-+ echo "configure: 30531: $i/$j" >&5
+- echo "configure: 30748: $i/$j" >&5
++ echo "configure: 31444: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32133,7 +32046,7 @@
+@@ -32268,7 +32964,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32136: $i/$j" >&5
-+ echo "configure: 32049: $i/$j" >&5
+- echo "configure: 32271: $i/$j" >&5
++ echo "configure: 32967: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32326,8 +32239,7 @@
+@@ -32467,8 +33163,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6594,7 +10706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32399,8 +32311,7 @@
+@@ -32540,8 +33235,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6604,7 +10716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32454,8 +32365,7 @@
+@@ -32595,8 +33289,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6614,7 +10726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32526,8 +32436,7 @@
+@@ -32667,8 +33360,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6624,7 +10736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32581,8 +32490,7 @@
+@@ -32722,8 +33414,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6634,7 +10746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32649,8 +32557,7 @@
+@@ -32790,8 +33481,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6644,7 +10756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32820,8 +32727,7 @@
+@@ -32961,8 +33651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6654,7 +10766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32958,9 +32864,6 @@
+@@ -33099,9 +33788,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6664,7 +10776,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32991,8 +32894,7 @@
+@@ -33132,8 +33818,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6674,7 +10786,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33093,8 +32995,7 @@
+@@ -33234,8 +33919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6684,7 +10796,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33173,9 +33074,6 @@
+@@ -33314,9 +33998,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6694,7 +10806,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33206,8 +33104,7 @@
+@@ -33347,8 +34028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6704,7 +10816,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33308,8 +33205,7 @@
+@@ -33449,8 +34129,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6714,7 +10826,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33388,9 +33284,6 @@
+@@ -33529,9 +34208,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6724,7 +10836,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33423,8 +33316,7 @@
+@@ -33564,8 +34240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6734,7 +10846,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33527,8 +33419,7 @@
+@@ -33668,8 +34343,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6744,7 +10856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33607,9 +33498,6 @@
+@@ -33748,9 +34422,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6754,7 +10866,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33643,8 +33531,7 @@
+@@ -33784,8 +34455,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6764,7 +10876,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33748,8 +33635,7 @@
+@@ -33889,8 +34559,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6774,7 +10886,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33839,8 +33725,7 @@
+@@ -33980,8 +34649,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6784,7 +10896,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33991,8 +33876,7 @@
+@@ -34029,7 +34697,7 @@
+ do
+ for j in qsql.html;
+ do
+- echo "configure: 34032: $i/$j" >&5
++ echo "configure: 34700: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ QTDOCDIR=$i
+@@ -34302,8 +34970,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6794,7 +10915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34068,8 +33952,7 @@
+@@ -34379,8 +35046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6804,7 +10925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34157,8 +34040,7 @@
+@@ -34468,8 +35134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6814,7 +10935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34222,8 +34104,7 @@
+@@ -34533,8 +35198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6824,7 +10945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34287,8 +34168,7 @@
+@@ -34598,8 +35262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6834,7 +10955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34462,8 +34342,7 @@
+@@ -34773,8 +35436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6844,7 +10965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34738,8 +34617,7 @@
+@@ -35115,8 +35777,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6854,7 +10975,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34835,8 +34713,7 @@
+@@ -35374,8 +36035,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6864,7 +10985,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35079,8 +34956,7 @@
+@@ -35471,8 +36131,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6874,37 +10995,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35205,8 +35081,7 @@
+@@ -35598,8 +36257,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=$?
-@@ -35302,8 +35177,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=$?
-@@ -35430,8 +35304,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35500,8 +35373,7 @@
+@@ -35668,8 +36326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6914,7 +11015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35583,8 +35455,7 @@
+@@ -35751,8 +36408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6924,7 +11025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35965,8 +35836,7 @@
+@@ -36138,8 +36794,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6934,7 +11035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36173,8 +36043,7 @@
+@@ -36346,8 +37001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6944,16 +11045,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36213,7 +36082,7 @@
+@@ -36386,7 +37040,7 @@
do
for j in xpdfrc;
do
-- echo "configure: 36216: $i/$j" >&5
-+ echo "configure: 36085: $i/$j" >&5
+- echo "configure: 36389: $i/$j" >&5
++ echo "configure: 37043: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
xpdfrc=$i
-@@ -36280,8 +36149,7 @@
+@@ -36453,8 +37107,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6963,7 +11064,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36310,8 +36178,7 @@
+@@ -36483,8 +37136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6973,7 +11074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36381,8 +36248,7 @@
+@@ -36554,8 +37206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6983,7 +11084,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36434,8 +36300,7 @@
+@@ -36607,8 +37258,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6993,7 +11094,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36506,8 +36371,7 @@
+@@ -36679,8 +37329,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7003,7 +11104,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36559,8 +36423,7 @@
+@@ -36732,8 +37381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7013,7 +11114,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36625,8 +36488,7 @@
+@@ -36798,8 +37446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7023,7 +11124,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36670,8 +36532,7 @@
+@@ -36843,8 +37490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7033,7 +11134,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36736,8 +36597,7 @@
+@@ -36909,8 +37555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7043,7 +11144,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36838,8 +36698,7 @@
+@@ -37011,8 +37656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7053,7 +11154,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36942,8 +36801,7 @@
+@@ -37115,8 +37759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7063,7 +11164,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37110,8 +36968,7 @@
+@@ -37283,8 +37926,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7073,7 +11174,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37216,8 +37073,7 @@
+@@ -37389,8 +38031,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7083,7 +11184,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37422,8 +37278,7 @@
+@@ -37595,8 +38236,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7093,7 +11194,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37644,8 +37499,7 @@
+@@ -37816,8 +38456,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7103,7 +11204,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38091,8 +37945,7 @@
+@@ -38263,8 +38902,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7113,7 +11214,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38265,8 +38118,7 @@
+@@ -38437,8 +39075,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7123,7 +11224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38574,8 +38426,7 @@
+@@ -38746,8 +39383,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7133,7 +11234,384 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39529,6 +39380,13 @@
+@@ -39061,8 +39697,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=$?
+@@ -39140,8 +39775,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=$?
+@@ -39219,8 +39853,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=$?
+@@ -39300,8 +39933,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=$?
+@@ -39379,8 +40011,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=$?
+@@ -39462,8 +40093,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=$?
+@@ -39566,8 +40196,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=$?
+@@ -39640,8 +40269,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=$?
+@@ -39713,8 +40341,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=$?
+@@ -39886,8 +40513,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=$?
+@@ -39959,8 +40585,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=$?
+@@ -40014,8 +40639,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=$?
+@@ -40086,8 +40710,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=$?
+@@ -40141,8 +40764,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=$?
+@@ -40209,8 +40831,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=$?
+@@ -40280,8 +40901,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=$?
+@@ -40349,8 +40969,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=$?
+@@ -40501,8 +41120,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=$?
+@@ -40654,8 +41272,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=$?
+@@ -40719,8 +41336,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=$?
+@@ -40785,8 +41401,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=$?
+@@ -40858,8 +41473,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=$?
+@@ -41043,8 +41657,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=$?
+@@ -41283,8 +41896,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=$?
+@@ -41352,8 +41964,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=$?
+@@ -41538,8 +42149,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=$?
+@@ -41581,18 +42191,24 @@
+ ac_cv_func_fork_works=cross
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-/* By Ruediger Kuhlmann. */
+- #include <sys/types.h>
+- #if HAVE_UNISTD_H
+- # include <unistd.h>
+- #endif
+- /* Some systems only have a dummy stub for fork() */
+- int main ()
+- {
+- if (fork() < 0)
+- exit (1);
+- exit (0);
+- }
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++int
++main ()
++{
++
++ /* By Ruediger Kuhlmann. */
++ if (fork() < 0)
++ exit (1);
++ exit (0);
++
++ ;
++ return 0;
++}
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -41872,8 +42488,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=$?
+@@ -41976,8 +42591,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=$?
+@@ -42081,8 +42695,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=$?
+@@ -42182,8 +42795,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=$?
+@@ -42278,8 +42890,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=$?
+@@ -42439,8 +43050,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=$?
+@@ -42563,8 +43173,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=$?
+@@ -42692,8 +43301,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=$?
+@@ -43562,6 +44170,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7147,7 +11625,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
-@@ -40449,6 +40307,9 @@
+@@ -44497,6 +45112,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -7157,7 +11635,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
-@@ -40879,11 +40740,6 @@
+@@ -44950,11 +45568,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7169,7 +11647,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. */
-@@ -40922,6 +40778,12 @@
+@@ -44993,6 +45606,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7184,18 +11662,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(kdegraphics, "3.4.3") dnl searches for some needed programs
+-AM_INIT_AUTOMAKE(kdegraphics, "3.5") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdegraphics-rc1, "3.5") dnl searches for some needed programs
++
++AM_MAINTAINER_MODE
-+AM_MAINTAINER_MODE
-+
KDE_SET_PREFIX
- dnl generate the config header
--- doc/kamera/Makefile.in
+++ doc/kamera/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7205,7 +11685,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7214,7 +11694,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7228,7 +11708,7 @@
mostlyclean-libtool:
--- doc/kcoloredit/Makefile.in
+++ doc/kcoloredit/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7238,7 +11718,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7247,7 +11727,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7261,7 +11741,7 @@
mostlyclean-libtool:
--- doc/kdvi/Makefile.in
+++ doc/kdvi/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7271,7 +11751,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7280,7 +11760,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7292,7 +11772,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,10 +574,10 @@
+@@ -594,10 +597,10 @@
.NOEXPORT:
#>+ 2
@@ -7305,7 +11785,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
-@@ -601,20 +604,20 @@
+@@ -624,20 +627,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi
@@ -7331,7 +11811,7 @@
--- doc/kgamma/Makefile.in
+++ doc/kgamma/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7341,7 +11821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7350,7 +11830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7364,7 +11844,7 @@
mostlyclean-libtool:
--- doc/kghostview/Makefile.in
+++ doc/kghostview/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7374,7 +11854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7383,7 +11863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7397,7 +11877,7 @@
mostlyclean-libtool:
--- doc/kiconedit/Makefile.in
+++ doc/kiconedit/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7407,7 +11887,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7416,7 +11896,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7430,7 +11910,7 @@
mostlyclean-libtool:
--- doc/kolourpaint/Makefile.in
+++ doc/kolourpaint/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7440,7 +11920,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7449,7 +11929,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7461,7 +11941,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,10 +574,10 @@
+@@ -594,10 +597,10 @@
.NOEXPORT:
#>+ 2
@@ -7474,7 +11954,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
-@@ -601,20 +604,20 @@
+@@ -624,20 +627,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint
@@ -7500,7 +11980,7 @@
--- doc/kooka/Makefile.in
+++ doc/kooka/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7510,7 +11990,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7519,7 +11999,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7531,7 +12011,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,10 +574,10 @@
+@@ -594,10 +597,10 @@
.NOEXPORT:
#>+ 2
@@ -7544,7 +12024,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
-@@ -601,20 +604,20 @@
+@@ -624,20 +627,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka
@@ -7570,7 +12050,7 @@
--- doc/kpdf/Makefile.in
+++ doc/kpdf/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7580,7 +12060,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7589,7 +12069,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7603,7 +12083,7 @@
mostlyclean-libtool:
--- doc/kpovmodeler/Makefile.in
+++ doc/kpovmodeler/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7613,7 +12093,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7622,7 +12102,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7634,7 +12114,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,10 +574,10 @@
+@@ -594,10 +597,10 @@
.NOEXPORT:
#>+ 2
@@ -7647,7 +12127,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
-@@ -601,20 +604,20 @@
+@@ -624,20 +627,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler
@@ -7673,7 +12153,7 @@
--- doc/kruler/Makefile.in
+++ doc/kruler/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7683,7 +12163,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7692,7 +12172,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7706,7 +12186,7 @@
mostlyclean-libtool:
--- doc/ksnapshot/Makefile.in
+++ doc/ksnapshot/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7716,7 +12196,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7725,7 +12205,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7737,7 +12217,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -574,7 +577,7 @@
+@@ -597,7 +600,7 @@
KDE_DIST=preview.png index.docbook window.png Makefile.in Makefile.am index.cache.bz2
#>+ 24
@@ -7746,7 +12226,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
-@@ -601,20 +604,20 @@
+@@ -624,20 +627,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot
@@ -7772,7 +12252,7 @@
--- doc/kuickshow/Makefile.in
+++ doc/kuickshow/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7782,7 +12262,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7791,7 +12271,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7805,7 +12285,7 @@
mostlyclean-libtool:
--- doc/kview/Makefile.in
+++ doc/kview/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7815,7 +12295,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -7824,7 +12304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7836,42 +12316,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -574,7 +577,7 @@
- KDE_DIST=snapshot1.png snapshot5.png snapshot7.png snapshot3.png snapshot2.png index.docbook snapshot9.png snapshot8.png Makefile.in snapshot4.png snapshot6.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) snapshot1.png snapshot2.png snapshot3.png index.docbook snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.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
-@@ -601,20 +604,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview
-- @for base in snapshot1.png snapshot2.png snapshot3.png index.docbook snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png ; do \
-+ @for base in snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
- done
-
- uninstall-nls:
-- for base in snapshot1.png snapshot2.png snapshot3.png index.docbook snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png ; do \
-+ for base in snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in snapshot1.png snapshot2.png snapshot3.png index.docbook snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png ; do \
-+ for file in snapshot1.png snapshot2.png snapshot3.png snapshot4.png snapshot5.png snapshot6.png snapshot7.png snapshot8.png snapshot9.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7881,7 +12328,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,13 +402,13 @@
+@@ -422,13 +425,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -7897,7 +12344,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -466,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7911,7 +12358,7 @@
mostlyclean-libtool:
--- kamera/kcontrol/Makefile.in
+++ kamera/kcontrol/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -260,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7921,7 +12368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -468,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7930,7 +12377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7944,7 +12391,7 @@
@$(NORMAL_INSTALL)
--- kamera/kioslave/Makefile.in
+++ kamera/kioslave/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7954,7 +12401,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -466,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -7963,7 +12410,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7977,7 +12424,7 @@
@$(NORMAL_INSTALL)
--- kamera/Makefile.in
+++ kamera/Makefile.in
-@@ -214,6 +214,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7987,7 +12434,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -425,7 +428,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -7996,7 +12443,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8010,7 +12457,7 @@
mostlyclean-libtool:
--- kamera/pics/Makefile.in
+++ kamera/pics/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8020,7 +12467,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -385,7 +388,7 @@
+@@ -408,7 +411,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8029,7 +12476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -423,9 +426,9 @@
+@@ -446,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8041,7 +12488,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -575,29 +578,29 @@
+@@ -598,29 +601,29 @@
#>+ 25
install-kde-icons:
@@ -8088,7 +12535,7 @@
force-reedit:
--- kcoloredit/Makefile.in
+++ kcoloredit/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -280,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8098,7 +12545,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -504,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8107,7 +12554,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -542,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8119,7 +12566,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -834,18 +837,18 @@
+@@ -857,18 +860,18 @@
.NOEXPORT:
#>+ 3
@@ -8144,7 +12591,7 @@
#>+ 3
kcoloreditdoc.moc: $(srcdir)/kcoloreditdoc.h
-@@ -919,34 +922,34 @@
+@@ -942,7 +945,7 @@
#>+ 3
clean-metasources:
@@ -8152,47 +12599,10 @@
+ -rm -f texteditselection.moc paletteview.moc kcoloreditdoc.moc loadpalettedlg.moc paletteviewscrolledarea.moc colorselector.moc kxycolorselector.moc kcoloredit.moc gradientselection.moc kcoloreditview.moc kzcolorselector.moc imageselection.moc
#>+ 2
--KDE_DIST=kcolorchooser.desktop lo32-app-kcoloredit.png kcoloreditui.rc paletteviewscrolledarea.h Makefile.in textselection.cpp cr16-app-kcolorchooser.png kcoloredit.desktop cr16-app-kcoloredit.png lo16-app-kcoloredit.png uninstall.desktop Makefile.am cr22-app-kcolorchooser.png cr32-app-kcoloredit.png
-+KDE_DIST=kcolorchooser.desktop lo32-app-kcoloredit.png kcoloreditui.rc paletteviewscrolledarea.h Makefile.in textselection.cpp cr16-app-kcolorchooser.png kcoloredit.desktop cr16-app-kcoloredit.png lo16-app-kcoloredit.png uninstall.desktop cr22-app-kcolorchooser.png Makefile.am cr32-app-kcoloredit.png
+ KDE_DIST=kcolorchooser.desktop hi32-app-kcoloredit.png kcoloreditui.rc paletteviewscrolledarea.h Makefile.in textselection.cpp kcoloredit.desktop uninstall.desktop hi16-app-kcolorchooser.png Makefile.am hi22-app-kcolorchooser.png hi16-app-kcoloredit.png
+@@ -1005,7 +1008,7 @@
- #>+ 2
- docs-am:
- #>+ 21
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/lo32-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcoloredit.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/lo16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcoloredit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcolorchooser.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcoloredit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/lo16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcoloredit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/lo32-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcoloredit.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcoloredit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcoloredit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcolorchooser.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcoloredit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kcoloredit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcolorchooser.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kcoloredit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
-
- #>+ 15
-@@ -988,7 +991,7 @@
-
-
#>+ 11
-kcoloredit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kzcolorselector.cpp $(srcdir)/imageselection.cpp $(srcdir)/texteditselection.cpp $(srcdir)/gradientselection.cpp $(srcdir)/colorselector.cpp $(srcdir)/kxycolorselector.cpp $(srcdir)/paletteview.cpp $(srcdir)/paletteviewscrolledarea.cpp $(srcdir)/editablestreamhistory.cpp $(srcdir)/color.cpp $(srcdir)/palette.cpp $(srcdir)/loadpalettedlg.cpp $(srcdir)/kcoloreditview.cpp $(srcdir)/kcoloreditdoc.cpp $(srcdir)/kcoloredit.cpp $(srcdir)/main.cpp texteditselection.moc paletteview.moc kcoloreditdoc.moc loadpalettedlg.moc paletteviewscrolledarea.moc colorselector.moc kxycolorselector.moc kcoloredit.moc gradientselection.moc kcoloreditview.moc kzcolorselector.moc imageselection.moc
+kcoloredit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kzcolorselector.cpp $(srcdir)/imageselection.cpp $(srcdir)/texteditselection.cpp $(srcdir)/gradientselection.cpp $(srcdir)/colorselector.cpp $(srcdir)/kxycolorselector.cpp $(srcdir)/paletteview.cpp $(srcdir)/paletteviewscrolledarea.cpp $(srcdir)/editablestreamhistory.cpp $(srcdir)/color.cpp $(srcdir)/palette.cpp $(srcdir)/loadpalettedlg.cpp $(srcdir)/kcoloreditview.cpp $(srcdir)/kcoloreditdoc.cpp $(srcdir)/kcoloredit.cpp $(srcdir)/main.cpp paletteview.moc texteditselection.moc kcoloreditdoc.moc loadpalettedlg.moc paletteviewscrolledarea.moc colorselector.moc kxycolorselector.moc kcoloredit.moc gradientselection.moc kcoloreditview.moc kzcolorselector.moc imageselection.moc
@@ -8201,7 +12611,7 @@
echo "#define KDE_USE_FINAL 1" >> kcoloredit.all_cpp.final; \
--- kdvi/Makefile.in
+++ kdvi/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -319,6 +319,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8211,7 +12621,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -8220,7 +12630,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8232,9 +12642,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1161,13 +1164,6 @@
+@@ -1197,13 +1200,6 @@
+ mocs: dviPageCache.moc
-
#>+ 3
-dviWidget.moc: $(srcdir)/dviWidget.h
- $(MOC) $(srcdir)/dviWidget.h -o dviWidget.moc
@@ -8246,7 +12656,7 @@
psgs.moc: $(srcdir)/psgs.h
$(MOC) $(srcdir)/psgs.h -o psgs.moc
-@@ -1175,11 +1171,11 @@
+@@ -1211,11 +1207,11 @@
mocs: psgs.moc
#>+ 3
@@ -8261,61 +12671,80 @@
#>+ 3
fontprogress.moc: $(srcdir)/fontprogress.h
-@@ -1189,6 +1185,13 @@
+@@ -1225,18 +1221,18 @@
mocs: fontprogress.moc
#>+ 3
+-fontpool.moc: $(srcdir)/fontpool.h
+- $(MOC) $(srcdir)/fontpool.h -o fontpool.moc
+infodialog.moc: $(srcdir)/infodialog.h
+ $(MOC) $(srcdir)/infodialog.h -o infodialog.moc
-+
-+#>+ 2
+
+ #>+ 2
+-mocs: fontpool.moc
+mocs: infodialog.moc
-+
-+#>+ 3
- dviwin.moc: $(srcdir)/dviwin.h
- $(MOC) $(srcdir)/dviwin.h -o dviwin.moc
-@@ -1203,18 +1206,18 @@
- mocs: fontpool.moc
-
#>+ 3
-kdvi_multipage.moc: $(srcdir)/kdvi_multipage.h
- $(MOC) $(srcdir)/kdvi_multipage.h -o kdvi_multipage.moc
-+optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
-+ $(MOC) $(srcdir)/optionDialogSpecialWidget.h -o optionDialogSpecialWidget.moc
++fontpool.moc: $(srcdir)/fontpool.h
++ $(MOC) $(srcdir)/fontpool.h -o fontpool.moc
#>+ 2
-mocs: kdvi_multipage.moc
-+mocs: optionDialogSpecialWidget.moc
++mocs: fontpool.moc
#>+ 3
--optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
-- $(MOC) $(srcdir)/optionDialogSpecialWidget.h -o optionDialogSpecialWidget.moc
+ optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
+@@ -1246,18 +1242,18 @@
+ mocs: optionDialogSpecialWidget.moc
+
+ #>+ 3
+-renderedDviPagePixmap.moc: $(srcdir)/renderedDviPagePixmap.h
+- $(MOC) $(srcdir)/renderedDviPagePixmap.h -o renderedDviPagePixmap.moc
+kdvi_multipage.moc: $(srcdir)/kdvi_multipage.h
+ $(MOC) $(srcdir)/kdvi_multipage.h -o kdvi_multipage.moc
#>+ 2
--mocs: optionDialogSpecialWidget.moc
+-mocs: renderedDviPagePixmap.moc
+mocs: kdvi_multipage.moc
#>+ 3
- optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
-@@ -1225,10 +1228,10 @@
+-optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
+- $(MOC) $(srcdir)/optionDialogFontsWidget.h -o optionDialogFontsWidget.moc
++renderedDviPagePixmap.moc: $(srcdir)/renderedDviPagePixmap.h
++ $(MOC) $(srcdir)/renderedDviPagePixmap.h -o renderedDviPagePixmap.moc
+ #>+ 2
+-mocs: optionDialogFontsWidget.moc
++mocs: renderedDviPagePixmap.moc
+
#>+ 3
+ dviRenderer.moc: $(srcdir)/dviRenderer.h
+@@ -1267,11 +1263,18 @@
+ mocs: dviRenderer.moc
+
+ #>+ 3
++optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
++ $(MOC) $(srcdir)/optionDialogFontsWidget.h -o optionDialogFontsWidget.moc
++
++#>+ 2
++mocs: optionDialogFontsWidget.moc
++
++#>+ 3
clean-metasources:
-- -rm -f dviWidget.moc psgs.moc infodialog.moc fontprogress.moc dviwin.moc fontpool.moc kdvi_multipage.moc optionDialogSpecialWidget.moc optionDialogFontsWidget.moc
-+ -rm -f psgs.moc dviWidget.moc fontprogress.moc infodialog.moc dviwin.moc fontpool.moc optionDialogSpecialWidget.moc kdvi_multipage.moc optionDialogFontsWidget.moc
+- -rm -f dviPageCache.moc dviWidget.moc psgs.moc infodialog.moc fontprogress.moc fontpool.moc kdvi_multipage.moc optionDialogSpecialWidget.moc renderedDviPagePixmap.moc optionDialogFontsWidget.moc dviRenderer.moc
++ -rm -f dviPageCache.moc psgs.moc dviWidget.moc fontprogress.moc infodialog.moc fontpool.moc optionDialogSpecialWidget.moc kdvi_multipage.moc renderedDviPagePixmap.moc dviRenderer.moc optionDialogFontsWidget.moc
#>+ 2
--KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h prefs.kcfgc TeXFont_TFM.h TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviWidget.h bigEndianByteReader.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui kdvimultipage.desktop kdvi.lsm fontEncoding.h glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h fontprogress.h configure.in.in Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
-+KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h TeXFont_TFM.h prefs.kcfgc TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviWidget.h bigEndianByteReader.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui kdvimultipage.desktop fontEncoding.h kdvi.lsm glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
+-KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h prefs.kcfgc TeXFont_TFM.h TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviPageCache.h dviWidget.h bigEndianByteReader.h prebookmark.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui renderedDviPagePixmap.h kdvimultipage.desktop kdvi.lsm fontEncoding.h glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
++KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h TeXFont_TFM.h prefs.kcfgc TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviPageCache.h dviWidget.h bigEndianByteReader.h prebookmark.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui renderedDviPagePixmap.h kdvimultipage.desktop fontEncoding.h kdvi.lsm glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
#>+ 5
clean-ui:
--- kdvi/pix/Makefile.in
+++ kdvi/pix/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8325,7 +12754,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -385,7 +388,7 @@
+@@ -408,7 +411,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8334,7 +12763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -423,9 +426,9 @@
+@@ -446,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8346,31 +12775,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,18 +580,18 @@
+@@ -598,23 +601,23 @@
+
+ #>+ 19
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdvi.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-kdvi.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdvi.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdvi.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kdvi.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdvi.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdvi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdvi.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdvi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdvi.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
#>+ 15
force-reedit:
--- kfax/Makefile.in
+++ kfax/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -265,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8380,7 +12820,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -482,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8389,7 +12829,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -520,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8401,28 +12841,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -853,15 +856,15 @@
+@@ -874,23 +877,23 @@
+
+ #>+ 19
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfax.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfax.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
#>+ 15
force-reedit:
---- kfaxview/Makefile.in
-+++ kfaxview/Makefile.in
-@@ -252,6 +252,9 @@
+--- kfaxview/libkfaximage/Makefile.in
++++ kfaxview/libkfaximage/Makefile.in
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8432,16 +12883,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -464,7 +467,7 @@
.SUFFIXES:
- .SUFFIXES: .c .cpp .lo .o .obj
+ .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*) \
-@@ -491,9 +494,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8451,11 +12902,74 @@
-$(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)
+--- kfaxview/Makefile.in
++++ kfaxview/Makefile.in
+@@ -283,6 +283,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@
+@@ -508,7 +511,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*) \
+@@ -546,9 +549,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1143,23 +1146,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfaxview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kfaxview.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfaxview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+
+ #>+ 15
+ force-reedit:
--- kfile-plugins/bmp/Makefile.in
+++ kfile-plugins/bmp/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8465,7 +12979,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8474,7 +12988,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8488,7 +13002,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/dds/Makefile.in
+++ kfile-plugins/dds/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8498,7 +13012,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8507,7 +13021,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8521,7 +13035,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/dvi/Makefile.in
+++ kfile-plugins/dvi/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8531,7 +13045,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8540,7 +13054,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8554,7 +13068,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/exr/Makefile.in
+++ kfile-plugins/exr/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8564,7 +13078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -472,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8573,7 +13087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8587,7 +13101,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/gif/Makefile.in
+++ kfile-plugins/gif/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8597,7 +13111,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -470,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8606,7 +13120,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8620,7 +13134,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/ico/Makefile.in
+++ kfile-plugins/ico/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8630,7 +13144,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8639,7 +13153,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8653,7 +13167,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/jpeg/Makefile.in
+++ kfile-plugins/jpeg/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8663,7 +13177,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -473,7 +476,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8672,7 +13186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -511,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8686,7 +13200,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/Makefile.in
+++ kfile-plugins/Makefile.in
-@@ -214,6 +214,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8696,7 +13210,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -430,7 +433,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -8705,7 +13219,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8719,7 +13233,7 @@
mostlyclean-libtool:
--- kfile-plugins/pcx/Makefile.in
+++ kfile-plugins/pcx/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8729,7 +13243,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -468,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8738,7 +13252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8752,7 +13266,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/pdf/Makefile.in
+++ kfile-plugins/pdf/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8762,7 +13276,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -470,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8771,7 +13285,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8785,7 +13299,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/png/Makefile.in
+++ kfile-plugins/png/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8795,7 +13309,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8804,7 +13318,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8818,7 +13332,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/pnm/Makefile.in
+++ kfile-plugins/pnm/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8828,7 +13342,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8837,7 +13351,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8851,7 +13365,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/ps/Makefile.in
+++ kfile-plugins/ps/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8861,7 +13375,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -479,7 +482,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8870,7 +13384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -517,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8882,9 +13396,1171 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- kfile-plugins/raw/Makefile.in
++++ kfile-plugins/raw/Makefile.in
+@@ -267,6 +267,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: .c .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*) \
+@@ -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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kfile-plugins/raw/parse.c.orig
++++ kfile-plugins/raw/parse.c.orig
+@@ -1,1126 +0,0 @@
+-/*
+- Raw Photo Parser
+- Copyright 2004 by Dave Coffin, dcoffin a cybercom o net
+-
+- This program extracts thumbnail images (preferably JPEGs)
+- from any raw digital camera formats that have them, and
+- shows table contents.
+-
+- $Revision: 1.36 $
+- $Date: 2005/05/10 21:43:10 $
+- */
+-
+-#include <stdio.h>
+-#include <string.h>
+-#include <stdlib.h>
+-#include <ctype.h>
+-
+-#ifdef WIN32
+-#include <winsock2.h>
+-typedef __int64 INT64;
+-#else
+-#include <netinet/in.h>
+-typedef long long INT64;
+-#endif
+-
+-/*
+- TIFF and CIFF data blocks can be quite large.
+- Display only the first DLEN bytes.
+- */
+-#ifndef DLEN
+-#define DLEN 768
+-#endif
+-
+-typedef unsigned char uchar;
+-//typedef unsigned short ushort;
+-
+-FILE *ifp;
+-short order;
+-char *fname;
+-char make[128], model[128], model2[128], thumb_head[128];
+-int width, height, offset, length, bps, is_dng;
+-int thumb_offset, thumb_length, thumb_layers;
+-
+-struct decode {
+- struct decode *branch[2];
+- int leaf;
+-} first_decode[640], *free_decode;
+-
+-/*
+- Get a 2-byte integer, making no assumptions about CPU byte order.
+- Nor should we assume that the compiler evaluates left-to-right.
+- */
+-ushort get2()
+-{
+- uchar a, b;
+-
+- a = fgetc(ifp); b = fgetc(ifp);
+-
+- if (order == 0x4949) /* "II" means little-endian */
+- return a | b << 8;
+- else /* "MM" means big-endian */
+- return a << 8 | b;
+-}
+-
+-/*
+- Same for a 4-byte integer.
+- */
+-int get4()
+-{
+- uchar a, b, c, d;
+-
+- a = fgetc(ifp); b = fgetc(ifp);
+- c = fgetc(ifp); d = fgetc(ifp);
+-
+- if (order == 0x4949)
+- return a | b << 8 | c << 16 | d << 24;
+- else
+- return a << 24 | b << 16 | c << 8 | d;
+-}
+-
+-void tiff_dump(int base, int tag, int type, int count, int level)
+-{
+- int save, j, num, den;
+- uchar c;
+- int size[] = { 1,1,1,2,4,8,1,1,2,4,8,4,8 };
+-
+- if (count * size[type < 13 ? type:0] > 4)
+- fseek (ifp, get4()+base, SEEK_SET);
+- save = ftell(ifp);
+- printf("%*stag=0x%x %d, type=%d, count=%d, offset=%06x, data=",
+- level*2, "", tag, tag, type, count, save);
+- if (type==2) putchar('\"');
+- for (j = 0; j < count && j < DLEN; j++)
+- switch (type) {
+- case 1: case 6: case 7: /* byte values */
+- printf ("%c%02x",(j & 31) || count < 17 ? ' ':'\n', fgetc(ifp) & 0xff);
+- break;
+- case 2: /* null-terminated ASCII strings */
+- c = fgetc(ifp);
+- putchar(isprint(c) ? c:'.');
+- break;
+- case 3: case 8: /* word values */
+- printf ("%c%04x",(j & 15) || count < 9 ? ' ':'\n', get2());
+- break;
+- case 4: case 9: /* dword values */
+- printf ("%c%08x",(j & 7) || count < 5 ? ' ':'\n', get4());
+- break;
+- case 5: case 10: /* rationals */
+- num = get4();
+- den = get4();
+- printf (" %d/%d", num, den);
+- break;
+- }
+- if (type==2) putchar('\"');
+- putchar('\n');
+- fseek (ifp, save, SEEK_SET);
+-}
+-
+-void nikon_decrypt (uchar ci, uchar cj, int tag, int i, int size, uchar *buf)
+-{
+- static const uchar xlat[2][256] = {
+- { 0xc1,0xbf,0x6d,0x0d,0x59,0xc5,0x13,0x9d,0x83,0x61,0x6b,0x4f,0xc7,0x7f,0x3d,0x3d,
+- 0x53,0x59,0xe3,0xc7,0xe9,0x2f,0x95,0xa7,0x95,0x1f,0xdf,0x7f,0x2b,0x29,0xc7,0x0d,
+- 0xdf,0x07,0xef,0x71,0x89,0x3d,0x13,0x3d,0x3b,0x13,0xfb,0x0d,0x89,0xc1,0x65,0x1f,
+- 0xb3,0x0d,0x6b,0x29,0xe3,0xfb,0xef,0xa3,0x6b,0x47,0x7f,0x95,0x35,0xa7,0x47,0x4f,
+- 0xc7,0xf1,0x59,0x95,0x35,0x11,0x29,0x61,0xf1,0x3d,0xb3,0x2b,0x0d,0x43,0x89,0xc1,
+- 0x9d,0x9d,0x89,0x65,0xf1,0xe9,0xdf,0xbf,0x3d,0x7f,0x53,0x97,0xe5,0xe9,0x95,0x17,
+- 0x1d,0x3d,0x8b,0xfb,0xc7,0xe3,0x67,0xa7,0x07,0xf1,0x71,0xa7,0x53,0xb5,0x29,0x89,
+- 0xe5,0x2b,0xa7,0x17,0x29,0xe9,0x4f,0xc5,0x65,0x6d,0x6b,0xef,0x0d,0x89,0x49,0x2f,
+- 0xb3,0x43,0x53,0x65,0x1d,0x49,0xa3,0x13,0x89,0x59,0xef,0x6b,0xef,0x65,0x1d,0x0b,
+- 0x59,0x13,0xe3,0x4f,0x9d,0xb3,0x29,0x43,0x2b,0x07,0x1d,0x95,0x59,0x59,0x47,0xfb,
+- 0xe5,0xe9,0x61,0x47,0x2f,0x35,0x7f,0x17,0x7f,0xef,0x7f,0x95,0x95,0x71,0xd3,0xa3,
+- 0x0b,0x71,0xa3,0xad,0x0b,0x3b,0xb5,0xfb,0xa3,0xbf,0x4f,0x83,0x1d,0xad,0xe9,0x2f,
+- 0x71,0x65,0xa3,0xe5,0x07,0x35,0x3d,0x0d,0xb5,0xe9,0xe5,0x47,0x3b,0x9d,0xef,0x35,
+- 0xa3,0xbf,0xb3,0xdf,0x53,0xd3,0x97,0x53,0x49,0x71,0x07,0x35,0x61,0x71,0x2f,0x43,
+- 0x2f,0x11,0xdf,0x17,0x97,0xfb,0x95,0x3b,0x7f,0x6b,0xd3,0x25,0xbf,0xad,0xc7,0xc5,
+- 0xc5,0xb5,0x8b,0xef,0x2f,0xd3,0x07,0x6b,0x25,0x49,0x95,0x25,0x49,0x6d,0x71,0xc7 },
+- { 0xa7,0xbc,0xc9,0xad,0x91,0xdf,0x85,0xe5,0xd4,0x78,0xd5,0x17,0x46,0x7c,0x29,0x4c,
+- 0x4d,0x03,0xe9,0x25,0x68,0x11,0x86,0xb3,0xbd,0xf7,0x6f,0x61,0x22,0xa2,0x26,0x34,
+- 0x2a,0xbe,0x1e,0x46,0x14,0x68,0x9d,0x44,0x18,0xc2,0x40,0xf4,0x7e,0x5f,0x1b,0xad,
+- 0x0b,0x94,0xb6,0x67,0xb4,0x0b,0xe1,0xea,0x95,0x9c,0x66,0xdc,0xe7,0x5d,0x6c,0x05,
+- 0xda,0xd5,0xdf,0x7a,0xef,0xf6,0xdb,0x1f,0x82,0x4c,0xc0,0x68,0x47,0xa1,0xbd,0xee,
+- 0x39,0x50,0x56,0x4a,0xdd,0xdf,0xa5,0xf8,0xc6,0xda,0xca,0x90,0xca,0x01,0x42,0x9d,
+- 0x8b,0x0c,0x73,0x43,0x75,0x05,0x94,0xde,0x24,0xb3,0x80,0x34,0xe5,0x2c,0xdc,0x9b,
+- 0x3f,0xca,0x33,0x45,0xd0,0xdb,0x5f,0xf5,0x52,0xc3,0x21,0xda,0xe2,0x22,0x72,0x6b,
+- 0x3e,0xd0,0x5b,0xa8,0x87,0x8c,0x06,0x5d,0x0f,0xdd,0x09,0x19,0x93,0xd0,0xb9,0xfc,
+- 0x8b,0x0f,0x84,0x60,0x33,0x1c,0x9b,0x45,0xf1,0xf0,0xa3,0x94,0x3a,0x12,0x77,0x33,
+- 0x4d,0x44,0x78,0x28,0x3c,0x9e,0xfd,0x65,0x57,0x16,0x94,0x6b,0xfb,0x59,0xd0,0xc8,
+- 0x22,0x36,0xdb,0xd2,0x63,0x98,0x43,0xa1,0x04,0x87,0x86,0xf7,0xa6,0x26,0xbb,0xd6,
+- 0x59,0x4d,0xbf,0x6a,0x2e,0xaa,0x2b,0xef,0xe6,0x78,0xb6,0x4e,0xe0,0x2f,0xdc,0x7c,
+- 0xbe,0x57,0x19,0x32,0x7e,0x2a,0xd0,0xb8,0xba,0x29,0x00,0x3c,0x52,0x7d,0xa8,0x49,
+- 0x3b,0x2d,0xeb,0x25,0x49,0xfa,0xa3,0xaa,0x39,0xa7,0xc5,0xa7,0x50,0x11,0x36,0xfb,
+- 0xc6,0x67,0x4a,0xf5,0xa5,0x12,0x65,0x7e,0xb0,0xdf,0xaf,0x4e,0xb3,0x61,0x7f,0x2f } };
+- uchar ck=0x60;
+-
+- if (strncmp (buf, "02", 2)) return;
+- ci = xlat[0][ci];
+- cj = xlat[1][cj];
+- printf("Decrypted tag 0x%x:\n%*s", tag, (i & 31)*3, "");
+- for (; i < size; i++)
+- printf("%02x%c", buf[i] ^ (cj += ci * ck++), (i & 31) == 31 ? '\n':' ');
+- if (size & 31) puts("");
+-}
+-
+-int parse_tiff_ifd (int base, int level);
+-
+-void nef_parse_makernote (base)
+-{
+- int offset=0, entries, tag, type, count, val, save;
+- unsigned serial=0, key=0;
+- uchar buf91[630], buf97[608], buf98[31];
+- short sorder;
+- char buf[10];
+-
+- puts(" Nikon MakerNote:");
+-/*
+- The MakerNote might have its own TIFF header (possibly with
+- its own byte-order!), or it might just be a table.
+- */
+- sorder = order;
+- fread (buf, 1, 10, ifp);
+- if (!strcmp (buf,"Nikon")) { /* starts with "Nikon\0\2\0\0\0" ? */
+- base = ftell(ifp);
+- order = get2(); /* might differ from file-wide byteorder */
+- val = get2(); /* should be 42 decimal */
+- offset = get4();
+- fseek (ifp, offset-8, SEEK_CUR);
+- } else if (!strncmp (buf,"FUJIFILM",8) ||
+- !strcmp (buf,"Panasonic")) {
+- order = 0x4949;
+- fseek (ifp, 2, SEEK_CUR);
+- } else if (!strcmp (buf,"OLYMP") ||
+- !strcmp (buf,"LEICA") ||
+- !strcmp (buf,"EPSON"))
+- fseek (ifp, -2, SEEK_CUR);
+- else if (!strcmp (buf,"AOC"))
+- fseek (ifp, -4, SEEK_CUR);
+- else
+- fseek (ifp, -10, SEEK_CUR);
+-
+- entries = get2();
+- if (entries > 100) return;
+- while (entries--) {
+- save = ftell(ifp);
+- tag = get2();
+- type = get2();
+- count= get4();
+- tiff_dump (base, tag, type, count, 2);
+- if (tag == 0x1d)
+- fscanf (ifp, "%d", &serial);
+- if (tag == 0x91)
+- fread (buf91, sizeof buf91, 1, ifp);
+- if (tag == 0x97)
+- fread (buf97, sizeof buf97, 1, ifp);
+- if (tag == 0x98)
+- fread (buf98, sizeof buf98, 1, ifp);
+- if (tag == 0xa7)
+- key = fgetc(ifp)^fgetc(ifp)^fgetc(ifp)^fgetc(ifp);
+-
+- if (tag == 0x100 && type == 7 && !strncmp(make,"OLYMPUS",7)) {
+- thumb_offset = ftell(ifp);
+- thumb_length = count;
+- }
+- if (tag == 0x280 && type == 1) { /* EPSON */
+- strcpy (thumb_head, "\xff");
+- thumb_offset = ftell(ifp)+1;
+- thumb_length = count-1;
+- }
+- if (strstr(make,"Minolta") || strstr(make,"MINOLTA")) {
+- switch (tag) {
+- case 0x81:
+- thumb_offset = ftell(ifp);
+- thumb_length = count;
+- break;
+- case 0x88:
+- thumb_offset = get4() + base;
+- break;
+- case 0x89:
+- thumb_length = get4();
+- }
+- }
+- if (!strcmp (buf,"OLYMP") && tag >> 8 == 0x20)
+- parse_tiff_ifd (base, 3);
+- fseek (ifp, save+12, SEEK_SET);
+- }
+- nikon_decrypt (serial, key, 0x91, 4, sizeof buf91, buf91);
+- nikon_decrypt (serial, key, 0x97, 284, sizeof buf97, buf97);
+- nikon_decrypt (serial, key, 0x98, 4, sizeof buf98, buf98);
+- order = sorder;
+-}
+-
+-void nef_parse_exif(int base)
+-{
+- int entries, tag, type, count, save;
+-
+- puts("Nikon EXIF tag:");
+- entries = get2();
+- while (entries--) {
+- save = ftell(ifp);
+- tag = get2();
+- type = get2();
+- count= get4();
+- tiff_dump (base, tag, type, count, 1);
+- if (tag == 0x927c)
+- nef_parse_makernote (base);
+- fseek (ifp, save+12, SEEK_SET);
+- }
+-}
+-
+-int parse_tiff_ifd (int base, int level)
+-{
+- int entries, tag, type, count, slen, save, save2, val, i;
+- int comp=0;
+-
+- entries = get2();
+- if (entries > 255) return 1;
+- while (entries--) {
+- save = ftell(ifp);
+- tag = get2();
+- type = get2();
+- count= get4();
+- slen = count;
+- if (slen > 128) slen = 128;
+-
+- tiff_dump (base, tag, type, count, level);
+-
+- save2 = ftell(ifp);
+- if (type == 3) /* short int */
+- val = get2();
+- else
+- val = get4();
+- fseek (ifp, save2, SEEK_SET);
+-
+- if (tag > 50700 && tag < 50800)
+- is_dng = 1;
+-
+- if (level == 3) { /* Olympus E-1 and E-300 */
+- if (type == 4) {
+- if (tag == 0x101)
+- thumb_offset = val;
+- else if (tag == 0x102)
+- thumb_length = val;
+- }
+- goto cont;
+- }
+- switch (tag) {
+- case 0x100: /* ImageWidth */
+- if (!width) width = val;
+- break;
+- case 0x101: /* ImageHeight */
+- if (!height) height = val;
+- break;
+- case 0x102: /* Bits per sample */
+- if (bps) break;
+- bps = val;
+- if (count == 1)
+- thumb_layers = 1;
+- break;
+- case 0x103: /* Compression */
+- comp = val;
+- break;
+- case 0x10f: /* Make tag */
+- fgets (make, slen, ifp);
+- break;
+- case 0x110: /* Model tag */
+- fgets (model, slen, ifp);
+- break;
+- case 33405: /* Model2 tag */
+- fgets (model2, slen, ifp);
+- break;
+- case 0x111: /* StripOffset */
+- if (!offset || is_dng) offset = val;
+- break;
+- case 0x117: /* StripByteCounts */
+- if (!length || is_dng) length = val;
+- if (offset > val && !strncmp(make,"KODAK",5) && !is_dng)
+- offset -= val;
+- break;
+- case 0x14a: /* SubIFD tag */
+- save2 = ftell(ifp);
+- for (i=0; i < count; i++) {
+- printf ("SubIFD #%d:\n", i+1);
+- fseek (ifp, save2 + i*4, SEEK_SET);
+- fseek (ifp, get4()+base, SEEK_SET);
+- parse_tiff_ifd (base, level+1);
+- }
+- break;
+- case 0x201:
+- if (strncmp(make,"OLYMPUS",7) || !thumb_offset)
+- thumb_offset = val;
+- break;
+- case 0x202:
+- if (strncmp(make,"OLYMPUS",7) || !thumb_length)
+- thumb_length = val;
+- break;
+- case 34665:
+- fseek (ifp, get4()+base, SEEK_SET);
+- nef_parse_exif (base);
+- break;
+- case 50706:
+- is_dng = 1;
+- }
+-cont:
+- fseek (ifp, save+12, SEEK_SET);
+- }
+- if ((comp == 6 && !strcmp(make,"Canon")) ||
+- (comp == 7 && is_dng)) {
+- thumb_offset = offset;
+- thumb_length = length;
+- }
+- return 0;
+-}
+-
+-/*
+- Parse a TIFF file looking for camera model and decompress offsets.
+- */
+-void parse_tiff (int base)
+-{
+- int doff, spp=3, ifd=0;
+-
+- width = height = offset = length = bps = is_dng = 0;
+- fseek (ifp, base, SEEK_SET);
+- order = get2();
+- if (order != 0x4949 && order != 0x4d4d) return;
+- get2();
+- while ((doff = get4())) {
+- fseek (ifp, doff+base, SEEK_SET);
+- printf ("IFD #%d:\n", ifd++);
+- if (parse_tiff_ifd (base, 0)) break;
+- }
+- if (is_dng) return;
+-
+- if (strncmp(make,"KODAK",5))
+- thumb_layers = 0;
+- if (!strncmp(make,"Kodak",5)) {
+- fseek (ifp, 12+base, SEEK_SET);
+- puts ("\nSpecial Kodak image directory:");
+- parse_tiff_ifd (base, 0);
+- }
+- if (!strncmp(model,"DCS460A",7)) {
+- spp = 1;
+- thumb_layers = 0;
+- }
+- if (!thumb_length && offset) {
+- thumb_offset = offset;
+- sprintf (thumb_head, "P%d %d %d %d\n",
+- spp > 1 ? 6:5, width, height, (1 << bps) - 1);
+- thumb_length = width * height * spp * ((bps+7)/8);
+- }
+-}
+-
+-void parse_minolta()
+-{
+- int data_offset, save, tag, len;
+-
+- fseek (ifp, 4, SEEK_SET);
+- data_offset = get4() + 8;
+- while ((save=ftell(ifp)) < data_offset) {
+- tag = get4();
+- len = get4();
+- printf ("Tag %c%c%c offset %06x length %06x\n",
+- tag>>16, tag>>8, tag, save, len);
+- switch (tag) {
+- case 0x545457: /* TTW */
+- parse_tiff (ftell(ifp));
+- }
+- fseek (ifp, save+len+8, SEEK_SET);
+- }
+- strcpy (thumb_head, "\xff");
+- thumb_offset++;
+- thumb_length--;
+-}
+-
+-/*
+- Parse the CIFF structure.
+- */
+-void parse_ciff (int offset, int length, int level)
+-{
+- int tboff, nrecs, i, j, type, len, dlen, roff, aoff=0, save;
+- char c, name[256];
+-
+- fseek (ifp, offset+length-4, SEEK_SET);
+- tboff = get4() + offset;
+- fseek (ifp, tboff, SEEK_SET);
+- nrecs = get2();
+- if (nrecs > 100) return;
+- printf ("%*s%d records:\n", level*2, "", nrecs);
+- for (i = 0; i < nrecs; i++) {
+- save = ftell(ifp);
+- type = get2();
+- printf ("%*stype=0x%04x", level*2, "", type);
+- if (type & 0x4000) {
+- len = 8;
+- type &= 0x3fff;
+- } else {
+- len = get4();
+- roff = get4();
+- aoff = offset + roff;
+- printf (", length=%d, reloff=%d, absoff=%d",
+- len, roff, aoff);
+- fseek (ifp, aoff, SEEK_SET);
+- }
+- if ((type & 0xe700) == 0)
+- printf (", data=");
+- if (type == 0x0032) /* display as words */
+- type |= 0x1000;
+- dlen = len < DLEN ? len:DLEN;
+- switch (type >> 8) {
+- case 0x28:
+- case 0x30:
+- putchar('\n');
+- parse_ciff (aoff, len, level+1);
+- fseek (ifp, save+10, SEEK_SET);
+- continue;
+- case 0x00: /* byte values */
+- for (j = 0; j < dlen; j++)
+- printf ("%c%02x",(j & 31) || dlen < 16 ? ' ':'\n', fgetc(ifp) & 0xff);
+- break;
+- case 0x08: /* null-terminated ASCII strings */
+- putchar('\"');
+- for (j = 0; j < dlen; j++) {
+- c = fgetc(ifp);
+- putchar( isprint(c) ? c:'.');
+- }
+- putchar('\"');
+- break;
+- case 0x10: /* word values */
+- for (j = 0; j < dlen; j+=2)
+- printf ("%c%5u",(j & 31) || dlen < 16 ? ' ':'\n', get2());
+- break;
+- case 0x18: /* dword values */
+- for (j = 0; j < dlen; j+=4)
+- printf ("%c%08x",(j & 31) || dlen < 16 ? ' ':'\n', get4());
+- }
+- putchar('\n');
+- fseek (ifp, save+10, SEEK_SET);
+- if (type == 0x080a) { /* Get the camera name */
+- fseek (ifp, aoff, SEEK_SET);
+- fread (name, 256, 1, ifp);
+- strcpy (make, name);
+- strcpy (model, name + strlen(make)+1);
+- }
+- if (type == 0x2007) { /* Found the JPEG thumbnail */
+- thumb_offset = aoff;
+- thumb_length = len;
+- }
+- }
+-}
+-
+-void parse_mos(int level)
+-{
+- uchar data[256];
+- int i, j, skip, save;
+- char *cp;
+-
+- save = ftell(ifp);
+- while (1) {
+- fread (data, 1, 8, ifp);
+- if (strcmp(data,"PKTS")) break;
+- strcpy (model, "Valeo");
+- printf ("%*s%s ", level, "", data);
+- fread (data, 1, 40, ifp);
+- skip = get4();
+- printf ("%s %d bytes: ", data, skip);
+- if (!strcmp(data,"icc_camera_to_tone_matrix")) {
+- for (i=0; i < skip/4; i++) {
+- j = get4();
+- printf ("%f ", *((float *) &j));
+- }
+- putchar('\n');
+- continue;
+- }
+- if (!strcmp(data,"JPEG_preview_data")) {
+- thumb_head[0] = 0;
+- thumb_offset = ftell(ifp);
+- thumb_length = skip;
+- }
+- fread (data, 1, sizeof data, ifp);
+- fseek (ifp, -sizeof data, SEEK_CUR);
+- data[sizeof data - 1] = 0;
+- while ((cp=index(data,'\n')))
+- *cp = ' ';
+- printf ("%s\n",data);
+- parse_mos(level+2);
+- fseek (ifp, skip, SEEK_CUR);
+- }
+- fseek (ifp, save, SEEK_SET);
+-}
+-
+-void parse_rollei()
+-{
+- char line[128], *val;
+-
+- fseek (ifp, 0, SEEK_SET);
+- do {
+- fgets (line, 128, ifp);
+- fputs (line, stdout);
+- if ((val = strchr(line,'=')))
+- *val++ = 0;
+- else
+- val = line + strlen(line);
+- if (!strcmp(line,"HDR"))
+- thumb_offset = atoi(val);
+- if (!strcmp(line,"TX "))
+- width = atoi(val);
+- if (!strcmp(line,"TY "))
+- height = atoi(val);
+- } while (strncmp(line,"EOHD",4));
+- strcpy (make, "Rollei");
+- strcpy (model, "d530flex");
+- thumb_length = width*height*2;
+-}
+-
+-void rollei_decode (FILE *tfp)
+-{
+- ushort data;
+- int row, col;
+-
+- fseek (ifp, thumb_offset, SEEK_SET);
+- fprintf (tfp, "P6\n%d %d\n255\n", width, height);
+- for (row=0; row < height; row++)
+- for (col=0; col < width; col++) {
+- fread (&data, 2, 1, ifp);
+- data = ntohs(data);
+- putc (data << 3, tfp);
+- putc (data >> 5 << 2, tfp);
+- putc (data >> 11 << 3, tfp);
+- }
+-}
+-
+-void get_utf8 (int offset, char *buf, int len)
+-{
+- ushort c;
+- char *cp;
+-
+- fseek (ifp, offset, SEEK_SET);
+- for (cp=buf; (c = get2()) && cp+3 < buf+len; ) {
+- if (c < 0x80)
+- *cp++ = c;
+- else if (c < 0x800) {
+- *cp++ = 0xc0 + (c >> 6);
+- *cp++ = 0x80 + (c & 0x3f);
+- } else {
+- *cp++ = 0xe0 + (c >> 12);
+- *cp++ = 0x80 + (c >> 6 & 0x3f);
+- *cp++ = 0x80 + (c & 0x3f);
+- }
+- }
+- *cp = 0;
+-}
+-
+-ushort sget2 (uchar *s)
+-{
+- return s[0] + (s[1]<<8);
+-}
+-
+-int sget4 (uchar *s)
+-{
+- return s[0] + (s[1]<<8) + (s[2]<<16) + (s[3]<<24);
+-}
+-
+-void parse_foveon()
+-{
+- int entries, img=0, off, len, tag, save, i, j, k, pent, poff[256][2];
+- char name[128], value[128], camf[0x20000], *pos, *cp, *dp;
+- unsigned val, key, type, num, ndim, dim[3];
+-
+- order = 0x4949; /* Little-endian */
+- fseek (ifp, -4, SEEK_END);
+- fseek (ifp, get4(), SEEK_SET);
+- if (get4() != 0x64434553) { /* SECd */
+- printf ("Bad Section identifier at %6x\n", (int)ftell(ifp)-4);
+- return;
+- }
+- get4();
+- entries = get4();
+- while (entries--) {
+- off = get4();
+- len = get4();
+- tag = get4();
+- save = ftell(ifp);
+- fseek (ifp, off, SEEK_SET);
+- printf ("%c%c%c%c at offset %06x, length %06x, ",
+- tag, tag >> 8, tag >> 16, tag >> 24, off, len);
+- if (get4() != (0x20434553 | (tag << 24))) {
+- printf ("Bad Section identifier at %6x\n", off);
+- goto next;
+- }
+- val = get4();
+- printf ("version %d.%d, ",val >> 16, val & 0xffff);
+- switch (tag) {
+- case 0x32414d49: /* IMA2 */
+- case 0x47414d49: /* IMAG */
+- if (++img == 2) { /* second image */
+- thumb_offset = off;
+- thumb_length = 1;
+- }
+- printf ("type %d, " , get4());
+- printf ("format %2d, " , get4());
+- printf ("columns %4d, " , get4());
+- printf ("rows %4d, " , get4());
+- printf ("rowsize %d\n" , get4());
+- break;
+- case 0x464d4143: /* CAMF */
+- printf ("type %d, ", get4());
+- get4();
+- for (i=0; i < 4; i++)
+- putchar(fgetc(ifp));
+- val = get4();
+- printf (" version %d.%d:\n",val >> 16, val & 0xffff);
+- key = get4();
+- if ((len -= 28) > 0x20000)
+- len = 0x20000;
+- fread (camf, 1, len, ifp);
+- for (i=0; i < len; i++) {
+- key = (key * 1597 + 51749) % 244944;
+- val = key * (INT64) 301593171 >> 24;
+- camf[i] ^= ((((key << 8) - val) >> 1) + val) >> 17;
+- }
+- for (pos=camf; (unsigned) (pos-camf) < len; pos += sget4(pos+8)) {
+- if (strncmp (pos, "CMb", 3)) {
+- printf("Bad CAMF tag \"%.4s\"\n", pos);
+- break;
+- }
+- val = sget4(pos+4);
+- printf (" %4.4s version %d.%d: ", pos, val >> 16, val & 0xffff);
+- switch (pos[3]) {
+- case 'M':
+- cp = pos + sget4(pos+16);
+- type = sget4(cp);
+- ndim = sget4(cp+4);
+- dim[0] = dim[1] = dim[2] = 1;
+- printf ("%d-dimensonal array %s of type %d:\n Key: (",
+- ndim, pos+sget4(pos+12), sget4(cp));
+- dp = pos + sget4(cp+8);
+- for (i=ndim; i--; ) {
+- cp += 12;
+- dim[i] = sget4(cp);
+- printf ("%s %d%s", pos+sget4(cp+4), dim[i], i ? ", ":")\n");
+- }
+- for (i=0; i < dim[2]; i++) {
+- for (j=0; j < dim[1]; j++) {
+- printf (" ");
+- for (k=0; k < dim[0]; k++)
+- switch (type) {
+- case 0:
+- case 6:
+- printf ("%7d", sget2(dp));
+- dp += 2;
+- break;
+- case 1:
+- case 2:
+- printf (" %d", sget4(dp));
+- dp += 4;
+- break;
+- case 3:
+- val = sget4(dp);
+- printf (" %9f", *(float *)(&val));
+- dp += 4;
+- }
+- printf ("\n");
+- }
+- printf ("\n");
+- }
+- break;
+- case 'P':
+- val = sget4(pos+16);
+- num = sget4(pos+val);
+- printf ("%s, %d parameters:\n", pos+sget4(pos+12), num);
+- cp = pos+val+8 + num*8;
+- for (i=0; i < num; i++) {
+- val += 8;
+- printf (" %s = %s\n", cp+sget4(pos+val), cp+sget4(pos+val+4));
+- }
+- break;
+- case 'T':
+- cp = pos + sget4(pos+16);
+- printf ("%s = %.*s\n", pos+sget4(pos+12), sget4(cp), cp+4);
+- break;
+- default:
+- printf ("\n");
+- }
+- }
+- break;
+- case 0x504f5250: /* PROP */
+- printf ("entries %d, ", pent=get4());
+- printf ("charset %d, ", get4());
+- get4();
+- printf ("nchars %d\n", get4());
+- off += pent*8 + 24;
+- if (pent > 256) pent=256;
+- for (i=0; i < pent*2; i++)
+- poff[0][i] = off + get4()*2;
+- for (i=0; i < pent; i++) {
+- get_utf8 (poff[i][0], name, 128);
+- get_utf8 (poff[i][1], value, 128);
+- printf (" %s = %s\n", name, value);
+- if (!strcmp (name,"CAMMANUF"))
+- strcpy (make, value);
+- if (!strcmp (name,"CAMMODEL"))
+- strcpy (model, value);
+- }
+- }
+-next:
+- fseek (ifp, save, SEEK_SET);
+- }
+-}
+-
+-void foveon_tree (unsigned huff[1024], unsigned code)
+-{
+- struct decode *cur;
+- int i, len;
+-
+- cur = free_decode++;
+- if (code) {
+- for (i=0; i < 1024; i++)
+- if (huff[i] == code) {
+- cur->leaf = i;
+- return;
+- }
+- }
+- if ((len = code >> 27) > 26) return;
+- code = (len+1) << 27 | (code & 0x3ffffff) << 1;
+-
+- cur->branch[0] = free_decode;
+- foveon_tree (huff, code);
+- cur->branch[1] = free_decode;
+- foveon_tree (huff, code+1);
+-}
+-
+-void foveon_decode (FILE *tfp)
+-{
+- int bwide, row, col, bit=-1, c, i;
+- char *buf;
+- struct decode *dindex;
+- short pred[3];
+- unsigned huff[1024], bitbuf=0;
+-
+- fseek (ifp, thumb_offset+16, SEEK_SET);
+- width = get4();
+- height = get4();
+- bwide = get4();
+- fprintf (tfp, "P6\n%d %d\n255\n", width, height);
+- if (bwide > 0) {
+- buf = malloc(bwide);
+- for (row=0; row < height; row++) {
+- fread (buf, 1, bwide, ifp);
+- fwrite (buf, 3, width, tfp);
+- }
+- free (buf);
+- return;
+- }
+- for (i=0; i < 256; i++)
+- huff[i] = get4();
+- memset (first_decode, 0, sizeof first_decode);
+- free_decode = first_decode;
+- foveon_tree (huff, 0);
+-
+- for (row=0; row < height; row++) {
+- memset (pred, 0, sizeof pred);
+- if (!bit) get4();
+- for (col=bit=0; col < width; col++) {
+- for (c=0; c < 3; c++) {
+- for (dindex=first_decode; dindex->branch[0]; ) {
+- if ((bit = (bit-1) & 31) == 31)
+- for (i=0; i < 4; i++)
+- bitbuf = (bitbuf << 8) + fgetc(ifp);
+- dindex = dindex->branch[bitbuf >> bit & 1];
+- }
+- pred[c] += dindex->leaf;
+- fputc (pred[c], tfp);
+- }
+- }
+- }
+-}
+-
+-void kodak_yuv_decode (FILE *tfp)
+-{
+- uchar c, blen[384];
+- unsigned row, col, len, bits=0;
+- INT64 bitbuf=0;
+- int i, li=0, si, diff, six[6], y[4], cb=0, cr=0, rgb[3];
+- ushort *out, *op;
+-
+- fseek (ifp, thumb_offset, SEEK_SET);
+- width = (width+1) & -2;
+- height = (height+1) & -2;
+- fprintf (tfp, "P6\n%d %d\n65535\n", width, height);
+- out = malloc (width * 12);
+- if (!out) {
+- fprintf (stderr, "kodak_yuv_decode() malloc failed!\n");
+- exit(1);
+- }
+-
+- for (row=0; row < height; row+=2) {
+- for (col=0; col < width; col+=2) {
+- if ((col & 127) == 0) {
+- len = (width - col + 1) * 3 & -4;
+- if (len > 384) len = 384;
+- for (i=0; i < len; ) {
+- c = fgetc(ifp);
+- blen[i++] = c & 15;
+- blen[i++] = c >> 4;
+- }
+- li = bitbuf = bits = y[1] = y[3] = cb = cr = 0;
+- if (len % 8 == 4) {
+- bitbuf = fgetc(ifp) << 8;
+- bitbuf += fgetc(ifp);
+- bits = 16;
+- }
+- }
+- for (si=0; si < 6; si++) {
+- len = blen[li++];
+- if (bits < len) {
+- for (i=0; i < 32; i+=8)
+- bitbuf += (INT64) fgetc(ifp) << (bits+(i^8));
+- bits += 32;
+- }
+- diff = bitbuf & (0xffff >> (16-len));
+- bitbuf >>= len;
+- bits -= len;
+- if ((diff & (1 << (len-1))) == 0)
+- diff -= (1 << len) - 1;
+- six[si] = diff;
+- }
+- y[0] = six[0] + y[1];
+- y[1] = six[1] + y[0];
+- y[2] = six[2] + y[3];
+- y[3] = six[3] + y[2];
+- cb += six[4];
+- cr += six[5];
+- for (i=0; i < 4; i++) {
+- op = out + ((i >> 1)*width + col+(i & 1)) * 3;
+- rgb[0] = y[i] + 1.40200/2 * cr;
+- rgb[1] = y[i] - 0.34414/2 * cb - 0.71414/2 * cr;
+- rgb[2] = y[i] + 1.77200/2 * cb;
+- for (c=0; c < 3; c++)
+- if (rgb[c] > 0) op[c] = htons(rgb[c]);
+- }
+- }
+- fwrite (out, sizeof *out, width*6, tfp);
+- }
+- free(out);
+-}
+-
+-void parse_fuji (int offset)
+-{
+- int entries, tag, len;
+-
+- fseek (ifp, offset, SEEK_SET);
+- fseek (ifp, get4(), SEEK_SET);
+- entries = get4();
+- if (entries > 60) return;
+- while (entries--) {
+- tag = get2();
+- len = get2();
+- printf ("Fuji tag=0x%x, len=%d, data =",tag,len);
+- while (len--)
+- printf (" %02x",fgetc(ifp));
+- putchar ('\n');
+- }
+-}
+-
+-void parse_phase_one (int base)
+-{
+- unsigned entries, tag, type, len, data, save;
+- char str[256];
+-
+- fseek (ifp, base + 8, SEEK_SET);
+- fseek (ifp, base + get4(), SEEK_SET);
+- entries = get4();
+- get4();
+- while (entries--) {
+- tag = get4();
+- type = get4();
+- len = get4();
+- data = get4();
+- save = ftell(ifp);
+- printf ("Phase One tag=0x%x, type=%d, len=%2d, data = 0x%x\n",
+- tag, type, len, data);
+- if (type == 1 && len < 256) {
+- fseek (ifp, base + data, SEEK_SET);
+- fread (str, 256, 1, ifp);
+- puts (str);
+- }
+- if (tag == 0x110) {
+- thumb_offset = data + base;
+- thumb_length = len;
+- }
+- fseek (ifp, save, SEEK_SET);
+- }
+- strcpy (make, "Phase One");
+- strcpy (model, "unknown");
+-}
+-
+-void parse_jpeg (int offset)
+-{
+- int len, save, hlen;
+-
+- fseek (ifp, offset, SEEK_SET);
+- if (fgetc(ifp) != 0xff || fgetc(ifp) != 0xd8) return;
+-
+- while (fgetc(ifp) == 0xff && fgetc(ifp) >> 4 != 0xd) {
+- order = 0x4d4d;
+- len = get2() - 2;
+- save = ftell(ifp);
+- order = get2();
+- hlen = get4();
+- if (get4() == 0x48454150) /* "HEAP" */
+- parse_ciff (save+hlen, len-hlen, 0);
+- parse_tiff (save+6);
+- fseek (ifp, save+len, SEEK_SET);
+- }
+-}
+-
+-char *memmem (char *haystack, size_t haystacklen,
+- char *needle, size_t needlelen)
+-{
+- char *c;
+- for (c = haystack; c <= haystack + haystacklen - needlelen; c++)
+- if (!memcmp (c, needle, needlelen))
+- return c;
+- return NULL;
+-}
+-
+-/*
+- Identify which camera created this file, and set global variables
+- accordingly. Return nonzero if the file cannot be decoded.
+- */
+-int identify()
+-{
+- char head[32], thumb_name[256], *thumb, *rgb, *cp;
+- unsigned hlen, fsize, toff, tlen, lsize, i;
+- FILE *tfp;
+-
+- make[0] = model[0] = model2[0] = is_dng = 0;
+- thumb_head[0] = thumb_offset = thumb_length = thumb_layers = 0;
+- order = get2();
+- hlen = get4();
+- fseek (ifp, 0, SEEK_SET);
+- fread (head, 1, 32, ifp);
+- fseek (ifp, 0, SEEK_END);
+- fsize = ftell(ifp);
+- if ((cp = memmem (head, 32, "MMMMRawT", 8)) ||
+- (cp = memmem (head, 32, "IIIITwaR", 8)))
+- parse_phase_one (cp - head);
+- else if (order == 0x4949 || order == 0x4d4d) {
+- if (!memcmp(head+6,"HEAPCCDR",8)) {
+- parse_ciff (hlen, fsize - hlen, 0);
+- fseek (ifp, hlen, SEEK_SET);
+- } else
+- parse_tiff (0);
+- } else if (!memcmp (head, "\0MRM", 4))
+- parse_minolta();
+- else if (!memcmp (head, "\xff\xd8\xff\xe1", 4) &&
+- !memcmp (head+6, "Exif", 4)) {
+- parse_tiff (12);
+- thumb_length = 0;
+- } else if (!memcmp (head, "FUJIFILM", 8)) {
+- fseek (ifp, 84, SEEK_SET);
+- toff = get4();
+- tlen = get4();
+- parse_fuji (92);
+- if (toff > 120) parse_fuji (120);
+- parse_tiff (toff+12);
+- thumb_offset = toff;
+- thumb_length = tlen;
+- } else if (!memcmp (head, "DSC-Image", 9))
+- parse_rollei();
+- else if (!memcmp (head, "FOVb", 4))
+- parse_foveon();
+- fseek (ifp, 8, SEEK_SET);
+- parse_mos(0);
+- fseek (ifp, 3472, SEEK_SET);
+- parse_mos(0);
+- parse_jpeg(0);
+- if (model[0] == 0) {
+- fprintf (stderr, "%s: unsupported file format.\n", fname);
+- return 1;
+- }
+- fprintf (stderr, "Findings for %s:\n", fname);
+- fprintf (stderr, "Make is \"%s\"\n", make);
+- fprintf (stderr, "Model is \"%s\"\n", model);
+- if (model2[0])
+- fprintf (stderr, "Model2 is \"%s\"\n", model2);
+-
+- if (!thumb_length) {
+- fprintf (stderr, "Thumbnail image not found\n");
+- return 0;
+- }
+- strcpy (thumb_name, fname);
+- strcat (thumb_name, ".thumb");
+- tfp = fopen (thumb_name, "wb");
+- if (!tfp) {
+- perror(thumb_name);
+- return 0;
+- }
+- if (is_dng) goto dng_skip;
+- if (!strncmp(model,"DCS Pro",7)) {
+- kodak_yuv_decode (tfp);
+- goto done;
+- }
+- if (!strcmp(make,"Rollei")) {
+- rollei_decode (tfp);
+- goto done;
+- }
+- if (!strcmp(make,"SIGMA")) {
+- foveon_decode (tfp);
+- goto done;
+- }
+-dng_skip:
+- thumb = (char *) malloc(thumb_length);
+- if (!thumb) {
+- fprintf (stderr, "Cannot allocate %d bytes!!\n", thumb_length);
+- exit(1);
+- }
+- fseek (ifp, thumb_offset, SEEK_SET);
+- fread (thumb, 1, thumb_length, ifp);
+- if (thumb_layers && !is_dng) {
+- rgb = (char *) malloc(thumb_length);
+- if (!rgb) {
+- fprintf (stderr, "Cannot allocate %d bytes!!\n", thumb_length);
+- exit(1);
+- }
+- lsize = thumb_length/3;
+- for (i=0; i < thumb_length; i++)
+- rgb[(i%lsize)*3 + i/lsize] = thumb[i];
+- free(thumb);
+- thumb = rgb;
+- }
+- fputs (thumb_head, tfp);
+- fwrite(thumb, 1, thumb_length, tfp);
+- free (thumb);
+-done:
+- fclose (tfp);
+- fprintf (stderr, "Thumbnail image written to %s.\n", thumb_name);
+- return 0;
+-}
+-
+-int main(int argc, char **argv)
+-{
+- int arg;
+-
+- if (argc == 1)
+- {
+- fprintf (stderr,
+- "\nRaw Photo Parser and Thumbnail Extracter"
+- "\nby Dave Coffin, dcoffin a cybercom o net"
+- "\n\nUsage: %s [options] file1.crw file2.crw ...\n", argv[0]);
+- return 1;
+- }
+-
+- for (arg=1; arg < argc; arg++)
+- {
+- fname = argv[arg];
+- ifp = fopen (fname,"rb");
+- if (!ifp) {
+- perror (fname);
+- continue;
+- }
+- printf ("\nParsing %s:\n", fname);
+- identify();
+- fclose (ifp);
+- }
+- return 0;
+-}
--- kfile-plugins/rgb/Makefile.in
+++ kfile-plugins/rgb/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8894,7 +14570,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8903,7 +14579,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8917,7 +14593,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/tga/Makefile.in
+++ kfile-plugins/tga/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8927,7 +14603,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8936,7 +14612,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8950,7 +14626,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/tiff/Makefile.in
+++ kfile-plugins/tiff/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8960,7 +14636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -468,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8969,7 +14645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8983,7 +14659,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/xbm/Makefile.in
+++ kfile-plugins/xbm/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8993,7 +14669,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9002,7 +14678,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9016,7 +14692,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/xpm/Makefile.in
+++ kfile-plugins/xpm/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9026,7 +14702,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -467,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9035,7 +14711,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9049,7 +14725,7 @@
@$(NORMAL_INSTALL)
--- kgamma/kcmkgamma/Makefile.in
+++ kgamma/kcmkgamma/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -269,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9059,7 +14735,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -480,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9068,7 +14744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -518,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9080,7 +14756,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -901,22 +904,22 @@
+@@ -924,22 +927,22 @@
mocs: displaynumber.moc
#>+ 3
@@ -9112,7 +14788,7 @@
KDE_DIST=gammactrl.h xf86configpath.h kgamma.h kgamma.desktop displaynumber.h Makefile.in xvidextwrap.h Makefile.am
--- kgamma/kcmkgamma/pics/Makefile.in
+++ kgamma/kcmkgamma/pics/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9122,7 +14798,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -422,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9131,7 +14807,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9145,7 +14821,7 @@
mostlyclean-libtool:
--- kgamma/Makefile.in
+++ kgamma/Makefile.in
-@@ -214,6 +214,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9155,7 +14831,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -425,7 +428,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9164,7 +14840,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9178,7 +14854,7 @@
mostlyclean-libtool:
--- kgamma/xf86gammacfg/Makefile.in
+++ kgamma/xf86gammacfg/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9188,7 +14864,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -450,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9197,7 +14873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9211,7 +14887,7 @@
@$(NORMAL_INSTALL)
--- kghostview/data/Makefile.in
+++ kghostview/data/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9221,7 +14897,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -419,7 +422,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9230,7 +14906,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9244,7 +14920,7 @@
mostlyclean-libtool:
--- kghostview/Makefile.in
+++ kghostview/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -325,6 +325,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9254,7 +14930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -9263,7 +14939,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9275,7 +14951,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1275,18 +1278,18 @@
+@@ -1298,18 +1301,18 @@
mocs: kgvmainwidget.moc
#>+ 3
@@ -9300,7 +14976,7 @@
#>+ 3
viewcontrol.moc: $(srcdir)/viewcontrol.h
-@@ -1320,7 +1323,7 @@
+@@ -1343,10 +1346,10 @@
#>+ 3
clean-metasources:
@@ -9308,41 +14984,48 @@
+ -rm -f kgvpageview.moc scrollbox.moc thumbnailservice.moc kgvshell.moc infodialog.moc marklist.moc kpswidget.moc logwindow.moc fullscreenfilter.moc kgvmainwidget.moc kdscerrordialog.moc kgv_miniwidget.moc viewcontrol.moc kgv_view.moc kgvdocument.moc
#>+ 2
- KDE_DIST=kgv_part.rc cr16-app-kghostview.png update-to-xt-names.pl kghostview.upd generalsettingswidget.ui viewcontrol.cpp cr128-app-kghostview.png viewcontrol.h kghostviewui.rc cr64-app-kghostview.png configuration.kcfgc Makefile.in cr48-app-kghostview.png cr32-app-kghostview.png gssettingswidget.ui.h gssettingswidget.ui kghostview.kcfg version.h generalsettingswidget.ui.h kgv.h Makefile.am
-@@ -1345,23 +1348,23 @@
+-KDE_DIST=kgv_part.rc update-to-xt-names.pl hi64-app-kghostview.png kghostview.upd hi16-app-kghostview.png generalsettingswidget.ui hi48-app-kghostview.png viewcontrol.cpp viewcontrol.h hi32-app-kghostview.png kghostviewui.rc hi22-app-kghostview.png configuration.kcfgc Makefile.in gssettingswidget.ui.h gssettingswidget.ui kghostview.kcfg version.h generalsettingswidget.ui.h kgv.h Makefile.am hi128-app-kghostview.png
++KDE_DIST=kgv_part.rc update-to-xt-names.pl hi64-app-kghostview.png kghostview.upd hi16-app-kghostview.png generalsettingswidget.ui hi48-app-kghostview.png viewcontrol.cpp hi32-app-kghostview.png viewcontrol.h kghostviewui.rc hi22-app-kghostview.png configuration.kcfgc Makefile.in gssettingswidget.ui.h gssettingswidget.ui kghostview.kcfg version.h generalsettingswidget.ui.h kgv.h Makefile.am hi128-app-kghostview.png
- #>+ 19
+ #>+ 5
+ clean-ui:
+@@ -1368,26 +1371,26 @@
+
+ #>+ 22
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kghostview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kghostview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kghostview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kghostview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kghostview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kghostview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kghostview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kghostview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kghostview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kghostview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kghostview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kghostview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kghostview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
#>+ 15
force-reedit:
-@@ -1414,7 +1417,7 @@
+@@ -1440,7 +1443,7 @@
rm -f libdscparse_la.all_cpp.final libdscparse_la.all_cpp.files
#>+ 11
@@ -9353,7 +15036,7 @@
echo "#define KDE_USE_FINAL 1" >> libkghostviewlib_la.all_cpp.final; \
--- kiconedit/Makefile.in
+++ kiconedit/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -278,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9363,7 +15046,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -494,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9372,7 +15055,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -532,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9384,7 +15067,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -947,18 +950,18 @@
+@@ -970,18 +973,18 @@
mocs: kicon.moc
#>+ 3
@@ -9409,7 +15092,7 @@
#>+ 3
kiconcolors.moc: $(srcdir)/kiconcolors.h
-@@ -968,22 +971,22 @@
+@@ -991,22 +994,22 @@
mocs: kiconcolors.moc
#>+ 3
@@ -9439,7 +15122,7 @@
#>+ 2
KDE_DIST=kiconedit.h kiconeditui.rc kiconedit.desktop kicon.h kcolorgrid.h kiconconfig.h properties.h utils.h Makefile.in kresize.h palettetoolbar.h version.h knew.h Makefile.am kicongrid.h kiconcolors.h
-@@ -1030,7 +1033,7 @@
+@@ -1053,7 +1056,7 @@
#>+ 11
@@ -9448,7 +15131,7 @@
@echo 'creating kiconedit.all_cpp.cpp ...'; \
rm -f kiconedit.all_cpp.files kiconedit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kiconedit.all_cpp.final; \
-@@ -1077,8 +1080,8 @@
+@@ -1096,8 +1099,8 @@
knew.lo: knew.moc
kiconconfig.o: kiconconfig.moc
kiconcolors.o: kiconcolors.moc
@@ -9460,7 +15143,7 @@
nmcheck:
--- kiconedit/pics/icons/Makefile.in
+++ kiconedit/pics/icons/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9470,7 +15153,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -422,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9479,7 +15162,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9493,7 +15176,7 @@
mostlyclean-libtool:
--- kiconedit/pics/Makefile.in
+++ kiconedit/pics/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9503,7 +15186,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -425,7 +428,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9512,7 +15195,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9524,30 +15207,30 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -740,17 +743,17 @@
-
- #>+ 13
+@@ -765,17 +768,17 @@
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kiconedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kiconedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kiconedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kiconedit.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kiconedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kiconedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kiconedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kiconedit.png
#>+ 15
- force-reedit:
--- kiconedit/pics/toolbar/Makefile.in
+++ kiconedit/pics/toolbar/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9557,7 +15240,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -443,7 +446,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9566,7 +15249,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9578,7 +15261,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -619,7 +622,7 @@
+@@ -642,7 +645,7 @@
.NOEXPORT:
#>+ 2
@@ -9589,7 +15272,7 @@
docs-am:
--- kmrml/kmrml/kcontrol/Makefile.in
+++ kmrml/kmrml/kcontrol/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9599,7 +15282,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -474,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9608,7 +15291,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -512,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9622,7 +15305,7 @@
@$(NORMAL_INSTALL)
--- kmrml/kmrml/lib/Makefile.in
+++ kmrml/kmrml/lib/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9632,7 +15315,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -458,7 +461,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9641,7 +15324,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -496,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9655,7 +15338,7 @@
clean-noinstLTLIBRARIES:
--- kmrml/kmrml/Makefile.in
+++ kmrml/kmrml/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -311,6 +311,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9665,7 +15348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -542,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9674,7 +15357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9686,7 +15369,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1142,18 +1145,18 @@
+@@ -1165,18 +1168,18 @@
mocs: browser.moc
#>+ 3
@@ -9711,7 +15394,7 @@
#>+ 3
algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-@@ -1196,7 +1199,7 @@
+@@ -1219,7 +1222,7 @@
#>+ 3
clean-metasources:
@@ -9720,7 +15403,7 @@
#>+ 2
KDE_DIST=mrml_creator.h browser.h mrml.protocol mrml-servicemenu.desktop propertywidgets.h mrml_part.desktop mrml_view.h algorithmdialog.h mrml_elements.h propertysheet.h collectioncombo.h mrml.h Makefile.in algorithmcombo.h mrml.desktop loader.h propertywidgets.cpp mrml_part.h Makefile.am
-@@ -1247,7 +1250,7 @@
+@@ -1270,7 +1273,7 @@
#>+ 11
@@ -9731,7 +15414,7 @@
echo "#define KDE_USE_FINAL 1" >> libkmrmlpart_la.all_cpp.final; \
--- kmrml/kmrml/server/Makefile.in
+++ kmrml/kmrml/server/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9741,7 +15424,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -465,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9750,7 +15433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9764,7 +15447,7 @@
@$(NORMAL_INSTALL)
--- kmrml/Makefile.in
+++ kmrml/Makefile.in
-@@ -214,6 +214,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9774,7 +15457,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -425,7 +428,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9783,7 +15466,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9797,7 +15480,7 @@
mostlyclean-libtool:
--- kolourpaint/cursors/Makefile.in
+++ kolourpaint/cursors/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9807,7 +15490,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -453,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9816,7 +15499,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -491,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9830,7 +15513,7 @@
clean-noinstLTLIBRARIES:
--- kolourpaint/Makefile.in
+++ kolourpaint/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -303,6 +303,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9840,7 +15523,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -545,7 +548,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9849,7 +15532,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -583,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9861,18 +15544,59 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1083,7 +1086,7 @@
- -rm -f kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpcommandhistory.moc kpselection.moc kpview.moc kpsinglekeytriggersaction.moc
+@@ -1088,13 +1091,6 @@
+ mocs: kpdocument.moc
+ #>+ 3
+-kpview.moc: $(srcdir)/kpview.h
+- $(MOC) $(srcdir)/kpview.h -o kpview.moc
+-
+-#>+ 2
+-mocs: kpview.moc
+-
+-#>+ 3
+ kpcommandhistory.moc: $(srcdir)/kpcommandhistory.h
+ $(MOC) $(srcdir)/kpcommandhistory.h -o kpcommandhistory.moc
+
+@@ -1109,6 +1105,13 @@
+ mocs: kpselection.moc
+
+ #>+ 3
++kpview.moc: $(srcdir)/kpview.h
++ $(MOC) $(srcdir)/kpview.h -o kpview.moc
++
++#>+ 2
++mocs: kpview.moc
++
++#>+ 3
+ kpsinglekeytriggersaction.moc: $(srcdir)/kpsinglekeytriggersaction.h
+ $(MOC) $(srcdir)/kpsinglekeytriggersaction.h -o kpsinglekeytriggersaction.moc
+
+@@ -1117,10 +1120,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kptool.moc kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpcommandhistory.moc kpselection.moc kpsinglekeytriggersaction.moc
++ -rm -f kptool.moc kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpcommandhistory.moc kpselection.moc kpview.moc kpsinglekeytriggersaction.moc
+
#>+ 2
--KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpviewscrollablecontainer.h kpselectiontransparency.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
-+KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpselectiontransparency.h kpviewscrollablecontainer.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
+-KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpviewscrollablecontainer.h kpselectiontransparency.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kptool.h kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
++KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpselectiontransparency.h kpviewscrollablecontainer.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kptool.h kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
#>+ 2
docs-am:
+@@ -1164,7 +1167,7 @@
+
+
+ #>+ 11
+-kolourpaint.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kolourpaint.cpp kolourpaintlicense.h kolourpaintversion.h $(srcdir)/kpdocument.cpp $(srcdir)/kpdocumentmetainfo.cpp $(srcdir)/kpdocumentsaveoptions.cpp $(srcdir)/kpdocumentsaveoptionswidget.cpp $(srcdir)/kpview.cpp $(srcdir)/kpcolor.cpp $(srcdir)/kpcommandhistory.cpp $(srcdir)/kpmainwindow.cpp $(srcdir)/kpmainwindow_edit.cpp $(srcdir)/kpmainwindow_help.cpp $(srcdir)/kpmainwindow_image.cpp $(srcdir)/kpmainwindow_tools.cpp $(srcdir)/kpmainwindow_file.cpp $(srcdir)/kpmainwindow_settings.cpp $(srcdir)/kpmainwindow_statusbar.cpp $(srcdir)/kpmainwindow_text.cpp $(srcdir)/kpmainwindow_view.cpp $(srcdir)/kpselection.cpp $(srcdir)/kpselectiondrag.cpp $(srcdir)/kpselectiontransparency.cpp $(srcdir)/kpsinglekeytriggersaction.cpp $(srcdir)/kptemppixmap.cpp $(srcdir)/kptextstyle.cpp $(srcdir)/kpthumbnail.cpp $(srcdir)/kptool.cpp $(srcdir)/kpviewmanager.cpp $(srcdir)/kpviewscrollablecontainer.cpp $(srcdir)/kpwidgetmapper.cpp kptool.moc kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpselection.moc kpcommandhistory.moc kpview.moc kpsinglekeytriggersaction.moc
++kolourpaint.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kolourpaint.cpp kolourpaintlicense.h kolourpaintversion.h $(srcdir)/kpdocument.cpp $(srcdir)/kpdocumentmetainfo.cpp $(srcdir)/kpdocumentsaveoptions.cpp $(srcdir)/kpdocumentsaveoptionswidget.cpp $(srcdir)/kpview.cpp $(srcdir)/kpcolor.cpp $(srcdir)/kpcommandhistory.cpp $(srcdir)/kpmainwindow.cpp $(srcdir)/kpmainwindow_edit.cpp $(srcdir)/kpmainwindow_help.cpp $(srcdir)/kpmainwindow_image.cpp $(srcdir)/kpmainwindow_tools.cpp $(srcdir)/kpmainwindow_file.cpp $(srcdir)/kpmainwindow_settings.cpp $(srcdir)/kpmainwindow_statusbar.cpp $(srcdir)/kpmainwindow_text.cpp $(srcdir)/kpmainwindow_view.cpp $(srcdir)/kpselection.cpp $(srcdir)/kpselectiondrag.cpp $(srcdir)/kpselectiontransparency.cpp $(srcdir)/kpsinglekeytriggersaction.cpp $(srcdir)/kptemppixmap.cpp $(srcdir)/kptextstyle.cpp $(srcdir)/kpthumbnail.cpp $(srcdir)/kptool.cpp $(srcdir)/kpviewmanager.cpp $(srcdir)/kpviewscrollablecontainer.cpp $(srcdir)/kpwidgetmapper.cpp kptool.moc kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpselection.moc kpcommandhistory.moc kpsinglekeytriggersaction.moc
+ @echo 'creating kolourpaint.all_cpp.cpp ...'; \
+ rm -f kolourpaint.all_cpp.files kolourpaint.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kolourpaint.all_cpp.final; \
--- kolourpaint/pics/custom/Makefile.in
+++ kolourpaint/pics/custom/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9882,7 +15606,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -426,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9891,7 +15615,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -464,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9905,7 +15629,7 @@
mostlyclean-libtool:
--- kolourpaint/pics/Makefile.in
+++ kolourpaint/pics/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9915,7 +15639,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -427,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -9924,7 +15648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9936,111 +15660,415 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -741,70 +744,70 @@
+@@ -764,230 +767,230 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=hi48-app-kolourpaint.png hi32-app-kolourpaint.png hi16-action-tool_ellipse.png hi16-action-tool_elliptical_selection.png hi16-action-tool_spraycan.png hi16-action-tool_color_picker.png hi16-action-tool_color_washer.png hi16-action-tool_rect_selection.png hi16-action-tool_polyline.png hi16-action-tool_brush.png hi16-action-tool_eraser.png hi16-action-tool_flood_fill.png hi16-action-tool_text.png hi16-app-kolourpaint.png Makefile.in hi16-action-tool_line.png hi16-action-tool_polygon.png hi16-action-tool_free_form_selection.png hi16-action-tool_rounded_rectangle.png hi16-action-tool_curve.png hi16-action-tool_pen.png Makefile.am hi16-action-tool_rectangle.png
-+KDE_DIST=hi48-app-kolourpaint.png hi32-app-kolourpaint.png hi16-action-tool_ellipse.png hi16-action-tool_elliptical_selection.png hi16-action-tool_spraycan.png hi16-action-tool_color_picker.png hi16-action-tool_color_washer.png hi16-action-tool_rect_selection.png hi16-action-tool_polyline.png hi16-action-tool_brush.png hi16-action-tool_eraser.png hi16-action-tool_flood_fill.png hi16-action-tool_text.png hi16-app-kolourpaint.png Makefile.in hi16-action-tool_polygon.png hi16-action-tool_line.png hi16-action-tool_free_form_selection.png hi16-action-tool_curve.png hi16-action-tool_rounded_rectangle.png hi16-action-tool_pen.png Makefile.am hi16-action-tool_rectangle.png
+-KDE_DIST=cr22-action-tool_curve.png hi48-app-kolourpaint.png cr32-action-tool_rectangle.png cr32-action-tool_line.png hi32-app-kolourpaint.png cr16-action-tool_flood_fill.png crsc-action-tool_elliptical_selection.svgz cr48-action-tool_color_washer.png crsc-action-tool_spraycan.svgz crsc-action-tool_text.svgz crsc-action-tool_eraser.svgz cr48-action-tool_line.png cr32-action-tool_rounded_rectangle.png cr16-action-tool_curve.png cr32-action-tool_brush.png cr32-action-tool_free_form_selection.png crsc-action-tool_free_form_selection.svgz crsc-action-tool_flood_fill.svgz cr16-action-tool_line.png crsc-action-tool_polygon.svgz cr48-action-tool_curve.png cr16-action-tool_polyline.png cr22-action-tool_color_picker.png cr22-action-tool_elliptical_selection.png cr22-action-tool_text.png cr48-action-tool_polyline.png cr22-action-tool_line.png cr32-action-tool_spraycan.png cr22-action-tool_spraycan.png hi22-app-kolourpaint.png crsc-action-tool_brush.svgz cr22-action-tool_pen.png cr22-action-tool_brush.png cr22-action-tool_ellipse.png cr16-action-tool_rect_selection.png crsc-action-tool_color_picker.svgz cr16-action-tool_polygon.png cr16-action-tool_color_washer.png cr48-action-tool_polygon.png crsc-action-tool_ellipse.svgz cr32-action-tool_rect_selection.png cr48-action-tool_ellipse.png cr16-action-tool_free_form_selection.png cr32-action-tool_flood_fill.png crsc-action-tool_pen.svgz cr32-action-tool_eraser.png cr32-action-tool_text.png cr22-action-tool_free_form_selection.png cr16-action-tool_color_picker.png cr48-action-tool_brush.png cr48-action-tool_spraycan.png crsc-action-tool_line.svgz cr48-action-tool_flood_fill.png cr16-action-tool_ellipse.png cr22-action-tool_rectangle.png cr32-action-tool_elliptical_selection.png cr22-action-tool_eraser.png cr22-action-tool_polyline.png cr16-action-tool_elliptical_selection.png cr16-action-tool_text.png cr22-action-tool_polygon.png cr48-action-tool_eraser.png cr48-action-tool_text.png hi16-app-kolourpaint.png crsc-action-tool_color_washer.svgz cr32-action-tool_pen.png cr48-action-tool_color_picker.png cr22-action-tool_flood_fill.png crsc-action-tool_rectangle.svgz cr48-action-tool_free_form_selection.png cr16-action-tool_spraycan.png Makefile.in cr22-action-tool_color_washer.png cr48-action-tool_pen.png cr22-action-tool_rounded_rectangle.png crsc-action-tool_curve.svgz cr48-action-tool_rounded_rectangle.png cr16-action-tool_pen.png crsc-action-tool_polyline.svgz cr16-action-tool_rounded_rectangle.png cr48-action-tool_rectangle.png cr48-action-tool_elliptical_selection.png cr32-action-tool_polyline.png cr32-action-tool_ellipse.png cr32-action-tool_color_washer.png hisc-app-kolourpaint.svgz cr32-action-tool_polygon.png cr16-action-tool_eraser.png cr32-action-tool_color_picker.png cr22-action-tool_rect_selection.png cr16-action-tool_rectangle.png cr48-action-tool_rect_selection.png crsc-action-tool_rounded_rectangle.svgz cr32-action-tool_curve.png Makefile.am cr16-action-tool_brush.png crsc-action-tool_rect_selection.svgz
++KDE_DIST=cr22-action-tool_curve.png hi48-app-kolourpaint.png hi32-app-kolourpaint.png cr32-action-tool_line.png cr32-action-tool_rectangle.png cr16-action-tool_flood_fill.png crsc-action-tool_elliptical_selection.svgz cr48-action-tool_color_washer.png crsc-action-tool_spraycan.svgz crsc-action-tool_text.svgz cr48-action-tool_line.png crsc-action-tool_eraser.svgz cr32-action-tool_rounded_rectangle.png cr32-action-tool_brush.png cr16-action-tool_curve.png cr32-action-tool_free_form_selection.png crsc-action-tool_flood_fill.svgz crsc-action-tool_free_form_selection.svgz cr16-action-tool_line.png crsc-action-tool_polygon.svgz cr48-action-tool_curve.png cr22-action-tool_elliptical_selection.png cr16-action-tool_polyline.png cr22-action-tool_color_picker.png cr48-action-tool_polyline.png cr22-action-tool_text.png cr22-action-tool_line.png cr32-action-tool_spraycan.png cr22-action-tool_spraycan.png hi22-app-kolourpaint.png crsc-action-tool_brush.svgz cr22-action-tool_pen.png cr22-action-tool_brush.png cr22-action-tool_ellipse.png cr16-action-tool_rect_selection.png crsc-action-tool_color_picker.svgz cr16-action-tool_polygon.png cr16-action-tool_color_washer.png cr48-action-tool_polygon.png cr32-action-tool_rect_selection.png crsc-action-tool_ellipse.svgz cr48-action-tool_ellipse.png cr16-action-tool_free_form_selection.png cr32-action-tool_flood_fill.png crsc-action-tool_pen.svgz cr32-action-tool_text.png cr32-action-tool_eraser.png cr22-action-tool_free_form_selection.png cr16-action-tool_color_picker.png cr48-action-tool_brush.png cr48-action-tool_spraycan.png crsc-action-tool_line.svgz cr48-action-tool_flood_fill.png cr16-action-tool_ellipse.png cr32-action-tool_elliptical_selection.png cr22-action-tool_rectangle.png cr22-action-tool_polyline.png cr22-action-tool_eraser.png cr16-action-tool_elliptical_selection.png cr16-action-tool_text.png cr22-action-tool_polygon.png cr48-action-tool_eraser.png cr48-action-tool_text.png hi16-app-kolourpaint.png crsc-action-tool_color_washer.svgz cr32-action-tool_pen.png cr48-action-tool_color_picker.png cr22-action-tool_flood_fill.png crsc-action-tool_rectangle.svgz cr48-action-tool_free_form_selection.png cr16-action-tool_spraycan.png cr22-action-tool_color_washer.png Makefile.in crsc-action-tool_curve.svgz cr48-action-tool_pen.png cr22-action-tool_rounded_rectangle.png cr48-action-tool_rounded_rectangle.png cr16-action-tool_pen.png crsc-action-tool_polyline.svgz cr48-action-tool_rectangle.png cr16-action-tool_rounded_rectangle.png cr48-action-tool_elliptical_selection.png cr32-action-tool_polyline.png cr32-action-tool_ellipse.png cr32-action-tool_color_washer.png cr32-action-tool_polygon.png hisc-app-kolourpaint.svgz cr16-action-tool_eraser.png cr32-action-tool_color_picker.png cr22-action-tool_rect_selection.png cr16-action-tool_rectangle.png cr48-action-tool_rect_selection.png crsc-action-tool_rounded_rectangle.svgz cr32-action-tool_curve.png Makefile.am cr16-action-tool_brush.png crsc-action-tool_rect_selection.svgz
#>+ 2
docs-am:
- #>+ 59
+ #>+ 219
install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
$(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polygon.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_spraycan.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_eraser.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_pen.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_picker.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_ellipse.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_curve.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_line.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_washer.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polygon.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_flood_fill.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_brush.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_washer.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rect_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_spraycan.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_spraycan.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_eraser.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_elliptical_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rounded_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_text.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_line.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_free_form_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_free_form_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_brush.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_curve.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_curve.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_text.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_text.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rounded_rectangle.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_line.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_elliptical_selection.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polyline.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_curve.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_curve.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_elliptical_selection.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_brush.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_eraser.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_free_form_selection.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rect_selection.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rectangle.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_free_form_selection.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_picker.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_line.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_spraycan.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_pen.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polyline.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_ellipse.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_brush.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_elliptical_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_free_form_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rectangle.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_eraser.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_picker.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_flood_fill.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polyline.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rounded_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_pen.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
$(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/apps
$(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_curve.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_text.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_spraycan.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_eraser.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polygon.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_spraycan.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_curve.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_text.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rounded_rectangle.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_elliptical_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polyline.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_curve.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_elliptical_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_brush.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_eraser.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_free_form_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rect_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_rectangle.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_free_form_selection.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_picker.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_flood_fill.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_line.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_spraycan.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_pen.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rectangle.png
+- -rm -f $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
-rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_ellipse.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
#>+ 15
force-reedit:
--- kolourpaint/pixmapfx/Makefile.in
+++ kolourpaint/pixmapfx/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10050,7 +16078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -467,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10059,7 +16087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10071,7 +16099,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -729,6 +732,20 @@
+@@ -752,6 +755,20 @@
mocs: kpeffectflatten.moc
#>+ 3
@@ -10092,7 +16120,7 @@
kpeffectinvert.moc: $(srcdir)/kpeffectinvert.h
$(MOC) $(srcdir)/kpeffectinvert.h -o kpeffectinvert.moc
-@@ -750,36 +767,22 @@
+@@ -773,36 +790,22 @@
mocs: kpeffectemboss.moc
#>+ 3
@@ -10136,7 +16164,7 @@
#>+ 2
KDE_DIST=kpeffectsdialog.h kpeffectemboss.h kpeffectbalance.h kpfloodfill.h kpeffectblursharpen.h kpeffectinvert.h kpeffectreducecolors.h kppixmapfx.h kpeffectflatten.h Makefile.in kpcoloreffect.h Makefile.am
-@@ -826,7 +829,7 @@
+@@ -849,7 +852,7 @@
#>+ 11
@@ -10145,7 +16173,7 @@
@echo 'creating libkolourpaintpixmapfx_la.all_cpp.cpp ...'; \
rm -f libkolourpaintpixmapfx_la.all_cpp.files libkolourpaintpixmapfx_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintpixmapfx_la.all_cpp.final; \
-@@ -868,8 +871,8 @@
+@@ -887,8 +890,8 @@
#>+ 19
kpeffectemboss.lo: kpeffectemboss.moc
kpeffectsdialog.o: kpeffectsdialog.moc
@@ -10155,7 +16183,7 @@
kpeffectflatten.o: kpeffectflatten.moc
nmcheck:
kpeffectbalance.lo: kpeffectbalance.moc
-@@ -880,7 +883,7 @@
+@@ -899,7 +902,7 @@
kpeffectreducecolors.o: kpeffectreducecolors.moc
kpeffectflatten.lo: kpeffectflatten.moc
kpeffectinvert.o: kpeffectinvert.moc
@@ -10166,7 +16194,7 @@
kpeffectsdialog.lo: kpeffectsdialog.moc
--- kolourpaint/tools/Makefile.in
+++ kolourpaint/tools/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -263,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10176,7 +16204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -516,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10185,7 +16213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -554,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10197,18 +16225,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -958,7 +961,7 @@
- -rm -f kptool.moc kptoolcolorwasher.moc kptoolflip.moc kptooltext.moc kptoolrectangle.moc kptoolroundedrectangle.moc kptoolpen.moc kptoolairspray.moc kptoolfloodfill.moc kptoolpolyline.moc kptoolskew.moc kptoolpreviewdialog.moc kptoolselection.moc kptoolresizescale.moc kptoolbrush.moc kptoolcolorpicker.moc kptoolline.moc kptoolpolygon.moc kptooleraser.moc kptoolcurve.moc kptoolaction.moc kptoolellipse.moc kptoolrotate.moc
+@@ -971,7 +974,7 @@
+ -rm -f kptoolcolorwasher.moc kptoolflip.moc kptooltext.moc kptoolrectangle.moc kptoolroundedrectangle.moc kptoolpen.moc kptoolairspray.moc kptoolfloodfill.moc kptoolpolyline.moc kptoolskew.moc kptoolpreviewdialog.moc kptoolselection.moc kptoolresizescale.moc kptoolbrush.moc kptoolcolorpicker.moc kptoolline.moc kptoolpolygon.moc kptooleraser.moc kptoolcurve.moc kptoolaction.moc kptoolellipse.moc kptoolrotate.moc
#>+ 2
--KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolflip.h kptoolrectangle.h kptoolselection.h kptoolpolygon.h kptoolautocrop.h kptoolcurve.h kptooltext.h kptool.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
-+KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolflip.h kptoolrectangle.h kptoolselection.h kptoolpolygon.h kptoolcurve.h kptoolautocrop.h kptooltext.h kptool.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
+-KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolflip.h kptoolrectangle.h kptoolselection.h kptoolpolygon.h kptoolautocrop.h kptoolcurve.h kptooltext.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
++KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolflip.h kptoolrectangle.h kptoolselection.h kptoolpolygon.h kptoolcurve.h kptoolautocrop.h kptooltext.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
#>+ 2
docs-am:
--- kolourpaint/views/Makefile.in
+++ kolourpaint/views/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10218,7 +16246,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -458,7 +461,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10227,7 +16255,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -496,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10239,7 +16267,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -707,18 +710,18 @@
+@@ -730,18 +733,18 @@
.NOEXPORT:
#>+ 3
@@ -10264,7 +16292,7 @@
#>+ 3
kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-@@ -736,7 +739,7 @@
+@@ -759,7 +762,7 @@
#>+ 3
clean-metasources:
@@ -10273,7 +16301,7 @@
#>+ 2
KDE_DIST=kpunzoomedthumbnailview.h kpzoomedthumbnailview.h kpzoomedview.h Makefile.in Makefile.am kpthumbnailview.h
-@@ -783,7 +786,7 @@
+@@ -806,7 +809,7 @@
#>+ 11
@@ -10282,7 +16310,7 @@
@echo 'creating libkolourpaintviews_la.all_cpp.cpp ...'; \
rm -f libkolourpaintviews_la.all_cpp.files libkolourpaintviews_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintviews_la.all_cpp.final; \
-@@ -824,8 +827,8 @@
+@@ -843,8 +846,8 @@
#>+ 11
nmcheck:
@@ -10294,7 +16322,7 @@
nmcheck-am: nmcheck
--- kolourpaint/widgets/Makefile.in
+++ kolourpaint/widgets/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10304,7 +16332,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -474,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10313,7 +16341,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -512,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10325,7 +16353,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -774,18 +777,18 @@
+@@ -797,18 +800,18 @@
mocs: kpresizesignallinglabel.moc
#>+ 3
@@ -10350,7 +16378,7 @@
#>+ 3
kptoolwidgetfillstyle.moc: $(srcdir)/kptoolwidgetfillstyle.h
-@@ -817,10 +820,10 @@
+@@ -840,10 +843,10 @@
#>+ 3
clean-metasources:
@@ -10363,7 +16391,7 @@
#>+ 2
docs-am:
-@@ -864,7 +867,7 @@
+@@ -887,7 +890,7 @@
#>+ 11
@@ -10372,7 +16400,7 @@
@echo 'creating libkolourpaintwidgets_la.all_cpp.cpp ...'; \
rm -f libkolourpaintwidgets_la.all_cpp.files libkolourpaintwidgets_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintwidgets_la.all_cpp.final; \
-@@ -913,8 +916,8 @@
+@@ -932,8 +935,8 @@
kpresizesignallinglabel.o: kpresizesignallinglabel.moc
kptoolwidgetfillstyle.o: kptoolwidgetfillstyle.moc
kpcolorsimilaritydialog.o: kpcolorsimilaritydialog.moc
@@ -10384,7 +16412,7 @@
kptoolwidgeterasersize.lo: kptoolwidgeterasersize.moc
--- kooka/Makefile.in
+++ kooka/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -294,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10394,7 +16422,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -527,7 +530,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10403,7 +16431,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -565,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10415,7 +16443,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -980,81 +983,67 @@
+@@ -1003,81 +1006,67 @@
.NOEXPORT:
#>+ 3
@@ -10524,7 +16552,7 @@
#>+ 3
imageselectline.moc: $(srcdir)/imageselectline.h
-@@ -1078,6 +1067,20 @@
+@@ -1101,6 +1090,20 @@
mocs: scanpackager.moc
#>+ 3
@@ -10545,7 +16573,7 @@
kookaview.moc: $(srcdir)/kookaview.h
$(MOC) $(srcdir)/kookaview.h -o kookaview.moc
-@@ -1085,11 +1088,11 @@
+@@ -1108,11 +1111,11 @@
mocs: kookaview.moc
#>+ 3
@@ -10560,7 +16588,7 @@
#>+ 3
kooka.moc: $(srcdir)/kooka.h
-@@ -1107,7 +1110,7 @@
+@@ -1130,7 +1133,7 @@
#>+ 3
clean-metasources:
@@ -10569,7 +16597,7 @@
#>+ 2
KDE_DIST=README.KADMOS kookaui.rc WARNING kooka.desktop CREDITS kookarc CHANGES configure.in.in Makefile.in dwmenuaction.h version.h Makefile.am
-@@ -1154,7 +1157,7 @@
+@@ -1177,7 +1180,7 @@
#>+ 11
@@ -10578,7 +16606,7 @@
@echo 'creating kooka.all_cpp.cpp ...'; \
rm -f kooka.all_cpp.files kooka.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kooka.all_cpp.final; \
-@@ -1199,14 +1202,14 @@
+@@ -1218,14 +1221,14 @@
kocrbase.lo: kocrbase.moc
imgnamecombo.o: imgnamecombo.moc
img_saver.o: img_saver.moc
@@ -10598,7 +16626,7 @@
imgprintdialog.lo: imgprintdialog.moc
--- kooka/pics/Makefile.in
+++ kooka/pics/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10608,7 +16636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -426,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10617,7 +16645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -464,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10629,7 +16657,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -602,7 +605,7 @@
+@@ -625,7 +628,7 @@
.NOEXPORT:
#>+ 2
@@ -10640,7 +16668,7 @@
docs-am:
--- kpdf/conf/Makefile.in
+++ kpdf/conf/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10650,7 +16678,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -463,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10659,7 +16687,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -501,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10671,9 +16699,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+--- kpdf/core/generator_kimgio/Makefile.in
++++ kpdf/core/generator_kimgio/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@
+@@ -442,7 +445,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*) \
+@@ -480,9 +483,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
+
+ clean-noinstLTLIBRARIES:
--- kpdf/core/generator_pdf/Makefile.in
+++ kpdf/core/generator_pdf/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10683,7 +16744,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10692,7 +16753,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10706,7 +16767,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/core/Makefile.in
+++ kpdf/core/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10716,7 +16777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -464,7 +467,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10725,7 +16786,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10739,7 +16800,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/Makefile.in
+++ kpdf/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -273,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10749,7 +16810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -494,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10758,7 +16819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -532,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10770,45 +16831,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -966,26 +969,26 @@
+@@ -973,7 +976,7 @@
+ -rm -f part.moc
- #>+ 22
+ #>+ 2
+-KDE_DIST=README.internals.png configure.in.bot hi16-app-kpdf.png hi32-app-kpdf.png kpdf_part.desktop hi64-app-kpdf.png hi48-app-kpdf.png configure.in.in part.h Makefile.in hi128-app-kpdf.png dcop.h hisc-app-kpdf.svgz part.rc hi22-app-kpdf.png Makefile.am VERSION
++KDE_DIST=README.internals.png configure.in.bot hi16-app-kpdf.png hi32-app-kpdf.png kpdf_part.desktop hi64-app-kpdf.png hi48-app-kpdf.png configure.in.in part.h Makefile.in hi128-app-kpdf.png dcop.h part.rc hisc-app-kpdf.svgz hi22-app-kpdf.png Makefile.am VERSION
+
+ #>+ 4
+ clean-idl:
+@@ -989,29 +992,29 @@
+
+ #>+ 25
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kpdf.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kpdf.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kpdf.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
#>+ 15
force-reedit:
--- kpdf/shell/Makefile.in
+++ kpdf/shell/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10818,7 +16897,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -465,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10827,7 +16906,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10841,7 +16920,7 @@
@$(NORMAL_INSTALL)
--- kpdf/ui/Makefile.in
+++ kpdf/ui/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10851,7 +16930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -452,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10860,7 +16939,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -490,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10872,7 +16951,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -748,25 +751,25 @@
+@@ -771,25 +774,25 @@
mocs: searchwidget.moc
#>+ 3
@@ -10906,7 +16985,7 @@
#>+ 2
docs-am:
-@@ -810,7 +813,7 @@
+@@ -833,7 +836,7 @@
#>+ 11
@@ -10917,7 +16996,7 @@
echo "#define KDE_USE_FINAL 1" >> libkpdfui_la.all_cpp.final; \
--- kpdf/xpdf/fofi/Makefile.in
+++ kpdf/xpdf/fofi/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10927,7 +17006,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -450,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10936,7 +17015,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10950,7 +17029,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/goo/Makefile.in
+++ kpdf/xpdf/goo/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10960,7 +17039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -454,7 +457,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -10969,7 +17048,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -492,9 +495,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10983,7 +17062,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/Makefile.in
+++ kpdf/xpdf/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10993,7 +17072,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11002,7 +17081,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11016,7 +17095,7 @@
mostlyclean-libtool:
--- kpdf/xpdf/splash/Makefile.in
+++ kpdf/xpdf/splash/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11026,7 +17105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -460,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11035,7 +17114,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -498,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11049,7 +17128,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/xpdf/Makefile.in
+++ kpdf/xpdf/xpdf/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -263,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11059,7 +17138,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -481,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11068,7 +17147,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -519,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11080,18 +17159,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -761,7 +764,7 @@
+@@ -788,7 +791,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
-+KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
+-KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h SecurityHandler.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h UGString.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
++KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h SecurityHandler.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h UGString.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
#>+ 2
docs-am:
--- kpovmodeler/examples/includes/inlined/Makefile.in
+++ kpovmodeler/examples/includes/inlined/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11101,7 +17180,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -422,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11110,7 +17189,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11124,7 +17203,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/includes/Makefile.in
+++ kpovmodeler/examples/includes/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11134,7 +17213,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11143,7 +17222,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11157,7 +17236,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/includes/original/Makefile.in
+++ kpovmodeler/examples/includes/original/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11167,7 +17246,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -422,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11176,7 +17255,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11190,7 +17269,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/Makefile.in
+++ kpovmodeler/examples/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11200,7 +17279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11209,7 +17288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11223,7 +17302,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/advanced/Makefile.in
+++ kpovmodeler/examples/scenes/advanced/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11233,7 +17312,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -419,7 +422,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11242,7 +17321,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11256,7 +17335,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/csg/Makefile.in
+++ kpovmodeler/examples/scenes/csg/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11266,7 +17345,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -419,7 +422,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11275,7 +17354,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11289,7 +17368,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/interior/Makefile.in
+++ kpovmodeler/examples/scenes/interior/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11299,7 +17378,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -419,7 +422,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11308,7 +17387,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11322,7 +17401,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/lights/Makefile.in
+++ kpovmodeler/examples/scenes/lights/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11332,7 +17411,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -419,7 +422,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11341,7 +17420,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11355,7 +17434,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/Makefile.in
+++ kpovmodeler/examples/scenes/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11365,7 +17444,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11374,7 +17453,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11388,7 +17467,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/objects/Makefile.in
+++ kpovmodeler/examples/scenes/objects/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11398,7 +17477,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -421,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11407,7 +17486,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -459,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11421,7 +17500,7 @@
mostlyclean-libtool:
--- kpovmodeler/Makefile.in
+++ kpovmodeler/Makefile.in
-@@ -439,6 +439,9 @@
+@@ -450,6 +450,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11431,7 +17510,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -955,7 +958,7 @@
+@@ -978,7 +981,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11440,7 +17519,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -993,9 +996,9 @@
+@@ -1016,9 +1019,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11452,7 +17531,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1769,18 +1772,18 @@
+@@ -1792,18 +1795,18 @@
mocs: pmcylinderedit.moc
#>+ 3
@@ -11477,7 +17556,7 @@
#>+ 3
pmblobedit.moc: $(srcdir)/pmblobedit.h
-@@ -1818,18 +1821,18 @@
+@@ -1841,18 +1844,18 @@
mocs: pmobjectselect.moc
#>+ 3
@@ -11502,7 +17581,7 @@
#>+ 3
pmcameraedit.moc: $(srcdir)/pmcameraedit.h
-@@ -1839,18 +1842,18 @@
+@@ -1862,18 +1865,18 @@
mocs: pmcameraedit.moc
#>+ 3
@@ -11527,7 +17606,7 @@
#>+ 3
pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-@@ -1874,25 +1877,25 @@
+@@ -1897,25 +1900,25 @@
mocs: pmdockwidget_private.moc
#>+ 3
@@ -11562,7 +17641,7 @@
#>+ 3
pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
-@@ -1902,11 +1905,11 @@
+@@ -1925,11 +1928,11 @@
mocs: pmlightgroupedit.moc
#>+ 3
@@ -11577,7 +17656,7 @@
#>+ 3
pmactions.moc: $(srcdir)/pmactions.h
-@@ -1930,13 +1933,6 @@
+@@ -1953,13 +1956,6 @@
mocs: pmlibrarybrowser.moc
#>+ 3
@@ -11591,7 +17670,7 @@
pmlightedit.moc: $(srcdir)/pmlightedit.h
$(MOC) $(srcdir)/pmlightedit.h -o pmlightedit.moc
-@@ -1944,11 +1940,11 @@
+@@ -1967,11 +1963,11 @@
mocs: pmlightedit.moc
#>+ 3
@@ -11606,7 +17685,7 @@
#>+ 3
pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-@@ -1958,6 +1954,13 @@
+@@ -1981,6 +1977,13 @@
mocs: pmobjectlibrarysettings.moc
#>+ 3
@@ -11620,7 +17699,7 @@
pmfactory.moc: $(srcdir)/pmfactory.h
$(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
-@@ -1986,18 +1989,18 @@
+@@ -2009,18 +2012,18 @@
mocs: pmlatheedit.moc
#>+ 3
@@ -11645,7 +17724,7 @@
#>+ 3
pmclippedbyedit.moc: $(srcdir)/pmclippedbyedit.h
-@@ -2035,18 +2038,18 @@
+@@ -2058,18 +2061,18 @@
mocs: pmdialogeditbase.moc
#>+ 3
@@ -11670,7 +17749,7 @@
#>+ 3
pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-@@ -2175,6 +2178,13 @@
+@@ -2198,6 +2201,13 @@
mocs: pmphotonsedit.moc
#>+ 3
@@ -11684,7 +17763,7 @@
pmsoredit.moc: $(srcdir)/pmsoredit.h
$(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-@@ -2196,11 +2206,11 @@
+@@ -2219,11 +2229,11 @@
mocs: pmdeclareedit.moc
#>+ 3
@@ -11699,7 +17778,7 @@
#>+ 3
pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-@@ -2210,25 +2220,25 @@
+@@ -2233,25 +2243,25 @@
mocs: pmsqeedit.moc
#>+ 3
@@ -11734,7 +17813,7 @@
#>+ 3
pmglview.moc: $(srcdir)/pmglview.h
-@@ -2238,13 +2248,6 @@
+@@ -2261,13 +2271,6 @@
mocs: pmglview.moc
#>+ 3
@@ -11748,7 +17827,7 @@
pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
$(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
-@@ -2357,18 +2360,18 @@
+@@ -2380,18 +2383,18 @@
mocs: pmpovrayrenderwidget.moc
#>+ 3
@@ -11773,7 +17852,7 @@
#>+ 3
pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-@@ -2392,18 +2395,18 @@
+@@ -2415,18 +2418,18 @@
mocs: pmrendermanager.moc
#>+ 3
@@ -11798,7 +17877,7 @@
#>+ 3
pmheightfieldedit.moc: $(srcdir)/pmheightfieldedit.h
-@@ -2427,18 +2430,18 @@
+@@ -2450,18 +2453,18 @@
mocs: pmvectoredit.moc
#>+ 3
@@ -11823,7 +17902,7 @@
#>+ 3
pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2556,7 +2559,7 @@
+@@ -2579,7 +2582,7 @@
#>+ 3
clean-metasources:
@@ -11831,55 +17910,52 @@
+ -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pminteriortextureedit.moc pmtorusedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmblobsphereedit.moc pmboxedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmimagemapedit.moc pmlibraryiconview.moc pmdragwidget.moc pmlightgroupedit.moc pmradiosityedit.moc pmactions.moc pmdiscedit.moc pmlibrarybrowser.moc pmlightedit.moc pmpalettevalueedit.moc pmobjectlibrarysettings.moc pmview.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalsettingsedit.moc pmglobalphotonsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmpatternedit.moc pmphotonsedit.moc pmrainbowedit.moc pmsoredit.moc pmquickcoloredit.moc pmdeclareedit.moc pmdialogview.moc pmsqeedit.moc pmbicubicpatchedit.moc pmobjectlinkedit.moc pmcoloredit.moc pmglview.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmlibraryobjectsearch.moc pmgraphicalobjectedit.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmgridsettings.moc pmdetailobjectedit.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmpovraywidget.moc pmtextureedit.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmfogedit.moc pmshell.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
#>+ 2
- KDE_DIST=lo16-app-kpovmodeler.png cr32-mime-kpovmodeler_doc.png baseinsertrules.xml BUGS pmvariant.h pmenumproperty.h questionmark.png kdoc.rules kpovmodelershell.rc Makefile.am StyleConvention REQUIREMENTS pmalledits.h pmmetaobject.h lo32-app-kpovmodeler.png Makefile.in cr32-app-kpovmodeler.png povraydocmap.xml configure.in.in pmthreestate.h cr16-mime-kpovmodeler_doc.png kpovmodelerui.rc cr16-app-kpovmodeler.png cr48-mime-kpovmodeler_doc.png configure.in.bot kpovmodelerbrowser.rc cr48-app-kpovmodeler.png pminsertrules.dtd
-@@ -2575,32 +2578,32 @@
+ KDE_DIST=hi32-app-kpovmodeler.png cr32-mime-kpovmodeler_doc.png baseinsertrules.xml BUGS pmvariant.h pmenumproperty.h hi22-app-kpovmodeler.png hi16-app-kpovmodeler.png questionmark.png kdoc.rules kpovmodelershell.rc Makefile.am StyleConvention REQUIREMENTS pmalledits.h pmmetaobject.h Makefile.in povraydocmap.xml configure.in.in pmthreestate.h cr16-mime-kpovmodeler_doc.png hi48-app-kpovmodeler.png kpovmodelerui.rc cr48-mime-kpovmodeler_doc.png configure.in.bot kpovmodelerbrowser.rc pminsertrules.dtd
+@@ -2598,29 +2601,29 @@
- #>+ 28
+ #>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
$(INSTALL_DATA) $(srcdir)/cr16-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpovmodeler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/lo16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
#>+ 15
force-reedit:
--- kpovmodeler/pics/crystalsvg/Makefile.in
+++ kpovmodeler/pics/crystalsvg/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11889,7 +17965,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11898,7 +17974,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11910,7 +17986,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -569,7 +572,7 @@
+@@ -592,7 +595,7 @@
.NOEXPORT:
#>+ 2
@@ -11919,7 +17995,7 @@
#>+ 2
docs-am:
-@@ -577,465 +580,465 @@
+@@ -600,465 +603,465 @@
#>+ 462
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
@@ -12319,6 +18395,7 @@
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
$(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -12347,7 +18424,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
@@ -12748,6 +18824,7 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -12776,7 +18853,6 @@
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
@@ -12785,7 +18861,7 @@
force-reedit:
--- kpovmodeler/pics/locolor/Makefile.in
+++ kpovmodeler/pics/locolor/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12795,7 +18871,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -386,7 +389,7 @@
+@@ -409,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12804,7 +18880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +427,9 @@
+@@ -447,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12816,7 +18892,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,156 +580,156 @@
+@@ -600,156 +603,156 @@
#>+ 153
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions
@@ -13095,7 +19171,7 @@
force-reedit:
--- kpovmodeler/pics/Makefile.in
+++ kpovmodeler/pics/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13105,7 +19181,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13114,7 +19190,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13128,7 +19204,7 @@
mostlyclean-libtool:
--- kruler/Makefile.in
+++ kruler/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -271,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13138,7 +19214,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -482,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13147,7 +19223,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -520,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13161,7 +19237,7 @@
@$(NORMAL_INSTALL)
--- kruler/pics/Makefile.in
+++ kruler/pics/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13171,7 +19247,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -420,7 +423,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13180,7 +19256,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -458,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13192,30 +19268,31 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -607,17 +610,17 @@
-
- #>+ 13
+@@ -632,18 +635,18 @@
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kruler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kruler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kruler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kruler.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kruler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kruler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kruler.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kruler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kruler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kruler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kruler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kruler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kruler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
#>+ 15
force-reedit:
--- ksnapshot/Makefile.in
+++ ksnapshot/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13225,7 +19302,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13234,7 +19311,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13246,32 +19323,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -806,19 +809,19 @@
+@@ -837,23 +840,23 @@
- #>+ 16
+ #>+ 19
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksnapshot.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksnapshot.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksnapshot.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksnapshot.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-ksnapshot.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ksnapshot.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-ksnapshot.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksnapshot.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-ksnapshot.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksnapshot.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksnapshot.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksnapshot.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksnapshot.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ksnapshot.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksnapshot.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
#>+ 15
+ force-reedit:
--- ksvg/core/Makefile.in
+++ ksvg/core/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13281,7 +19368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -467,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13290,7 +19377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13302,7 +19389,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -788,22 +791,22 @@
+@@ -811,22 +814,22 @@
mocs: KSVGReader.moc
#>+ 3
@@ -13334,7 +19421,7 @@
KDE_DIST=KSVGHelper.h KSVGReader.h KSVGLoader.h Makefile.am KSVGTextChunk.h Makefile.in ksvgrenderer.desktop
--- ksvg/dom/Makefile.in
+++ ksvg/dom/Makefile.in
-@@ -361,6 +361,9 @@
+@@ -372,6 +372,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13344,7 +19431,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -628,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13353,7 +19440,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -666,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13367,7 +19454,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/ecma/Makefile.in
+++ ksvg/ecma/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13377,7 +19464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -448,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13386,7 +19473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -486,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13400,7 +19487,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/libs/art_support/Makefile.in
+++ ksvg/impl/libs/art_support/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13410,7 +19497,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -436,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -13419,7 +19506,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13433,7 +19520,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/libs/libtext2path/Makefile.in
+++ ksvg/impl/libs/libtext2path/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13443,7 +19530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -425,7 +428,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13452,7 +19539,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13466,7 +19553,7 @@
mostlyclean-libtool:
--- ksvg/impl/libs/libtext2path/src/Makefile.in
+++ ksvg/impl/libs/libtext2path/src/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13476,7 +19563,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -463,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13485,7 +19572,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -501,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13499,7 +19586,7 @@
@$(NORMAL_INSTALL)
--- ksvg/impl/libs/Makefile.in
+++ ksvg/impl/libs/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13509,7 +19596,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13518,7 +19605,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13532,7 +19619,7 @@
mostlyclean-libtool:
--- ksvg/impl/libs/xrgbrender/Makefile.in
+++ ksvg/impl/libs/xrgbrender/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13542,7 +19629,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -436,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -13551,7 +19638,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13565,7 +19652,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/Makefile.in
+++ ksvg/impl/Makefile.in
-@@ -397,6 +397,9 @@
+@@ -408,6 +408,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13575,7 +19662,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -698,7 +701,7 @@
+@@ -721,7 +724,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13584,7 +19671,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -736,9 +739,9 @@
+@@ -759,9 +762,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13596,7 +19683,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -1280,7 +1283,7 @@
+@@ -1303,7 +1306,7 @@
-rm -f SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
#>+ 2
@@ -13607,7 +19694,7 @@
docs-am:
--- ksvg/Makefile.in
+++ ksvg/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -268,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13617,7 +19704,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -480,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13626,7 +19713,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -518,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13640,7 +19727,7 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/agg/Makefile.in
+++ ksvg/plugin/backends/agg/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13650,7 +19737,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13659,7 +19746,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13673,7 +19760,7 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/libart/Makefile.in
+++ ksvg/plugin/backends/libart/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13683,7 +19770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -466,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13692,7 +19779,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13706,7 +19793,7 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/Makefile.in
+++ ksvg/plugin/backends/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13716,7 +19803,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13725,7 +19812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13739,7 +19826,7 @@
mostlyclean-libtool:
--- ksvg/plugin/Makefile.in
+++ ksvg/plugin/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -281,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13749,7 +19836,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -476,7 +479,7 @@
+@@ -499,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13758,7 +19845,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -514,9 +517,9 @@
+@@ -537,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13770,7 +19857,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -990,18 +993,18 @@
+@@ -1013,18 +1016,18 @@
mocs: svgcreator.moc
#>+ 3
@@ -13795,7 +19882,7 @@
#>+ 8
svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
-@@ -1014,7 +1017,7 @@
+@@ -1037,7 +1040,7 @@
#>+ 3
clean-metasources:
@@ -13804,7 +19891,7 @@
#>+ 2
KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
-@@ -1065,7 +1068,7 @@
+@@ -1088,7 +1091,7 @@
#>+ 11
@@ -13815,7 +19902,7 @@
echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
--- ksvg/test/external/Makefile.in
+++ ksvg/test/external/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13825,7 +19912,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13834,7 +19921,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13848,7 +19935,7 @@
@$(NORMAL_INSTALL)
--- ksvg/test/Makefile.in
+++ ksvg/test/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13858,7 +19945,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13867,7 +19954,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13881,7 +19968,7 @@
mostlyclean-libtool:
--- kuickshow/Makefile.in
+++ kuickshow/Makefile.in
-@@ -214,6 +214,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13891,7 +19978,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -425,7 +428,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13900,7 +19987,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13914,7 +20001,7 @@
mostlyclean-libtool:
--- kuickshow/misc/Makefile.in
+++ kuickshow/misc/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13924,7 +20011,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -419,7 +422,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13933,7 +20020,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13947,7 +20034,7 @@
mostlyclean-libtool:
--- kuickshow/pics/Makefile.in
+++ kuickshow/pics/Makefile.in
-@@ -207,6 +207,9 @@
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13957,7 +20044,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,7 @@
+@@ -426,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13966,7 +20053,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -441,9 +444,9 @@
+@@ -464,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13980,7 +20067,7 @@
mostlyclean-libtool:
--- kuickshow/src/Makefile.in
+++ kuickshow/src/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -272,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13990,7 +20077,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -497,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13999,7 +20086,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -535,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14011,87 +20098,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -917,18 +920,18 @@
- mocs: aboutwidget.moc
-
- #>+ 3
--filefinder.moc: $(srcdir)/filefinder.h
-- $(MOC) $(srcdir)/filefinder.h -o filefinder.moc
-+printing.moc: $(srcdir)/printing.h
-+ $(MOC) $(srcdir)/printing.h -o printing.moc
-
- #>+ 2
--mocs: filefinder.moc
-+mocs: printing.moc
-
- #>+ 3
--printing.moc: $(srcdir)/printing.h
-- $(MOC) $(srcdir)/printing.h -o printing.moc
-+filefinder.moc: $(srcdir)/filefinder.h
-+ $(MOC) $(srcdir)/filefinder.h -o filefinder.moc
-
- #>+ 2
--mocs: printing.moc
-+mocs: filefinder.moc
-
- #>+ 3
- imagewindow.moc: $(srcdir)/imagewindow.h
-@@ -1002,7 +1005,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f filewidget.moc aboutwidget.moc filefinder.moc printing.moc imagewindow.moc slideshowwidget.moc generalwidget.moc mainwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
-+ -rm -f filewidget.moc aboutwidget.moc printing.moc filefinder.moc imagewindow.moc slideshowwidget.moc generalwidget.moc mainwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
-
- #>+ 2
- KDE_DIST=aboutwidget.h imagewindow.h kuickconfigdlg.h mainwidget.cpp kuickdata.h generalwidget.h defaultswidget.h imdata.h kuickshow.desktop kuickglobals.h filewidget.h kuick.h Makefile.am imlibwidget.h Makefile.in mainwidget.h printing.h cr32-app-kuickshow.png filefinder.h cr16-app-kuickshow.png slideshowwidget.h kuickshow.h lo32-app-kuickshow.png kurlwidget.h lo16-app-kuickshow.png kuickio.h version.h
-@@ -1012,19 +1015,19 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/lo32-app-kuickshow.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuickshow.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/lo16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuickshow.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kuickshow.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuickshow.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/lo16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuickshow.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/lo32-app-kuickshow.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuickshow.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuickshow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuickshow.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuickshow.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuickshow.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuickshow.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
-
- #>+ 15
-@@ -1066,7 +1069,7 @@
-
-
- #>+ 11
--libkdeinit_kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc printing.moc filefinder.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
-+libkdeinit_kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
- @echo 'creating libkdeinit_kuickshow_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_kuickshow_la.all_cpp.files libkdeinit_kuickshow_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_kuickshow_la.all_cpp.final; \
-@@ -1078,7 +1081,7 @@
- rm -f libkdeinit_kuickshow_la.all_cpp.final libkdeinit_kuickshow_la.all_cpp.files
-
- #>+ 11
--kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc printing.moc filefinder.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
-+kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
- @echo 'creating kuickshow_la.all_cpp.cpp ...'; \
- rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \
--- kview/config/Makefile.in
+++ kview/config/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -271,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14101,7 +20110,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -483,7 +486,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14110,7 +20119,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -521,9 +524,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14124,7 +20133,7 @@
@$(NORMAL_INSTALL)
--- kview/config/plugins/Makefile.in
+++ kview/config/plugins/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14134,7 +20143,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -464,7 +467,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14143,7 +20152,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14157,7 +20166,7 @@
@$(NORMAL_INSTALL)
--- kview/kimageviewer/Makefile.in
+++ kview/kimageviewer/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14167,7 +20176,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -472,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14176,7 +20185,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14190,7 +20199,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/config/Makefile.in
+++ kview/kviewcanvas/config/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14200,7 +20209,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14209,7 +20218,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14223,7 +20232,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/Makefile.in
+++ kview/kviewcanvas/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -273,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14233,7 +20242,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -486,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14242,7 +20251,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -524,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14256,7 +20265,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/test/Makefile.in
+++ kview/kviewcanvas/test/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -242,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14266,7 +20275,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -447,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14275,7 +20284,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -485,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14289,7 +20298,7 @@
clean-checkPROGRAMS:
--- kview/kviewviewer/config/Makefile.in
+++ kview/kviewviewer/config/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14299,7 +20308,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -465,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14308,7 +20317,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14322,7 +20331,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewviewer/Makefile.in
+++ kview/kviewviewer/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -276,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14332,7 +20341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -493,7 +496,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14341,7 +20350,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -531,9 +534,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14353,7 +20362,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -925,18 +928,18 @@
+@@ -948,18 +951,18 @@
#>+ 3
@@ -14378,7 +20387,7 @@
#>+ 3
imagesettings.moc: $(srcdir)/imagesettings.h
-@@ -947,7 +950,7 @@
+@@ -970,7 +973,7 @@
#>+ 3
clean-metasources:
@@ -14387,7 +20396,7 @@
#>+ 2
KDE_DIST=kviewvieweriface.h Makefile.am printimagesettings.ui kviewviewer.desktop kviewpopup.rc Makefile.in imagesettings.h kviewviewer.rc kviewviewer_ro.rc
-@@ -1003,7 +1006,7 @@
+@@ -1026,7 +1029,7 @@
#>+ 11
@@ -14398,7 +20407,7 @@
echo "#define KDE_USE_FINAL 1" >> libkviewviewer_la.all_cpp.final; \
--- kview/kviewviewer/test/Makefile.in
+++ kview/kviewviewer/test/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14408,7 +20417,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14417,7 +20426,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14431,7 +20440,7 @@
clean-checkPROGRAMS:
--- kview/Makefile.in
+++ kview/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -286,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14441,7 +20450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -503,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14450,7 +20459,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -541,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14462,30 +20471,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1028,17 +1031,17 @@
+@@ -1051,19 +1054,19 @@
- #>+ 13
+ #>+ 16
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kview.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kview.png
#>+ 15
- force-reedit:
--- kview/modules/browser/Makefile.in
+++ kview/modules/browser/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14495,7 +20506,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -462,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14504,7 +20515,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
@@ -14518,7 +20529,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/effects/Makefile.in
+++ kview/modules/effects/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14528,7 +20539,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14537,7 +20548,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14551,7 +20562,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/Makefile.in
+++ kview/modules/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14561,7 +20572,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -424,7 +427,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14570,7 +20581,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14584,7 +20595,7 @@
mostlyclean-libtool:
--- kview/modules/presenter/config/Makefile.in
+++ kview/modules/presenter/config/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14594,7 +20605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -464,7 +467,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14603,7 +20614,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14617,7 +20628,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/presenter/Makefile.in
+++ kview/modules/presenter/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -271,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14627,7 +20638,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -482,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14636,7 +20647,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -520,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14650,7 +20661,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/scale/Makefile.in
+++ kview/modules/scale/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14660,7 +20671,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -464,7 +467,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14669,7 +20680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14683,7 +20694,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/scanner/Makefile.in
+++ kview/modules/scanner/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14693,7 +20704,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14702,7 +20713,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14716,7 +20727,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/template/Makefile.in
+++ kview/modules/template/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14726,7 +20737,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -460,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14735,7 +20746,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -498,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14749,7 +20760,7 @@
@$(NORMAL_INSTALL)
--- kview/photobook/Makefile.in
+++ kview/photobook/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14759,7 +20770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -464,7 +467,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14768,7 +20779,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14782,7 +20793,7 @@
@$(NORMAL_INSTALL)
--- kviewshell/Makefile.in
+++ kviewshell/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -338,6 +338,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14792,16 +20803,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -592,7 +595,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)
+-$(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*) \
-@@ -580,9 +583,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14813,71 +20824,222 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1107,18 +1110,18 @@
- mocs: emptyRenderer.moc
+@@ -1404,11 +1407,11 @@
+ mocs: documentRenderer.moc
#>+ 3
--selection.moc: $(srcdir)/selection.h
-- $(MOC) $(srcdir)/selection.h -o selection.moc
-+pageSizeDialog.moc: $(srcdir)/pageSizeDialog.h
-+ $(MOC) $(srcdir)/pageSizeDialog.h -o pageSizeDialog.moc
+-kviewshell.moc: $(srcdir)/kviewshell.h
+- $(MOC) $(srcdir)/kviewshell.h -o kviewshell.moc
++tableOfContents.moc: $(srcdir)/tableOfContents.h
++ $(MOC) $(srcdir)/tableOfContents.h -o tableOfContents.moc
#>+ 2
--mocs: selection.moc
-+mocs: pageSizeDialog.moc
+-mocs: kviewshell.moc
++mocs: tableOfContents.moc
#>+ 3
--pageSizeDialog.moc: $(srcdir)/pageSizeDialog.h
-- $(MOC) $(srcdir)/pageSizeDialog.h -o pageSizeDialog.moc
-+selection.moc: $(srcdir)/selection.h
-+ $(MOC) $(srcdir)/selection.h -o selection.moc
+ sizePreview.moc: $(srcdir)/sizePreview.h
+@@ -1418,18 +1421,11 @@
+ mocs: sizePreview.moc
+ #>+ 3
+-tableOfContents.moc: $(srcdir)/tableOfContents.h
+- $(MOC) $(srcdir)/tableOfContents.h -o tableOfContents.moc
+-
+-#>+ 2
+-mocs: tableOfContents.moc
+-
+-#>+ 3
+-history.moc: $(srcdir)/history.h
+- $(MOC) $(srcdir)/history.h -o history.moc
++kviewshell.moc: $(srcdir)/kviewshell.h
++ $(MOC) $(srcdir)/kviewshell.h -o kviewshell.moc
+
#>+ 2
--mocs: pageSizeDialog.moc
-+mocs: selection.moc
+-mocs: history.moc
++mocs: kviewshell.moc
#>+ 3
- documentRenderer.moc: $(srcdir)/documentRenderer.h
-@@ -1163,18 +1166,18 @@
- mocs: zoom.moc
+ kmultipage.moc: $(srcdir)/kmultipage.h
+@@ -1439,11 +1435,11 @@
+ mocs: kmultipage.moc
#>+ 3
+-pageView.moc: $(srcdir)/pageView.h
+- $(MOC) $(srcdir)/pageView.h -o pageView.moc
++history.moc: $(srcdir)/history.h
++ $(MOC) $(srcdir)/history.h -o history.moc
+
+ #>+ 2
+-mocs: pageView.moc
++mocs: history.moc
+
+ #>+ 3
+ renderedDocumentPagePixmap.moc: $(srcdir)/renderedDocumentPagePixmap.h
+@@ -1453,18 +1449,18 @@
+ mocs: renderedDocumentPagePixmap.moc
+
+ #>+ 3
+-zoom.moc: $(srcdir)/zoom.h
+- $(MOC) $(srcdir)/zoom.h -o zoom.moc
++pageView.moc: $(srcdir)/pageView.h
++ $(MOC) $(srcdir)/pageView.h -o pageView.moc
+
+ #>+ 2
+-mocs: zoom.moc
++mocs: pageView.moc
+
+ #>+ 3
-marklist.moc: $(srcdir)/marklist.h
- $(MOC) $(srcdir)/marklist.h -o marklist.moc
-+pageSize.moc: $(srcdir)/pageSize.h
-+ $(MOC) $(srcdir)/pageSize.h -o pageSize.moc
++zoom.moc: $(srcdir)/zoom.h
++ $(MOC) $(srcdir)/zoom.h -o zoom.moc
#>+ 2
-mocs: marklist.moc
-+mocs: pageSize.moc
++mocs: zoom.moc
#>+ 3
--pageSize.moc: $(srcdir)/pageSize.h
-- $(MOC) $(srcdir)/pageSize.h -o pageSize.moc
+ pageSize.moc: $(srcdir)/pageSize.h
+@@ -1474,6 +1470,13 @@
+ mocs: pageSize.moc
+
+ #>+ 3
+marklist.moc: $(srcdir)/marklist.h
+ $(MOC) $(srcdir)/marklist.h -o marklist.moc
-
- #>+ 2
--mocs: pageSize.moc
++
++#>+ 2
+mocs: marklist.moc
-
- #>+ 3
++
++#>+ 3
empty_multipage.moc: $(srcdir)/empty_multipage.h
-@@ -1221,10 +1224,10 @@
+ $(MOC) $(srcdir)/empty_multipage.h -o empty_multipage.moc
+@@ -1511,10 +1514,10 @@
+
#>+ 3
clean-metasources:
-- -rm -f kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc selection.moc pageSizeDialog.moc documentRenderer.moc sizePreview.moc kviewshell.moc history.moc kmultipage.moc zoom.moc marklist.moc pageSize.moc empty_multipage.moc pageSizeWidget.moc centeringScrollview.moc documentPageCache.moc
-+ -rm -f kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc selection.moc documentRenderer.moc sizePreview.moc kviewshell.moc history.moc kmultipage.moc zoom.moc pageSize.moc marklist.moc empty_multipage.moc pageSizeWidget.moc centeringScrollview.moc documentPageCache.moc
+- -rm -f searchWidget.moc renderedDocumentPage.moc kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc documentRenderer.moc kviewshell.moc sizePreview.moc tableOfContents.moc history.moc kmultipage.moc pageView.moc renderedDocumentPagePixmap.moc zoom.moc marklist.moc pageSize.moc empty_multipage.moc pageSizeWidget.moc documentPageCache.moc
++ -rm -f searchWidget.moc renderedDocumentPage.moc kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc documentRenderer.moc tableOfContents.moc sizePreview.moc kviewshell.moc kmultipage.moc history.moc renderedDocumentPagePixmap.moc pageView.moc zoom.moc pageSize.moc marklist.moc empty_multipage.moc pageSizeWidget.moc documentPageCache.moc
#>+ 2
--KDE_DIST=optionDialogGUIWidget_base.ui kviewshell.h documentPagePixmap.h DESIGN emptymultipage.desktop kvsprefs.kcfgc documentWidget.h zoom.h pageSizeWidget_base.ui documentPage.h cr16-app-kviewshell.png history.h pageNumber.h centeringScrollview.h cr32-app-kviewshell.png simplePageSize.h kmultipage.h documentRenderer.h kviewshell.kcfg kviewpart.h Makefile.am pageSize.h empty_multipage.h pageSizeWidget.h kmultipage.desktop Makefile.in kviewerpart.rc sizePreview.h documentPageCache.h emptyRenderer.h anchor.h zoomlimits.h units.h marklist.h cr48-app-kviewshell.png kviewpart_iface.h pageSizeDialog.h kviewshell.rc selection.h
-+KDE_DIST=kviewshell.h optionDialogGUIWidget_base.ui documentPagePixmap.h DESIGN emptymultipage.desktop kvsprefs.kcfgc documentWidget.h zoom.h pageSizeWidget_base.ui documentPage.h cr16-app-kviewshell.png history.h pageNumber.h centeringScrollview.h cr32-app-kviewshell.png simplePageSize.h kmultipage.h documentRenderer.h kviewshell.kcfg kviewpart.h Makefile.am pageSize.h empty_multipage.h pageSizeWidget.h kmultipage.desktop Makefile.in kviewerpart.rc sizePreview.h documentPageCache.h emptyRenderer.h anchor.h zoomlimits.h units.h marklist.h cr48-app-kviewshell.png kviewpart_iface.h pageSizeDialog.h kviewshell.rc selection.h
+-KDE_DIST=optionDialogGUIWidget_base.ui kviewshell.h DESIGN emptymultipage.desktop kvsprefs.kcfgc pageSizeWidget_base.ui kprintDialogPage_pageoptions.h kviewshell.kcfg kviewpart.h tableOfContents.h Makefile.am empty_multipage.h pageSizeWidget.h kmultipage.desktop Mainpage.dox Makefile.in searchWidget.h kviewerpart.rc sizePreview.h emptyRenderer.h units.h optionDialogAccessibilityWidget.ui marklist.h kviewpart_iface.h pageSizeDialog.h kviewshell.rc
++KDE_DIST=kviewshell.h optionDialogGUIWidget_base.ui DESIGN emptymultipage.desktop kvsprefs.kcfgc pageSizeWidget_base.ui kprintDialogPage_pageoptions.h kviewshell.kcfg kviewpart.h tableOfContents.h Makefile.am empty_multipage.h pageSizeWidget.h kmultipage.desktop Mainpage.dox Makefile.in searchWidget.h kviewerpart.rc sizePreview.h emptyRenderer.h units.h optionDialogAccessibilityWidget.ui marklist.h kviewpart_iface.h pageSizeDialog.h kviewshell.rc
#>+ 4
clean-idl:
-@@ -1252,16 +1255,16 @@
+@@ -1604,7 +1607,7 @@
+ rm -f kviewerpart_la.all_cpp.final kviewerpart_la.all_cpp.files
+ #>+ 11
+-libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/pageView.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/renderedDocumentPage.cpp $(srcdir)/renderedDocumentPagePixmap.cpp $(srcdir)/renderedDocumentPagePrinter.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/searchWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp $(srcdir)/tableOfContents.cpp $(srcdir)/kprintDialogPage_pageoptions.cpp kmultipageInterface_skel.cpp kvsprefs.cpp searchWidget.moc renderedDocumentPage.moc documentWidget.moc documentRenderer.moc tableOfContents.moc history.moc kmultipage.moc pageView.moc renderedDocumentPagePixmap.moc pageSize.moc marklist.moc documentPageCache.moc
++libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/pageView.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/renderedDocumentPage.cpp $(srcdir)/renderedDocumentPagePixmap.cpp $(srcdir)/renderedDocumentPagePrinter.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/searchWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp $(srcdir)/tableOfContents.cpp $(srcdir)/kprintDialogPage_pageoptions.cpp kmultipageInterface_skel.cpp kvsprefs.cpp searchWidget.moc renderedDocumentPage.moc documentWidget.moc documentRenderer.moc tableOfContents.moc kmultipage.moc history.moc renderedDocumentPagePixmap.moc pageView.moc marklist.moc pageSize.moc documentPageCache.moc
+ @echo 'creating libkmultipage_la.all_cpp.cpp ...'; \
+ rm -f libkmultipage_la.all_cpp.files libkmultipage_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkmultipage_la.all_cpp.final; \
+--- kviewshell/pics/icons/Makefile.in
++++ kviewshell/pics/icons/Makefile.in
+@@ -208,6 +208,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@
+@@ -409,7 +412,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*) \
+@@ -447,9 +450,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:
+@@ -599,24 +602,24 @@
+
+ #>+ 20
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/hi22-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
+- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
+ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
+ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions
+ $(INSTALL_DATA) $(srcdir)/hi48-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
++ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/hi22-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
++ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi32-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
+- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
+- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
+- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
+
+ #>+ 15
+ force-reedit:
+--- kviewshell/pics/Makefile.in
++++ kviewshell/pics/Makefile.in
+@@ -224,6 +224,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@
+@@ -425,7 +428,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*) \
+@@ -463,9 +466,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:
+@@ -763,16 +766,16 @@
+
#>+ 13
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
@@ -14896,18 +21058,156 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kviewshell.png
#>+ 15
-@@ -1327,7 +1330,7 @@
- rm -f kviewerpart_la.all_cpp.final kviewerpart_la.all_cpp.files
+--- kviewshell/plugins/djvu/libdjvu/Makefile.in
++++ kviewshell/plugins/djvu/libdjvu/Makefile.in
+@@ -273,6 +273,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@
+@@ -490,7 +493,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*) \
+@@ -528,9 +531,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -838,7 +841,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=DataPool.h MMX.h JB2Image.h DjVuGlobal.h DjVmNav.h DjVuFileCache.h GException.h GScaler.h DjVmDir.h GOS.h UnicodeByteStream.h ByteStream.h DjVuText.h DjVmDoc.h BSByteStream.h DjVuErrorList.h DjVuAnno.h GPixmap.h README.djvulibre DjVuDumpHelper.h GContainer.h DjVuImage.h ZPCodec.h DjVmDir0.h DjVuDocEditor.h Makefile.am DjVuMessage.h GBitmap.h GRect.h DjVuFile.h GIFFManager.h DjVuNavDir.h Makefile.in JPEGDecoder.h DjVuToPS.h DjVuInfo.h GString.h IW44Image.h MMRDecoder.h GMapAreas.h configure.in.in XMLTags.h DjVuDocument.h DjVuPort.h DjVuMessageLite.h Template.h DjVuPalette.h debug.h GThreads.h GURL.h XMLParser.h Arrays.h IFFByteStream.h GSmartPointer.h
++KDE_DIST=DataPool.h MMX.h JB2Image.h DjVuGlobal.h DjVmNav.h DjVuFileCache.h GException.h GScaler.h DjVmDir.h GOS.h UnicodeByteStream.h ByteStream.h DjVuText.h DjVmDoc.h BSByteStream.h DjVuErrorList.h DjVuAnno.h GPixmap.h DjVuDumpHelper.h README.djvulibre GContainer.h DjVuImage.h ZPCodec.h DjVmDir0.h DjVuDocEditor.h Makefile.am DjVuMessage.h GBitmap.h GRect.h DjVuFile.h GIFFManager.h DjVuNavDir.h Makefile.in JPEGDecoder.h DjVuToPS.h DjVuInfo.h GString.h IW44Image.h MMRDecoder.h GMapAreas.h configure.in.in XMLTags.h DjVuDocument.h DjVuPort.h DjVuMessageLite.h Template.h DjVuPalette.h debug.h GThreads.h GURL.h XMLParser.h Arrays.h IFFByteStream.h GSmartPointer.h
+
+ #>+ 2
+ docs-am:
+--- kviewshell/plugins/djvu/Makefile.in
++++ kviewshell/plugins/djvu/Makefile.in
+@@ -275,6 +275,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@
+@@ -506,7 +509,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*) \
+@@ -544,9 +547,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -989,22 +992,22 @@
+ mocs: pageRangeWidget.moc
+
+ #>+ 3
+-djvumultipage.moc: $(srcdir)/djvumultipage.h
+- $(MOC) $(srcdir)/djvumultipage.h -o djvumultipage.moc
++djvurenderer.moc: $(srcdir)/djvurenderer.h
++ $(MOC) $(srcdir)/djvurenderer.h -o djvurenderer.moc
+
+ #>+ 2
+-mocs: djvumultipage.moc
++mocs: djvurenderer.moc
+
+ #>+ 3
+-djvurenderer.moc: $(srcdir)/djvurenderer.h
+- $(MOC) $(srcdir)/djvurenderer.h -o djvurenderer.moc
++djvumultipage.moc: $(srcdir)/djvumultipage.h
++ $(MOC) $(srcdir)/djvumultipage.h -o djvumultipage.moc
+
+ #>+ 2
+-mocs: djvurenderer.moc
++mocs: djvumultipage.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f pageRangeWidget.moc djvumultipage.moc djvurenderer.moc
++ -rm -f pageRangeWidget.moc djvurenderer.moc djvumultipage.moc
+
+ #>+ 2
+ KDE_DIST=kprintDialogPage_DJVUconversionoptions_basewidget.ui djvurenderer.h pageRangeWidget_base.ui djvumultipage.h Makefile.am djvumultipage.kcfg kprintDialogPage_DJVUconversionoptions.h Makefile.in djvumultipage.rc kprintDialogPage_DJVUpageoptions.h prefs.kcfgc djvumultipage.desktop pageRangeWidget.h
+@@ -1066,7 +1069,7 @@
+
+
#>+ 11
--libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/centeringScrollview.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/documentPage.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp kmultipageInterface_skel.cpp kvsprefs.cpp documentWidget.moc selection.moc documentRenderer.moc history.moc kmultipage.moc marklist.moc pageSize.moc centeringScrollview.moc documentPageCache.moc
-+libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/centeringScrollview.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/documentPage.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp kmultipageInterface_skel.cpp kvsprefs.cpp documentWidget.moc selection.moc documentRenderer.moc history.moc kmultipage.moc pageSize.moc marklist.moc centeringScrollview.moc documentPageCache.moc
- @echo 'creating libkmultipage_la.all_cpp.cpp ...'; \
- rm -f libkmultipage_la.all_cpp.files libkmultipage_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkmultipage_la.all_cpp.final; \
+-djvuviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/djvumultipage.cpp $(srcdir)/djvurenderer.cpp $(srcdir)/kprintDialogPage_DJVUpageoptions.cpp $(srcdir)/kprintDialogPage_DJVUconversionoptions.cpp $(srcdir)/pageRangeWidget.cpp kprintDialogPage_DJVUconversionoptions_basewidget.cpp pageRangeWidget_base.cpp prefs.cpp pageRangeWidget.moc pageRangeWidget_base.moc djvurenderer.moc djvumultipage.moc kprintDialogPage_DJVUconversionoptions_basewidget.moc
++djvuviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/djvumultipage.cpp $(srcdir)/djvurenderer.cpp $(srcdir)/kprintDialogPage_DJVUpageoptions.cpp $(srcdir)/kprintDialogPage_DJVUconversionoptions.cpp $(srcdir)/pageRangeWidget.cpp kprintDialogPage_DJVUconversionoptions_basewidget.cpp pageRangeWidget_base.cpp prefs.cpp pageRangeWidget.moc pageRangeWidget_base.moc djvumultipage.moc djvurenderer.moc kprintDialogPage_DJVUconversionoptions_basewidget.moc
+ @echo 'creating djvuviewpart_la.all_cpp.cpp ...'; \
+ rm -f djvuviewpart_la.all_cpp.files djvuviewpart_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> djvuviewpart_la.all_cpp.final; \
+--- kviewshell/plugins/Makefile.in
++++ kviewshell/plugins/Makefile.in
+@@ -224,6 +224,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@
+@@ -424,7 +427,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*) \
+@@ -462,9 +465,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:
--- libkscan/Makefile.in
+++ libkscan/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -278,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14917,7 +21217,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -502,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14926,7 +21226,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -540,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14940,7 +21240,7 @@
@$(NORMAL_INSTALL)
--- libkscan/pics/Makefile.in
+++ libkscan/pics/Makefile.in
-@@ -197,6 +197,9 @@
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14950,7 +21250,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -385,7 +388,7 @@
+@@ -408,7 +411,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14959,7 +21259,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -423,9 +426,9 @@
+@@ -446,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14971,7 +21271,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -576,15 +579,15 @@
+@@ -599,15 +602,15 @@
#>+ 13
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
@@ -14991,7 +21291,7 @@
#>+ 15
--- Makefile.in
+++ Makefile.in
-@@ -230,6 +230,9 @@
+@@ -242,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15001,16 +21301,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -454,7 +457,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/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,12 +475,12 @@
+@@ -496,12 +499,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -15025,7 +21325,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -489,7 +492,7 @@
+@@ -513,7 +516,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -15034,12 +21334,12 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -912,7 +915,7 @@
+@@ -1029,7 +1032,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm 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 configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list