rev 3842 - trunk/packages/kdegraphics/debian/patches
Pierre Habouzit
madcoder at costa.debian.org
Thu Jun 1 09:52:52 UTC 2006
Author: madcoder
Date: 2006-06-01 09:51:49 +0000 (Thu, 01 Jun 2006)
New Revision: 3842
Modified:
trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
buildprep joy of the day
Modified: trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2006-06-01 09:43:18 UTC (rev 3841)
+++ trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2006-06-01 09:51:49 UTC (rev 3842)
@@ -28,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5970,30 +5958,15 @@
+@@ -5973,30 +5961,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6053,7 +6026,7 @@
+@@ -6056,7 +6029,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6103,7 +6076,7 @@
+@@ -6106,7 +6079,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6123,7 +6096,7 @@
+@@ -6126,7 +6099,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6143,6 +6116,7 @@
+@@ -6146,6 +6119,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -99,7 +99,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -6162,15 +6136,17 @@
+@@ -6165,15 +6139,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -119,7 +119,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6211,11 +6187,56 @@
+@@ -6214,11 +6190,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -176,7 +176,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6288,15 +6309,15 @@
+@@ -6291,15 +6312,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -195,7 +195,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6465,14 +6486,13 @@
+@@ -6468,14 +6489,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6484,7 +6504,6 @@
+@@ -6487,7 +6507,6 @@
esac
;;
*64-bit*)
@@ -220,7 +220,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6518,6 +6537,22 @@
+@@ -6521,6 +6540,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -243,7 +243,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6549,7 +6584,7 @@
+@@ -6552,7 +6587,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 \
@@ -252,7 +252,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6559,8 +6594,10 @@
+@@ -6562,8 +6597,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
@@ -265,7 +265,7 @@
$2=yes
fi
fi
-@@ -6586,11 +6623,16 @@
+@@ -6589,11 +6626,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
@@ -283,7 +283,7 @@
else
$2=yes
fi
-@@ -6614,7 +6656,7 @@
+@@ -6617,7 +6659,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -292,7 +292,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6643,20 +6685,70 @@
+@@ -6646,20 +6688,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -369,7 +369,7 @@
# 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.
-@@ -6673,7 +6765,7 @@
+@@ -6676,7 +6768,7 @@
# _LT_AC_CHECK_DLFCN
@@ -378,7 +378,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -6681,7 +6773,7 @@
+@@ -6684,7 +6776,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +387,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -6747,17 +6839,19 @@
+@@ -6750,17 +6842,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -409,7 +409,7 @@
esac
else :
# compilation failed
-@@ -6769,7 +6863,7 @@
+@@ -6772,7 +6866,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +418,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -6806,7 +6900,7 @@
+@@ -6809,7 +6903,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -427,7 +427,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6840,7 +6934,7 @@
+@@ -6843,7 +6937,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -436,7 +436,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6853,7 +6947,7 @@
+@@ -6856,7 +6950,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +445,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -6895,20 +6989,13 @@
+@@ -6898,20 +6992,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -467,7 +467,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6920,13 +7007,18 @@
+@@ -6923,13 +7010,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -490,7 +490,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6985,8 +7077,8 @@
+@@ -6988,8 +7080,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)" || \
@@ -501,7 +501,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7043,7 +7135,7 @@
+@@ -7046,7 +7138,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -510,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7056,7 +7148,7 @@
+@@ -7059,7 +7151,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -519,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7066,7 +7158,20 @@
+@@ -7069,7 +7161,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +541,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7131,7 +7236,7 @@
+@@ -7134,7 +7239,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
;;
beos*)
-@@ -7140,7 +7245,7 @@
+@@ -7143,7 +7248,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -559,7 +559,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7156,7 +7261,7 @@
+@@ -7159,7 +7264,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -568,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7168,7 +7273,8 @@
+@@ -7171,7 +7276,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7198,7 +7304,7 @@
+@@ -7201,7 +7307,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
;;
esac
;;
-@@ -7221,7 +7327,7 @@
+@@ -7224,7 +7330,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +596,7 @@
# 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"`
-@@ -7244,20 +7350,17 @@
+@@ -7247,20 +7353,17 @@
dynamic_linker=no
;;
@@ -628,7 +628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7275,14 +7378,19 @@
+@@ -7278,14 +7381,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -650,7 +650,7 @@
esac
;;
-@@ -7302,9 +7410,9 @@
+@@ -7305,9 +7413,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -662,7 +662,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7319,7 +7427,7 @@
+@@ -7322,7 +7430,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -671,7 +671,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7330,7 +7438,7 @@
+@@ -7333,7 +7441,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -680,7 +680,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7342,6 +7450,18 @@
+@@ -7345,6 +7453,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -699,7 +699,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7385,29 +7505,26 @@
+@@ -7388,29 +7508,26 @@
;;
# This must be Linux ELF.
@@ -736,7 +736,7 @@
# 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,
-@@ -7417,6 +7534,18 @@
+@@ -7420,6 +7537,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -755,7 +755,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7426,7 +7555,7 @@
+@@ -7429,7 +7558,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -764,7 +764,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7454,8 +7583,13 @@
+@@ -7457,8 +7586,13 @@
openbsd*)
version_type=sunos
@@ -779,7 +779,7 @@
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
-@@ -7475,7 +7609,7 @@
+@@ -7478,7 +7612,7 @@
os2*)
libname_spec='$name'
@@ -788,7 +788,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7493,13 +7627,6 @@
+@@ -7496,13 +7630,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -802,7 +802,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7525,7 +7652,7 @@
+@@ -7528,7 +7655,7 @@
need_version=yes
;;
@@ -811,7 +811,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7558,6 +7685,29 @@
+@@ -7561,6 +7688,29 @@
fi
;;
@@ -841,7 +841,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7571,6 +7721,11 @@
+@@ -7574,6 +7724,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7595,6 +7750,9 @@
+@@ -7598,6 +7753,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -863,7 +863,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -7621,7 +7779,9 @@
+@@ -7624,7 +7782,9 @@
case $tagname in
CXX)
@@ -874,7 +874,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7683,7 +7843,7 @@
+@@ -7686,7 +7846,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -883,7 +883,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7721,7 +7881,7 @@
+@@ -7724,7 +7884,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -892,7 +892,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7857,7 +8017,7 @@
+@@ -7860,7 +8020,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -901,7 +901,7 @@
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
-@@ -7967,7 +8127,7 @@
+@@ -7970,7 +8130,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,
@@ -910,7 +910,7 @@
# 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'*)
-@@ -7999,7 +8159,7 @@
+@@ -8002,7 +8162,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,
@@ -919,7 +919,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -8026,6 +8186,15 @@
+@@ -8029,6 +8189,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8059,44 +8228,36 @@
+@@ -8062,44 +8231,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -991,7 +991,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8112,7 +8273,7 @@
+@@ -8115,7 +8276,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +1000,7 @@
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
-@@ -8128,43 +8289,27 @@
+@@ -8131,43 +8292,27 @@
esac
;;
@@ -1057,7 +1057,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -8183,32 +8328,22 @@
+@@ -8186,32 +8331,22 @@
;;
openbsd*)
@@ -1093,7 +1093,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8229,10 +8364,13 @@
+@@ -8232,10 +8367,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1108,7 +1108,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8252,36 +8390,43 @@
+@@ -8255,36 +8393,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1176,7 +1176,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -8313,13 +8458,13 @@
+@@ -8316,13 +8461,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8338,13 +8483,13 @@
+@@ -8341,13 +8486,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1218,7 @@
# 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
-@@ -8382,10 +8527,21 @@
+@@ -8385,10 +8530,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8425,7 +8581,7 @@
+@@ -8428,7 +8584,7 @@
# AC_LIBTOOL_RC
@@ -1250,7 +1250,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8458,36 +8614,9 @@
+@@ -8461,36 +8617,9 @@
_LT_AC_SYS_COMPILER
@@ -1290,7 +1290,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8501,9 +8630,9 @@
+@@ -8504,9 +8633,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1302,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -8512,7 +8641,7 @@
+@@ -8515,7 +8644,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1311,7 +1311,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8521,48 +8650,11 @@
+@@ -8524,48 +8653,11 @@
fi
;;
@@ -1362,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8587,7 +8679,7 @@
+@@ -8590,7 +8682,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1371,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8599,6 +8691,7 @@
+@@ -8602,6 +8694,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8616,7 +8709,7 @@
+@@ -8619,7 +8712,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1388,7 +1388,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8626,11 +8719,15 @@
+@@ -8629,11 +8722,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -1405,7 +1405,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8641,18 +8738,18 @@
+@@ -8644,18 +8741,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1427,7 +1427,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8670,8 +8767,8 @@
+@@ -8673,8 +8770,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
@@ -1438,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8697,7 +8794,7 @@
+@@ -8700,7 +8797,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.
@@ -1447,7 +1447,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8727,8 +8824,23 @@
+@@ -8730,8 +8827,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1473,7 +1473,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8745,7 +8857,7 @@
+@@ -8748,7 +8860,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1482,7 +1482,7 @@
# 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`
-@@ -8764,8 +8876,12 @@
+@@ -8767,8 +8879,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1495,7 +1495,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8774,15 +8890,16 @@
+@@ -8777,15 +8893,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1516,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.
-@@ -8791,13 +8908,12 @@
+@@ -8794,13 +8911,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1532,7 +1532,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8806,22 +8922,32 @@
+@@ -8809,22 +8925,32 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1576,7 @@
esac
;;
-@@ -8829,12 +8955,12 @@
+@@ -8832,12 +8958,12 @@
# _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'
@@ -1591,7 +1591,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
-@@ -8843,70 +8969,81 @@
+@@ -8846,70 +8972,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1725,7 +1725,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8917,14 +9054,14 @@
+@@ -8920,14 +9057,14 @@
;;
esac
;;
@@ -1742,7 +1742,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8941,12 +9078,12 @@
+@@ -8944,12 +9081,12 @@
# location of the library.
case $cc_basename in
@@ -1758,7 +1758,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8955,11 +9092,11 @@
+@@ -8958,11 +9095,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.
@@ -1772,7 +1772,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8969,34 +9106,23 @@
+@@ -8972,34 +9109,23 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1814,7 +1814,7 @@
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9006,17 +9132,20 @@
+@@ -9009,17 +9135,20 @@
esac
case $cc_basename in
@@ -1841,7 +1841,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9032,12 +9161,15 @@
+@@ -9035,12 +9164,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
;;
esac
fi
-@@ -9048,11 +9180,25 @@
+@@ -9051,11 +9183,25 @@
;;
esac
;;
@@ -1889,7 +1889,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9063,9 +9209,9 @@
+@@ -9066,9 +9212,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1901,7 +1901,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9074,16 +9220,16 @@
+@@ -9077,16 +9223,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -1922,7 +1922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9101,20 +9247,44 @@
+@@ -9104,20 +9250,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1973,7 +1973,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9142,7 +9312,7 @@
+@@ -9145,7 +9315,7 @@
;;
mvs*)
case $cc_basename in
@@ -1982,7 +1982,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9152,7 +9322,7 @@
+@@ -9155,7 +9325,7 @@
;;
esac
;;
@@ -1991,7 +1991,7 @@
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=
-@@ -9163,15 +9333,31 @@
+@@ -9166,15 +9336,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::"'
;;
@@ -2025,7 +2025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9181,14 +9367,14 @@
+@@ -9184,14 +9370,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2043,7 +2043,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9206,7 +9392,7 @@
+@@ -9209,7 +9395,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9225,13 +9411,13 @@
+@@ -9228,13 +9414,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2068,7 +2068,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,17 +9426,17 @@
+@@ -9243,17 +9429,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2090,7 +2090,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9269,7 +9455,7 @@
+@@ -9272,7 +9458,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9290,27 +9476,14 @@
+@@ -9293,27 +9479,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2129,7 +2129,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9323,36 +9496,33 @@
+@@ -9326,36 +9499,33 @@
;;
solaris*)
case $cc_basename in
@@ -2178,7 +2178,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9360,9 +9530,9 @@
+@@ -9363,9 +9533,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2190,7 +2190,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9372,9 +9542,9 @@
+@@ -9375,9 +9545,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
@@ -2202,7 +2202,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9383,9 +9553,9 @@
+@@ -9386,9 +9556,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2214,7 +2214,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9398,12 +9568,63 @@
+@@ -9401,12 +9571,63 @@
;;
esac
;;
@@ -2280,7 +2280,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9440,8 +9661,6 @@
+@@ -9443,8 +9664,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2289,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9459,7 +9678,7 @@
+@@ -9462,7 +9681,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2298,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -9513,7 +9732,7 @@
+@@ -9516,7 +9735,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.
@@ -2307,7 +2307,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9553,7 +9772,7 @@
+@@ -9556,7 +9775,7 @@
fi
;;
@@ -2316,7 +2316,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9589,13 +9808,37 @@
+@@ -9592,13 +9811,37 @@
$rm -f confest.$objext
@@ -2355,7 +2355,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9639,12 +9882,16 @@
+@@ -9642,12 +9885,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2373,7 +2373,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9654,7 +9901,7 @@
+@@ -9657,7 +9904,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2382,7 +2382,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9662,8 +9909,10 @@
+@@ -9665,8 +9912,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2395,7 +2395,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9673,8 +9922,6 @@
+@@ -9676,8 +9925,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2404,7 +2404,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -9684,8 +9931,6 @@
+@@ -9687,8 +9934,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2413,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9714,20 +9959,27 @@
+@@ -9717,20 +9962,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2442,7 +2442,7 @@
## 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
-@@ -9739,8 +9991,6 @@
+@@ -9742,8 +9994,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2451,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9750,7 +10000,7 @@
+@@ -9753,7 +10003,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2460,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9774,11 +10024,16 @@
+@@ -9777,11 +10027,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2477,7 +2477,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9804,11 +10059,12 @@
+@@ -9807,11 +10062,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2492,7 +2492,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 \
-@@ -9858,7 +10114,7 @@
+@@ -9861,7 +10117,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2501,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9924,11 +10180,11 @@
+@@ -9927,11 +10183,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2515,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9959,6 +10215,12 @@
+@@ -9962,6 +10218,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2528,7 +2528,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9970,6 +10232,9 @@
+@@ -9973,6 +10235,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2538,7 +2538,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9989,7 +10254,7 @@
+@@ -9992,7 +10257,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2547,7 +2547,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -10020,7 +10285,7 @@
+@@ -10023,7 +10288,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10035,7 +10300,7 @@
+@@ -10038,7 +10303,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2565,7 +2565,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10264,7 +10529,10 @@
+@@ -10267,7 +10532,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.
@@ -2577,7 +2577,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10306,9 +10574,6 @@
+@@ -10309,9 +10577,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2587,7 +2587,7 @@
# 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'"
-@@ -10330,14 +10595,30 @@
+@@ -10333,14 +10598,30 @@
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'"
;;
@@ -2620,7 +2620,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10355,14 +10636,17 @@
+@@ -10358,14 +10639,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10518,6 +10802,10 @@
+@@ -10521,6 +10805,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2651,7 +2651,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10526,7 +10814,7 @@
+@@ -10529,7 +10817,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2660,7 +2660,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10551,18 +10839,28 @@
+@@ -10554,18 +10842,28 @@
;;
chorus*)
case $cc_basename in
@@ -2692,7 +2692,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10570,22 +10868,22 @@
+@@ -10573,22 +10871,22 @@
;;
esac
;;
@@ -2721,7 +2721,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10598,9 +10896,13 @@
+@@ -10601,9 +10899,13 @@
;;
esac
;;
@@ -2736,7 +2736,7 @@
_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.
-@@ -10609,20 +10911,26 @@
+@@ -10612,20 +10914,26 @@
;;
esac
;;
@@ -2768,7 +2768,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10639,25 +10947,25 @@
+@@ -10642,25 +10950,25 @@
;;
mvs*)
case $cc_basename in
@@ -2799,7 +2799,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10671,24 +10979,15 @@
+@@ -10674,24 +10982,15 @@
;;
psos*)
;;
@@ -2826,7 +2826,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10698,12 +10997,12 @@
+@@ -10701,12 +11000,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2841,7 +2841,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10713,7 +11012,7 @@
+@@ -10716,7 +11015,7 @@
;;
tandem*)
case $cc_basename in
@@ -2850,7 +2850,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10721,7 +11020,14 @@
+@@ -10724,7 +11023,14 @@
;;
esac
;;
@@ -2866,7 +2866,7 @@
;;
vxworks*)
;;
-@@ -10768,6 +11074,11 @@
+@@ -10771,6 +11077,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2878,7 +2878,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -10784,7 +11095,7 @@
+@@ -10787,7 +11098,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2887,7 +2887,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10810,6 +11121,16 @@
+@@ -10813,6 +11124,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2904,7 +2904,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10821,7 +11142,7 @@
+@@ -10824,7 +11145,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.
@@ -2913,7 +2913,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10844,13 +11165,20 @@
+@@ -10847,13 +11168,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2936,7 +2936,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10865,15 +11193,15 @@
+@@ -10868,15 +11196,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2958,7 +2958,7 @@
;;
sunos4*)
-@@ -10882,7 +11210,7 @@
+@@ -10885,7 +11213,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2967,7 +2967,7 @@
_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'
-@@ -10895,6 +11223,17 @@
+@@ -10898,6 +11226,17 @@
fi
;;
@@ -2985,7 +2985,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10922,7 +11261,7 @@
+@@ -10925,7 +11264,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2994,7 +2994,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10931,6 +11270,16 @@
+@@ -10934,6 +11273,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3011,7 +3011,7 @@
])
-@@ -10955,7 +11304,10 @@
+@@ -10958,7 +11307,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3023,7 +3023,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10981,7 +11333,7 @@
+@@ -10984,7 +11336,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3032,7 @@
_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*
-@@ -10998,7 +11350,8 @@
+@@ -11001,7 +11353,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11008,6 +11361,10 @@
+@@ -11011,6 +11364,10 @@
with_gnu_ld=no
fi
;;
@@ -3053,7 +3053,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11018,6 +11375,27 @@
+@@ -11021,6 +11378,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3081,7 +3081,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11055,7 +11433,7 @@
+@@ -11058,7 +11436,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
@@ -3090,7 +3090,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11065,13 +11443,13 @@
+@@ -11068,13 +11446,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'
@@ -3107,7 +3107,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
-@@ -11080,23 +11458,70 @@
+@@ -11083,23 +11461,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3184,7 +3184,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -11110,13 +11535,40 @@
+@@ -11113,13 +11538,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3227,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -11126,24 +11578,19 @@
+@@ -11129,24 +11581,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3259,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11155,7 +11602,7 @@
+@@ -11158,7 +11605,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3268,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11177,9 +11624,21 @@
+@@ -11180,9 +11627,21 @@
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
@@ -3292,7 +3292,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11196,7 +11655,7 @@
+@@ -11199,7 +11658,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3301,7 +3301,7 @@
# 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`
-@@ -11215,8 +11674,12 @@
+@@ -11218,8 +11677,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3314,7 +3314,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11224,30 +11687,30 @@
+@@ -11227,30 +11690,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3356,7 +3356,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11256,13 +11719,11 @@
+@@ -11259,13 +11722,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3373,7 @@
fi
fi
;;
-@@ -11275,7 +11736,7 @@
+@@ -11278,7 +11739,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3382,7 +3382,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11285,69 +11746,69 @@
+@@ -11288,69 +11749,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
;;
dgux*)
-@@ -11380,8 +11841,8 @@
+@@ -11383,8 +11844,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3509,7 @@
_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
-@@ -11389,7 +11850,7 @@
+@@ -11392,7 +11853,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3518,7 +3518,7 @@
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
-@@ -11403,47 +11864,62 @@
+@@ -11406,47 +11867,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3605,7 +3605,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -11457,7 +11933,7 @@
+@@ -11460,7 +11936,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3614,7 +3614,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'
-@@ -11467,7 +11943,7 @@
+@@ -11470,7 +11946,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3623,7 +3623,7 @@
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
-@@ -11490,7 +11966,8 @@
+@@ -11493,7 +11969,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
@@ -3633,7 +3633,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11500,7 +11977,7 @@
+@@ -11503,7 +11980,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -3642,7 +3642,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11511,14 +11988,14 @@
+@@ -11514,14 +11991,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
@@ -3659,7 +3659,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'
-@@ -11530,13 +12007,13 @@
+@@ -11533,13 +12010,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}\*'
@@ -3675,7 +3675,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11544,21 +12021,15 @@
+@@ -11547,21 +12024,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3701,7 +3701,7 @@
_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~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11567,8 +12038,18 @@
+@@ -11570,8 +12041,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3722,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11577,7 +12058,7 @@
+@@ -11580,7 +12061,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.
@@ -3731,7 +3731,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11625,36 +12106,45 @@
+@@ -11628,36 +12109,45 @@
fi
;;
@@ -3798,7 +3798,7 @@
;;
uts4*)
-@@ -11672,11 +12162,6 @@
+@@ -11675,11 +12165,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3810,7 +3810,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11697,13 +12182,14 @@
+@@ -11700,13 +12185,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11831,7 +12317,7 @@
+@@ -11834,7 +12320,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
@@ -3835,48 +3835,682 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
+--- config.h.in
++++ config.h.in
+@@ -360,22 +360,22 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+
+ /* Define to 1 if you have the ANSI C header files. */
+--- configure
++++ configure
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.59d.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -16,11 +17,35 @@
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+
+
-+# 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.
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
+
-+# serial 4
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
+
-+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
-+]
-+)
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+@@ -29,8 +54,43 @@
+ fi
+
+
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" "" $as_nl"
+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++# Find who we are. Look in the path if we contain no directory separator.
++case $0 in
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
+
- # Check to see how 'make' treats includes. -*- Autoconf -*-
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44,18 +104,19 @@
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+- $as_unset $as_var
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+ done
- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
---- configure
-+++ configure
-@@ -278,15 +278,15 @@
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+ else
+ as_basename=false
+@@ -63,157 +124,386 @@
+
+
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
++# CDPATH.
++$as_unset CDPATH
+
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++ if (eval ":") 2>/dev/null; then
++ as_have_required=yes
++else
++ as_have_required=no
+ fi
+
++ if test $as_have_required = yes && (eval ":
++(as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+- case $0 in
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
+
+- ;;
+- esac
+- # We did not find ourselves, most probably we were run as `sh COMMAND'
+- # in which case we are not to be found in the path.
+- if test "x$as_myself" = x; then
+- as_myself=$0
+- fi
+- if test ! -f "$as_myself"; then
+- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+- { (exit 1); exit 1; }; }
+- fi
+- case $CONFIG_SHELL in
+- '')
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0) || { (exit 1); exit 1; }
++
++(
++ as_lineno_1=\$LINENO
++ as_lineno_2=\$LINENO
++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++ :
++else
++ as_candidate_shells=
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
++ case $as_dir in
+ /*)
+- if ("$as_dir/$as_base" -c '
++ for as_base in sh bash ksh sh5; do
++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++ done;;
++ esac
++done
++IFS=$as_save_IFS
++
++
++ for as_shell in $as_candidate_shells $SHELL; do
++ # Try only shells which exist, to save several forks.
++ if test -f "$as_shell" &&
++ { ("$as_shell") 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++_ASEOF
++}; then
++ CONFIG_SHELL=$as_shell
++ as_have_required=yes
++ if { "$as_shell" 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++(as_func_return () {
++ (exit $1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
+- done
+-done
+-;;
+- esac
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++ break
++fi
++
++fi
++
++ done
++
++ if test "x$CONFIG_SHELL" != x; then
++ for as_var in BASH_ENV ENV
++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ done
++ export CONFIG_SHELL
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++ if test $as_have_required = no; then
++ echo This script requires a shell more modern than all the
++ echo shells that I found on your system. Please install a
++ echo modern shell, or manually run the script under such a
++ echo shell if you do have one.
++ { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++ echo No shell found that supports shell functions.
++ echo Please tell autoconf at gnu.org about your system,
++ echo including any error possibly output before this
++ echo message
++}
++
++
++
++ as_lineno_1=$LINENO
++ as_lineno_2=$LINENO
++ test "x$as_lineno_1" != "x$as_lineno_2" &&
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line before each line; the second 'sed' does the real
+- # work. The second script uses 'N' to pair each line-number line
+- # with the numbered line, and appends trailing '-' during
+- # substitution so that $LINENO is not a special case at line end.
++ # line-number line after each line using $LINENO; the second 'sed'
++ # does the real work. The second script uses 'N' to pair each
++ # line-number line with the line containing $LINENO, and appends
++ # trailing '-' during substitution so that $LINENO is not a special
++ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+- sed '=' <$as_myself |
++ # scripts with optimization help from Paolo Bonzini. Blame Lee
++ # E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
+ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
+ N
+- s,$,-,
+- : loop
+- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+- s,-$,,
+- s,^['$as_cr_digits']*\n,,
++ s/-\n.*//
+ ' >$as_me.lineno &&
+- chmod +x $as_me.lineno ||
++ chmod +x "$as_me.lineno" ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensible to this).
+- . ./$as_me.lineno
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+ }
+
+
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T=' ' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (dirname -- /) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++ case `echo 'x\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ *) ECHO_C='\c';;
++ esac;;
++*)
++ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
++else
++ rm -f conf$$.dir
++ mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+- # We could just check for DJGPP; but this test a) works b) is more generic
+- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+- if test -f conf$$.exe; then
+- # Don't use ln at all; we don't have any links
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- else
+- as_ln_s='ln -s'
+- fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+@@ -222,7 +512,19 @@
+ as_mkdir_p=false
+ fi
+
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works. Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ as_executable_p="test -x"
++else
++ as_executable_p=:
++fi
++rm -f conf$$.file
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,15 +533,6 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" $as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+
+
+ # Check that we are running under the correct shell.
+@@ -278,15 +571,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
@@ -3894,16 +4528,879 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -464,7 +464,7 @@
+@@ -395,29 +688,26 @@
+
+ tagnames=${tagnames+${tagnames},}F77
+
++exec 7<&0 </dev/null 6>&1
++
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete. It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+@@ -455,17 +745,397 @@
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-# include <stdint.h>
+-# endif
++#endif
++#if HAVE_STDINT_H
++# include <stdint.h>
+ #endif
+ #if HAVE_UNISTD_H
# 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 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 IMLIB_LIBS 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 gphoto2_config gphoto2_port_config 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 IMLIB_LIBS 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 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 gphoto2_config gphoto2_port_config 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 IMLIB_LIBS 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
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++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
++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
++GREP
++EGREP
++LN_S
++ECHO
++AR
++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
++XMKMF
++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
++gphoto2_config
++gphoto2_port_config
++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
++IMLIB_LIBS
++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=''
++ ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++CPP
++CXX
++CXXFLAGS
++CCC
++CXXCPP
++F77
++FFLAGS
++XMKMF
++TIFF_LIBS
++TIFF_CFLAGS
++PTHREAD_LIBS
++PTHREAD_CFLAGS'
++
# Initialize some variables set by options.
-@@ -1041,6 +1041,8 @@
+ ac_init_help=
+@@ -492,34 +1162,48 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+- eval "$ac_prev=\$ac_option"
++ eval $ac_prev=\$ac_option
+ ac_prev=
+ continue
+ fi
+
+- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++ case $ac_option in
++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *) ac_optarg=yes ;;
++ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+- case $ac_option in
++ case $ac_dashdash$ac_option in
++ --)
++ ac_dashdash=yes ;;
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+@@ -541,12 +1225,18 @@
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++ -datadir | --datadir | --datadi | --datad)
+ ac_prev=datadir ;;
+- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+- | --da=*)
++ -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ datadir=$ac_optarg ;;
+
++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++ | --dataroo | --dataro | --datar)
++ ac_prev=datarootdir ;;
++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++ datarootdir=$ac_optarg ;;
++
+ -disable-* | --disable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+@@ -554,7 +1244,17 @@
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- eval "enable_$ac_feature=no" ;;
++ eval enable_$ac_feature=no ;;
++
++ -docdir | --docdir | --docdi | --doc | --do)
++ ac_prev=docdir ;;
++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++ docdir=$ac_optarg ;;
++
++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++ ac_prev=dvidir ;;
++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+@@ -563,11 +1263,7 @@
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
+- esac
+- eval "enable_$ac_feature='$ac_optarg'" ;;
++ eval enable_$ac_feature=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -594,6 +1290,12 @@
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++ ac_prev=htmldir ;;
++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++ | --ht=*)
++ htmldir=$ac_optarg ;;
++
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+@@ -618,13 +1320,16 @@
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
++ -localedir | --localedir | --localedi | --localed | --locale)
++ ac_prev=localedir ;;
++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++ localedir=$ac_optarg ;;
++
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+- | --localstate | --localstat | --localsta | --localst \
+- | --locals | --local | --loca | --loc | --lo)
++ | --localstate | --localstat | --localsta | --localst | --locals)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -689,6 +1394,16 @@
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++ ac_prev=pdfdir ;;
++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++ pdfdir=$ac_optarg ;;
++
++ -psdir | --psdir | --psdi | --psd | --ps)
++ ac_prev=psdir ;;
++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++ psdir=$ac_optarg ;;
++
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+@@ -745,11 +1460,7 @@
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
+- esac
+- eval "with_$ac_package='$ac_optarg'" ;;
++ eval with_$ac_package=\$ac_optarg ;;
+
+ -without-* | --without-*)
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+@@ -758,7 +1469,7 @@
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+- eval "with_$ac_package=no" ;;
++ eval with_$ac_package=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+@@ -789,8 +1500,7 @@
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+- eval "$ac_envvar='$ac_optarg'"
++ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+@@ -810,27 +1520,19 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+- eval ac_val=$`echo $ac_var`
+- case $ac_val in
+- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; };;
+- esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+- localstatedir libdir includedir oldincludedir infodir mandir
++# Be sure to have absolute directory names.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
+ do
+- eval ac_val=$`echo $ac_var`
++ eval ac_val=\$$ac_var
+ case $ac_val in
+- [\\/$]* | ?:[\\/]* ) ;;
+- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; };;
++ [\\/$]* | ?:[\\/]* ) continue;;
++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++ { (exit 1); exit 1; }; }
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -857,110 +1559,76 @@
+ test "$silent" = yes && exec 6>/dev/null
+
+
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++ { echo "$as_me: error: Working directory cannot be determined" >&2
++ { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++ { echo "$as_me: error: pwd does not report name of working directory" >&2
++ { (exit 1); exit 1; }; }
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+- # Try the directory containing this script, then its parent.
+- ac_confdir=`(dirname "$0") 2>/dev/null ||
++ # Try the directory containing this script, then the parent directory.
++ ac_confdir=`$as_dirname -- "$0" ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$0" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ srcdir=$ac_confdir
+- if test ! -r $srcdir/$ac_unique_file; then
++ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+ else
+ ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+- if test "$ac_srcdir_defaulted" = yes; then
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+- { (exit 1); exit 1; }; }
+- else
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+- { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+-ac_env_CXX_set=${CXX+set}
+-ac_env_CXX_value=$CXX
+-ac_cv_env_CXX_set=${CXX+set}
+-ac_cv_env_CXX_value=$CXX
+-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_env_CXXFLAGS_value=$CXXFLAGS
+-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CXXCPP_set=${CXXCPP+set}
+-ac_env_CXXCPP_value=$CXXCPP
+-ac_cv_env_CXXCPP_set=${CXXCPP+set}
+-ac_cv_env_CXXCPP_value=$CXXCPP
+-ac_env_F77_set=${F77+set}
+-ac_env_F77_value=$F77
+-ac_cv_env_F77_set=${F77+set}
+-ac_cv_env_F77_value=$F77
+-ac_env_FFLAGS_set=${FFLAGS+set}
+-ac_env_FFLAGS_value=$FFLAGS
+-ac_cv_env_FFLAGS_set=${FFLAGS+set}
+-ac_cv_env_FFLAGS_value=$FFLAGS
+-ac_env_TIFF_LIBS_set=${TIFF_LIBS+set}
+-ac_env_TIFF_LIBS_value=$TIFF_LIBS
+-ac_cv_env_TIFF_LIBS_set=${TIFF_LIBS+set}
+-ac_cv_env_TIFF_LIBS_value=$TIFF_LIBS
+-ac_env_TIFF_CFLAGS_set=${TIFF_CFLAGS+set}
+-ac_env_TIFF_CFLAGS_value=$TIFF_CFLAGS
+-ac_cv_env_TIFF_CFLAGS_set=${TIFF_CFLAGS+set}
+-ac_cv_env_TIFF_CFLAGS_value=$TIFF_CFLAGS
+-ac_env_PTHREAD_LIBS_set=${PTHREAD_LIBS+set}
+-ac_env_PTHREAD_LIBS_value=$PTHREAD_LIBS
+-ac_cv_env_PTHREAD_LIBS_set=${PTHREAD_LIBS+set}
+-ac_cv_env_PTHREAD_LIBS_value=$PTHREAD_LIBS
+-ac_env_PTHREAD_CFLAGS_set=${PTHREAD_CFLAGS+set}
+-ac_env_PTHREAD_CFLAGS_value=$PTHREAD_CFLAGS
+-ac_cv_env_PTHREAD_CFLAGS_set=${PTHREAD_CFLAGS+set}
+-ac_cv_env_PTHREAD_CFLAGS_value=$PTHREAD_CFLAGS
++if test ! -r "$srcdir/$ac_unique_file"; then
++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++ { (exit 1); exit 1; }; }
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++ { (exit 1); exit 1; }; }
++ pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++ srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++ eval ac_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_env_${ac_var}_value=\$${ac_var}
++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+
+ #
+ # Report the --help message.
+@@ -989,9 +1657,6 @@
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+-_ACEOF
+-
+- cat <<_ACEOF
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+@@ -1009,15 +1674,22 @@
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+- --datadir=DIR read-only architecture-independent data [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --infodir=DIR info documentation [PREFIX/info]
+- --mandir=DIR man documentation [PREFIX/man]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
+@@ -1041,6 +1713,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -3912,32 +5409,976 @@
--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
-@@ -1225,7 +1227,7 @@
+@@ -1058,10 +1732,8 @@
+ of memory)
+ --enable-closure delay template instantiation
+ --enable-nmcheck enable automatic namespace cleanness check
+- --enable-shared[=PKGS]
+- build shared libraries [default=yes]
+- --enable-static[=PKGS]
+- build static libraries [default=no]
++ --enable-shared[=PKGS] build shared libraries [default=yes]
++ --enable-static[=PKGS] build static libraries [default=no]
+ --enable-libsuffix /lib directory suffix (64,32,none,auto=default)
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+@@ -1091,8 +1763,7 @@
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-pic try to use only PIC/non-PIC objects [default=use
+ both]
+- --with-tags[=TAGS]
+- include additional configurations [automatic]
++ --with-tags[=TAGS] include additional configurations [automatic]
+ --with-extra-includes=DIR
+ adds non standard include paths
+ --with-extra-libs=DIR adds non standard library paths
+@@ -1106,8 +1777,7 @@
+ --with-gphoto2-libraries=DIR
+ gphoto2 libraries are in DIR
+ --with-openexr Enable support for OpenEXR [default=check]
+- --with-poppler Enable PDF support through poppler
+- [default=check]
++ --with-poppler Enable PDF support through poppler [default=check]
+ --with-kadmos Enable the kadmos OCR engine [default=check]
+ --with-kadmos-dir sets the path to the kadmos engine
+ [default=/usr/local]
+@@ -1119,14 +1789,15 @@
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+- headers in a nonstandard directory <include dir>
++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+ CXXCPP C++ preprocessor
+ F77 Fortran 77 compiler command
+ FFLAGS Fortran 77 compiler flags
++ XMKMF Path to xmkmf, Makefile generator for X Window System
+ TIFF_LIBS
+ TIFF_CFLAGS
+ PTHREAD_LIBS
+@@ -1138,118 +1809,86 @@
+ it to find libraries and programs with nonstandard names/locations.
+
+ _ACEOF
++ac_status=$?
+ fi
+
+ if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+- ac_popdir=`pwd`
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d $ac_dir || continue
++ test -d "$ac_dir" || continue
+ ac_builddir=.
+
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+
+ case $srcdir in
+- .) # No --srcdir option. We are building in place.
++ .) # We are building in place.
+ ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
+-
+- cd $ac_dir
+- # Check for guested configure; otherwise get Cygnus style configure.
+- if test -f $ac_srcdir/configure.gnu; then
+- echo
+- $SHELL $ac_srcdir/configure.gnu --help=recursive
+- elif test -f $ac_srcdir/configure; then
+- echo
+- $SHELL $ac_srcdir/configure --help=recursive
+- elif test -f $ac_srcdir/configure.ac ||
+- test -f $ac_srcdir/configure.in; then
+- echo
+- $ac_configure --help
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
+- fi
- cd $ac_popdir
-+ cd "$ac_popdir"
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-@@ -2128,6 +2130,31 @@
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.59d
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+- exit 0
++ exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59. Invocation command line was
++generated by GNU Autoconf 2.59d. Invocation command line was
-+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.
+ $ $0 $@
+
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1268,7 +1907,7 @@
+ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+ /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+ /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+ /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+@@ -1282,6 +1921,7 @@
+ test -z "$as_dir" && as_dir=.
+ echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+
+ } >&5
+
+@@ -1314,7 +1954,7 @@
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++ *\'*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+@@ -1349,8 +1989,8 @@
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log. We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+@@ -1363,20 +2003,34 @@
+ _ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+-{
++(
++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ *) $as_unset $ac_var ;;
++ esac ;;
++ esac
++ done
+ (set) 2>&1 |
+- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++ *${as_nl}ac_space=\ *)
+ sed -n \
+- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+- ;;
++ "s/'\''/'\''\\\\'\'''\''/g;
++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++ ;; #(
+ *)
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+- esac;
+-}
++ esac |
++ sort
++)
+ echo
+
+ cat <<\_ASBOX
+@@ -1387,22 +2041,22 @@
+ echo
+ for ac_var in $ac_subst_vars
+ do
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ eval ac_val=\$$ac_var
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ eval ac_val=\$$ac_var
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+@@ -1414,26 +2068,24 @@
+ ## ----------- ##
+ _ASBOX
+ echo
+- sed "/^$/d" confdefs.h | sort
++ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
+ } >&5
+- rm -f core *.core &&
+- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++ rm -f core *.core core.conftest.* &&
++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+- ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
+
+ # Predefined preprocessor variables.
+
+@@ -1464,14 +2116,17 @@
+
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+- if test "x$prefix" != xNONE; then
+- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+- else
+- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+- fi
++if test -n "$CONFIG_SITE"; then
++ set x "$CONFIG_SITE"
++elif test "x$prefix" != xNONE; then
++ set x "$prefix/share/config.site" "$prefix/etc/config.site"
++else
++ set x "$ac_default_prefix/share/config.site" \
++ "$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in $CONFIG_SITE; do
++shift
++for ac_site_file
++do
+ if test -r "$ac_site_file"; then
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+@@ -1487,8 +2142,8 @@
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+- [\\/]* | ?:[\\/]* ) . $cache_file;;
+- *) . ./$cache_file;;
++ [\\/]* | ?:[\\/]* ) . "$cache_file";;
++ *) . "./$cache_file";;
+ esac
+ fi
+ else
+@@ -1500,12 +2155,11 @@
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+- eval ac_new_val="\$ac_env_${ac_var}_value"
++ eval ac_old_val=\$ac_cv_env_${ac_var}_value
++ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+@@ -1530,8 +2184,7 @@
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+@@ -1548,12 +2201,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+
+
+
+@@ -1570,110 +2217,165 @@
+
+
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ ac_aux_dir=
+-for ac_dir in admin $srcdir/admin; do
+- if test -f $ac_dir/install-sh; then
++for ac_dir in admin "$srcdir"/admin; do
++ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+- elif test -f $ac_dir/install.sh; then
++ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+- elif test -f $ac_dir/shtool; then
++ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
++
+
+
+ unset CDPATH
+
+ # Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+- ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
++ ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+- ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++ if test "x$host_alias" = x; then
++ ac_cv_host=$ac_cv_build
++else
++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
++fi
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ if test "${ac_cv_target+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+- ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++ if test "x$target_alias" = x; then
++ ac_cv_target=$ac_cv_host
++else
++ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
++fi
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6; }
++case $ac_cv_target in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
++echo "$as_me: error: invalid value of canonical target" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_target
++shift
++target_cpu=$1
++target_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++target_os=$*
++IFS=$ac_save_IFS
++case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+ # The aliases save the names the user supplied, while $host etc.
+@@ -1683,17 +2385,17 @@
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+ test "$program_prefix" != NONE &&
+- program_transform_name="s,^,$program_prefix,;$program_transform_name"
++ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
++ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+ # Double any \ or $. echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++rm -f conftest.sed
+
+
+ am__api_version="1.9"
+@@ -1715,8 +2417,8 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1738,7 +2440,7 @@
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -1757,21 +2459,22 @@
+ ;;
+ esac
+ done
++IFS=$as_save_IFS
+
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+- # As a last resort, use the slow shell script. We don't cache a
+- # path for INSTALL within a source directory, because that will
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+- # removed, or if the path is relative.
++ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1785,8 +2488,8 @@
+ if test -z "$kde_save_INSTALL_given" ; then
+ # OK, user hasn't given any INSTALL, autoconf found one for us
+ # now we test, if it supports the -p flag
+- echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for -p flag to install" >&5
++echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
+ rm -f confinst.$$.* > /dev/null 2>&1
+ echo "Testtest" > confinst.$$.orig
+ ac_res=no
+@@ -1798,8 +2501,8 @@
+ fi
+ fi
+ rm -f confinst.$$.*
+- echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ fi
+
+ if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
+@@ -1809,8 +2512,8 @@
+ INSTALL_SCRIPT='${INSTALL}'
+ fi
+
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1852,8 +2555,8 @@
+ Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+@@ -1904,8 +2607,8 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1918,41 +2621,44 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AWK="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++ { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$AWK" && break
+ done
+
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+- @echo 'ac_maketemp="$(MAKE)"'
++ @echo 'ac_maketemp=X"$(MAKE)"'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
++if test "$ac_maketemp" != X ; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+ else
+ eval ac_cv_prog_make_${ac_make}_set=no
+@@ -1960,12 +2666,12 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+@@ -2036,8 +2742,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2050,32 +2756,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2088,27 +2796,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- STRIP=$ac_ct_STRIP
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
+ else
+ STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -2128,6 +2850,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 was given.
+if test "${enable_maintainer_mode+set}" = set; then
-+ enableval="$enable_maintainer_mode"
-+ USE_MAINTAINER_MODE=$enableval
++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
-+fi;
-+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
+
++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+
++
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
@@ -3953,347 +6394,3039 @@
unset CDPATH
-@@ -3061,8 +3088,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
+@@ -2146,14 +2893,14 @@
+
+ if test "x$prefix" = "xNONE"; then
+
+- echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+ if test -n "$KDECONFIG"; then
+ kde_cv_path="$KDECONFIG";
+ else
+ kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -2196,8 +2943,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2208,8 +2955,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KDECONFIG=$kde_cv_path
+
+ fi
+@@ -2218,14 +2965,14 @@
+ kde_save_PATH="$PATH"
+ PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+
+- echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+ if test -n "$KDECONFIG"; then
+ kde_cv_path="$KDECONFIG";
+ else
+ kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -2268,8 +3015,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2280,8 +3027,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KDECONFIG=$kde_cv_path
+
+ fi
+@@ -2304,16 +3051,16 @@
+ kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+ kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
+
+- echo "$as_me:$LINENO: checking where to install" >&5
+-echo $ECHO_N "checking where to install... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking where to install" >&5
++echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
+ if test "x$prefix" = "xNONE"; then
+ prefix=$kde_libs_prefix
+- echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
+-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
++ { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
++echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
+ else
+ given_prefix=$prefix
+- echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
+-echo "${ECHO_T}$prefix (as requested)" >&6
++ { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
++echo "${ECHO_T}$prefix (as requested)" >&6; }
+ fi
+
+ # And delete superfluous '/' to make compares easier
+@@ -2326,13 +3073,13 @@
+
+
+
+- # Check whether --enable-fast-perl or --disable-fast-perl was given.
++ # Check whether --enable-fast-perl was given.
+ if test "${enable_fast_perl+set}" = set; then
+- enableval="$enable_fast_perl"
+- with_fast_perl=$enableval
++ enableval=$enable_fast_perl; with_fast_perl=$enableval
+ else
+ with_fast_perl=yes
+-fi;
++fi
++
+
+
+ val=
+@@ -2349,11 +3096,11 @@
+
+
+
+- ac_config_headers="$ac_config_headers config.h"
++ac_config_headers="$ac_config_headers config.h"
+
+ DEPDIR="${am__leading_dot}deps"
+
+- ac_config_commands="$ac_config_commands depfiles"
++ac_config_commands="$ac_config_commands depfiles"
+
+
+ am_make=${MAKE-make}
+@@ -2363,8 +3110,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2391,15 +3138,15 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++# Check whether --enable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+- enableval="$enable_dependency_tracking"
++ enableval=$enable_dependency_tracking;
++fi
+
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+@@ -2419,10 +3166,9 @@
+
+
+
+- # Check whether --enable-debug or --disable-debug was given.
++ # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+- enableval="$enable_debug"
+-
++ enableval=$enable_debug;
+ case $enableval in
+ yes)
+ kde_use_debug_code="yes"
+@@ -2442,18 +3188,18 @@
+ kde_use_debug_code="no"
+ kde_use_debug_define=no
+
+-fi;
++fi
++
+
+- # Check whether --enable-dummyoption or --disable-dummyoption was given.
++ # Check whether --enable-dummyoption was given.
+ if test "${enable_dummyoption+set}" = set; then
+- enableval="$enable_dummyoption"
++ enableval=$enable_dummyoption;
++fi
+
+-fi;
+
+- # Check whether --enable-strict or --disable-strict was given.
++ # Check whether --enable-strict was given.
+ if test "${enable_strict+set}" = set; then
+- enableval="$enable_strict"
+-
++ enableval=$enable_strict;
+ if test $enableval = "no"; then
+ kde_use_strict_options="no"
+ else
+@@ -2462,12 +3208,12 @@
+
+ else
+ kde_use_strict_options="no"
+-fi;
++fi
+
+- # Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+- enableval="$enable_warnings"
+
++ # Check whether --enable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++ enableval=$enable_warnings;
+ if test $enableval = "no"; then
+ kde_use_warnings="no"
+ else
+@@ -2476,20 +3222,21 @@
+
+ else
+ kde_use_warnings="yes"
+-fi;
++fi
++
+
+ if test "$kde_use_debug_code" != "no"; then
+ kde_use_warnings=yes
+ fi
+
+- # Check whether --enable-profile or --disable-profile was given.
++ # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then
+- enableval="$enable_profile"
+- kde_use_profiling=$enableval
++ enableval=$enable_profile; kde_use_profiling=$enableval
+ else
+ kde_use_profiling="no"
+
+-fi;
++fi
++
+
+ CFLAGS=" $CFLAGS"
+
+@@ -2501,8 +3248,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2515,32 +3262,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2553,36 +3302,51 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- CC=$ac_ct_CC
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
+ else
+ CC="$ac_cv_prog_CC"
+ fi
+
+ if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2595,74 +3359,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- CC=$ac_ct_CC
+-else
+- CC="$ac_cv_prog_CC"
+-fi
+
++ fi
+ fi
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2676,7 +3400,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+@@ -2687,6 +3411,7 @@
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+@@ -2704,22 +3429,23 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl
++ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2732,36 +3458,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$CC" && break
+ done
+ fi
+ if test -z "$CC"; then
+ ac_ct_CC=$CC
+- for ac_prog in cl
++ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2774,29 +3502,45 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$ac_ct_CC" && break
+ done
+
+- CC=$ac_ct_CC
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
+ fi
+
+ fi
+@@ -2809,25 +3553,38 @@
+ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C compiler version" >&5
++echo "$as_me:$LINENO: checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++ (eval $ac_compiler --version >&5) 2>&5
ac_status=$?
-@@ -3120,8 +3146,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
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++ (eval $ac_compiler -v >&5) 2>&5
ac_status=$?
-@@ -3237,8 +3262,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
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++ (eval $ac_compiler -V >&5) 2>&5
ac_status=$?
-@@ -3292,8 +3316,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
+ (exit $ac_status); }
+
++
++# List of possible output files. We want to start from the most likely,
++# but we have to check foo.exe before foo, because Cygwin `test -f' looks
++# also for foo.exe. b.out is created by i960 compilers.
++# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
++# But we are not allowed to rm a.*, and we do not want always remove
++# conftest.*, so we will list them literally, when appropriate.
++ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out"
++
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions. Remove them first so a
++# subsequent execution test works.
++rm -f $ac_outfiles conftest.*
++
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -2843,51 +3600,40 @@
+ return 0;
+ }
+ _ACEOF
++
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files $ac_outfiles"
++
++# The following tests should remove their output except files matching conftest.*.
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
+ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
ac_status=$?
-@@ -3338,8 +3361,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
+ (exit $ac_status); }; then
+- # Find the output, starting from the most likely. This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++ for ac_file in $ac_outfiles a.* conftest.* NO
+ do
+ test -f "$ac_file" || continue
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+- ;;
+- conftest.$ac_ext )
+- # This is the source file.
+- ;;
+- [ab].out )
+- # We found the default executable, but exeext='' is most
+- # certainly right.
+- break;;
+- *.* )
+- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- # FIXME: I believe we export ac_cv_exeext for Libtool,
+- # but it would be cool to find out if it's true. Does anybody
+- # maintain Libtool? --akim.
+- export ac_cv_exeext
+- break;;
+- * )
+- break;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++ * ) break;;
+ esac
+ done
++if test "$ac_file" = NO; then
++ { { echo "$as_me:$LINENO: error: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: no output file found
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2899,14 +3645,12 @@
+ { (exit 77); exit 77; }; }
+ fi
+
+-ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+-
+-# Check the compiler produces executables we can run. If not, either
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++# Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+@@ -2931,83 +3675,84 @@
+ fi
+ fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
++# Clean up; list also $ac_file, in case it matched a wildcard entry.
++rm -f $ac_outfiles $ac_file
+
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++if test "${ac_cv_exeext+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
ac_status=$?
-@@ -3383,8 +3405,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
+ (exit $ac_status); }; then
+- # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+- test -f "$ac_file" || continue
+- case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- export ac_cv_exeext
+- break;;
+- * ) break;;
+- esac
+-done
++ # If both `conftest.exe' and `conftest' are `present' (well, observable),
++ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
++ # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
++ for ac_file in conftest.exe conftest conftest.* NO; do
++ test -f "$ac_file" || continue
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ break;;
++ * ) break;;
++ esac
++ done
++ if test "$ac_file" = NO; then
++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ # Clean up; list also $ac_file, in case it matched conftest.*.
++ rm -f $ac_outfiles $ac_file
++
+ else
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
++
+ fi
+
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+
+-rm -f conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++
++
++ac_clean_files=$ac_clean_files_save
++
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
++ rm -f conftest.o conftest.obj
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
ac_status=$?
-@@ -3941,8 +3962,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
+ (exit $ac_status); }; then
+- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++ for ac_file in conftest.o conftest.obj conftest.*; do
++ test -f "$ac_file" || continue;
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+@@ -3023,14 +3768,16 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++
++
++rm -f conftest.*
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3079,24 +3826,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3138,97 +3889,23 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
+- fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
+- fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
++
++int
++main ()
+ {
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
+
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+- function prototypes and stuff, but not '\xHH' hex character constants.
+- These don't provoke an error unfortunately, instead are silently treated
+- as 'x'. The following induces an error, until -std1 is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std1. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX 10.20 and later -Ae
+-# HP-UX older versions -Aa -D_HPUX_SOURCE
+-# SVR4 -Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
++rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
-@@ -4000,8 +4020,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
+@@ -3250,81 +3927,24 @@
ac_status=$?
-@@ -4072,8 +4091,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=$?
-@@ -4117,8 +4135,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=$?
-@@ -4296,8 +4313,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+ (exit $ac_status); }; }; then
+- ac_cv_prog_cc_stdc=$ac_arg
+-break
++ :
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+- x|xno)
+- echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+- *)
+- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+- CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C. Since we use `exit',
+-# in C++ we need to declare it. In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+- choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-+ { 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
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+@@ -3351,30 +3971,104 @@
ac_status=$?
-@@ -4408,8 +4424,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
+ (exit $ac_status); }; }; then
+- :
++ ac_cv_prog_cc_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
++
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
++ function prototypes and stuff, but not '\xHH' hex character constants.
++ These don't provoke an error unfortunately, instead are silently treated
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-exit (42);
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
++ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
-@@ -4497,8 +4512,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
+@@ -3396,27 +4090,36 @@
ac_status=$?
-@@ -4600,8 +4614,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
+ (exit $ac_status); }; }; then
+- break
++ ac_cv_prog_cc_c89=$ac_arg
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
+
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3425,8 +4128,8 @@
+
+ depcc="$CC" am_compiler_list=
+
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3515,8 +4218,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+@@ -3538,8 +4241,8 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-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
++{ 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; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -3599,9 +4302,10 @@
+ # 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
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3639,6 +4343,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -3656,8 +4361,8 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3706,9 +4411,10 @@
+ # 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
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3746,6 +4452,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -3796,18 +4503,22 @@
+
+ CXXFLAGS=" $CXXFLAGS"
+
+- ac_ext=cc
++ ac_ext=cpp
+ 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
+-if test -n "$ac_tool_prefix"; then
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++if test -z "$CXX"; then
++ if test -n "$CCC"; then
++ CXX=$CCC
++ else
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3820,36 +4531,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+- echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
++ { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$CXX" && break
+ done
+ fi
+ if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3862,55 +4575,70 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$ac_ct_CXX" && break
+ done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+
+- CXX=$ac_ct_CXX
++ if test "x$ac_ct_CXX" = x; then
++ CXX="g++"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CXX=$ac_ct_CXX
++ fi
+ fi
+
+-
++ fi
++fi
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C++ compiler version" >&5
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++ (eval $ac_compiler --version >&5) 2>&5
ac_status=$?
-@@ -4700,8 +4713,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
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++ (eval $ac_compiler -v >&5) 2>&5
ac_status=$?
-@@ -4785,8 +4797,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
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++ (eval $ac_compiler -V >&5) 2>&5
ac_status=$?
-@@ -4875,8 +4886,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
+ (exit $ac_status); }
+
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3959,24 +4687,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++ ac_cxx_werror_flag=yes
++ ac_cv_prog_cxx_g=no
++ CXXFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4018,47 +4750,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+- CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+- if test "$GXX" = yes; then
+- CXXFLAGS="-g -O2"
+- else
+- CXXFLAGS="-g"
+- fi
+-else
+- if test "$GXX" = yes; then
+- CXXFLAGS="-O2"
+- else
+- CXXFLAGS=
+- fi
+-fi
+-for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
++ CXXFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+@@ -4090,20 +4793,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++ CXXFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+@@ -4130,21 +4832,40 @@
ac_status=$?
-@@ -4963,8 +4973,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=$?
-@@ -5051,8 +5060,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=$?
-@@ -5159,8 +5167,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=$?
-@@ -5253,8 +5260,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=$?
-@@ -5341,8 +5347,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=$?
-@@ -5429,8 +5434,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=$?
-@@ -5517,8 +5521,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=$?
-@@ -5633,8 +5636,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=$?
-@@ -5726,8 +5728,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=$?
-@@ -5815,8 +5816,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=$?
-@@ -5903,8 +5903,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=$?
-@@ -5991,8 +5990,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=$?
-@@ -6079,8 +6077,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=$?
-@@ -6167,8 +6164,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=$?
-@@ -6591,8 +6587,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=$?
-@@ -6718,8 +6713,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=$?
-@@ -6807,8 +6801,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=$?
-@@ -6891,185 +6884,6 @@
+ (exit $ac_status); }; }; then
+- break
++ ac_cv_prog_cxx_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+ fi
+
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++ CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++ if test "$GXX" = yes; then
++ CXXFLAGS="-g -O2"
++ else
++ CXXFLAGS="-g"
++ fi
++else
++ if test "$GXX" = yes; then
++ CXXFLAGS="-O2"
++ else
++ CXXFLAGS=
++ fi
++fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4153,8 +4874,8 @@
+
+ depcc="$CXX" am_compiler_list=
+
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4243,8 +4964,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+@@ -4262,8 +4983,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
++echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
+
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4314,13 +5035,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_bad_compiler=yes
++ kde_bad_compiler=yes
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+-echo "${ECHO_T}$kde_bad_compiler" >&6
++ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
++echo "${ECHO_T}$kde_bad_compiler" >&6; }
+
+ if test "$kde_bad_compiler" = "yes"; then
+ { { echo "$as_me:$LINENO: error:
+@@ -4362,17 +5084,16 @@
+ fi
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
+ kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+
+-
+-ac_ext=cc
++ac_ext=cpp
+ 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'
+@@ -4426,7 +5147,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4440,29 +5163,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-fno-builtin $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
++echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
+ kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -4515,7 +5237,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4529,13 +5253,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ WOVERLOADED_VRITUAL=""
+ fi
+@@ -4556,16 +5280,15 @@
+
+ if test "$kde_use_profiling" = "yes"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
++echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
+ kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -4618,7 +5341,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4632,16 +5357,16 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+
+ CFLAGS="-pg $CFLAGS"
+ CXXFLAGS="-pg $CXXFLAGS"
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -4656,16 +5381,15 @@
+ CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+ CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -4718,7 +5442,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4732,27 +5458,26 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4803,7 +5528,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+@@ -4817,13 +5544,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -4831,16 +5558,15 @@
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
++echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
+ kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -4893,7 +5619,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4907,28 +5635,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-Wundef $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -4981,7 +5708,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4995,28 +5724,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5069,7 +5797,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5083,13 +5813,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -5101,13 +5831,13 @@
+ CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
+ fi
+
+- # Check whether --enable-pch or --disable-pch was given.
++ # Check whether --enable-pch was given.
+ if test "${enable_pch+set}" = set; then
+- enableval="$enable_pch"
+- kde_use_pch=$enableval
++ enableval=$enable_pch; kde_use_pch=$enableval
+ else
+ kde_use_pch=no
+-fi;
++fi
++
+
+ HAVE_GCC_VISIBILITY=0
+
+@@ -5115,16 +5845,15 @@
+ if test "$GXX" = "yes"; then
+ gcc_no_reorder_blocks=NO
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
+ kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5177,7 +5906,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5191,13 +5922,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ gcc_no_reorder_blocks=YES
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -5209,16 +5940,15 @@
+ CFLAGS="$CFLAGS -fno-reorder-blocks"
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5271,7 +6001,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5285,28 +6017,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
+ kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5359,7 +6090,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5373,28 +6106,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
+ kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5447,7 +6179,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5461,28 +6195,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5535,7 +6268,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5549,13 +6284,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_EXCEPTIONS="-fexceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ USE_EXCEPTIONS=
+ fi
+@@ -5563,37 +6298,37 @@
+ ENABLE_PERMISSIVE_FLAG="-fpermissive"
+
+ if test "$kde_use_pch" = "yes"; then
+- echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
+ echo >conftest.h
+ if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
+ kde_gcc_supports_pch=yes
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ kde_gcc_supports_pch=no
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ if test "$kde_gcc_supports_pch" = "yes"; then
+- echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
+ if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
+ kde_gcc_supports_pch=yes
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ kde_gcc_supports_pch=no
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
+
+
+- echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
++echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
+ if test "${kde_cv_opt_noinline_match+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5651,9 +6386,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_opt_noinline_match=no
++ kde_cv_opt_noinline_match=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -5661,8 +6397,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
++echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+
+ if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+ CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5682,16 +6418,15 @@
+
+ if test "$kde_use_pch" = "yes"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
++echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
+ kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5744,7 +6479,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5758,29 +6495,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --pch"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5833,7 +6569,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5847,28 +6585,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -5921,7 +6658,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5935,28 +6674,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -6009,7 +6747,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6023,28 +6763,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -6097,7 +6836,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6111,28 +6852,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
++echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
+ kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -6185,7 +6925,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6199,13 +6941,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --one_per"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -6312,13 +7054,13 @@
+ fi
+
+
+- ac_ext=cc
++ ac_ext=cpp
+ 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
++{ 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
+@@ -6374,9 +7116,10 @@
+ # 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
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6414,6 +7157,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -6431,8 +7175,8 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-echo "${ECHO_T}$CXXCPP" >&6
++{ 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
+@@ -6481,9 +7225,10 @@
+ # 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
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6521,6 +7266,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -6547,16 +7293,15 @@
+ NOOPT_CFLAGS=-O0
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
++echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
+ kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -6609,7 +7354,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6623,22 +7370,21 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ NOOPT_CXXFLAGS=-O0
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+- # Check whether --enable-coverage or --disable-coverage was given.
++ # Check whether --enable-coverage was given.
+ if test "${enable_coverage+set}" = set; then
+- enableval="$enable_coverage"
+-
++ enableval=$enable_coverage;
+ if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
+ ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
+ ac_coverage_linker="-lgcc"
+@@ -6654,36 +7400,36 @@
+ CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
+ LDFLAGS="$LDFLAGS $ac_coverage_linker"
+
+-fi;
++fi
+
+
+
+
+
+
+- # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
++
++ # Check whether --enable-new_ldflags was given.
+ if test "${enable_new_ldflags+set}" = set; then
+- enableval="$enable_new_ldflags"
+- kde_use_new_ldflags=$enableval
++ enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
+ else
+ kde_use_new_ldflags=no
+-fi;
++fi
++
+
+ LDFLAGS_AS_NEEDED=""
+ LDFLAGS_NEW_DTAGS=""
+ if test "x$kde_use_new_ldflags" = "xyes"; then
+ LDFLAGS_NEW_DTAGS=""
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -6736,7 +7482,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6750,29 +7498,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -6825,7 +7572,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6839,13 +7588,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ LDFLAGS_AS_NEEDED="-Wl,--as-needed"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -6855,13 +7604,13 @@
+
+
+
+- # Check whether --enable-final or --disable-final was given.
++ # Check whether --enable-final was given.
+ if test "${enable_final+set}" = set; then
+- enableval="$enable_final"
+- kde_use_final=$enableval
++ enableval=$enable_final; kde_use_final=$enableval
+ else
+ kde_use_final=no
+-fi;
++fi
++
+
+ if test "x$kde_use_final" = "xyes"; then
+ KDE_USE_FINAL_TRUE=""
+@@ -6874,13 +7623,13 @@
+
+
+
+- # Check whether --enable-closure or --disable-closure was given.
++ # Check whether --enable-closure was given.
+ if test "${enable_closure+set}" = set; then
+- enableval="$enable_closure"
+- kde_use_closure=$enableval
++ enableval=$enable_closure; kde_use_closure=$enableval
+ else
+ kde_use_closure=no
+-fi;
++fi
++
+
+ KDE_NO_UNDEFINED=""
+ if test "x$kde_use_closure" = "xyes"; then
+@@ -6891,198 +7640,19 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -4479,7 +9612,125 @@
fi
-@@ -7244,7 +7058,7 @@
+
+
+
+- # Check whether --enable-nmcheck or --disable-nmcheck was given.
++ # Check whether --enable-nmcheck was given.
+ if test "${enable_nmcheck+set}" = set; then
+- enableval="$enable_nmcheck"
+- kde_use_nmcheck=$enableval
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
+ kde_use_nmcheck=no
+-fi;
++fi
++
+
+ if test "$kde_use_nmcheck" = "yes"; then
+ KDE_USE_NMCHECK_TRUE=""
+@@ -7097,10 +7667,9 @@
+
+
+
+-# Check whether --enable-shared or --disable-shared was given.
++# Check whether --enable-shared was given.
+ if test "${enable_shared+set}" = set; then
+- enableval="$enable_shared"
+- p=${PACKAGE-default}
++ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+@@ -7119,12 +7688,12 @@
+ esac
+ else
+ enable_shared=yes
+-fi;
++fi
++
+
+-# Check whether --enable-static or --disable-static was given.
++# Check whether --enable-static was given.
+ if test "${enable_static+set}" = set; then
+- enableval="$enable_static"
+- p=${PACKAGE-default}
++ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+@@ -7143,7 +7712,8 @@
+ esac
+ else
+ enable_static=no
+-fi;
++fi
++
+
+
+
+@@ -7152,11 +7722,11 @@
+ if test -z "$kdelibsuff"; then
+ kdelibsuff="no"
+ fi
+- # Check whether --enable-libsuffix or --disable-libsuffix was given.
++ # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
+- enableval="$enable_libsuffix"
+- kdelibsuff=$enableval
+-fi;
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
++fi
++
+
+ if test "$kdelibsuff" = "auto"; then
+
+@@ -7177,8 +7747,8 @@
+ kdelibsuff=
+ fi
+ if test -z "$kdelibsuff"; then
+- echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+-echo "${ECHO_T}not using lib directory suffix" >&6
++ { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
++echo "${ECHO_T}not using lib directory suffix" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define KDELIBSUFF ""
+@@ -7194,14 +7764,13 @@
+ #define KDELIBSUFF "${kdelibsuff}"
+ _ACEOF
+
+- echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
++ { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
++echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+ fi
+
+-# Check whether --enable-fast-install or --disable-fast-install was given.
++# Check whether --enable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+- enableval="$enable_fast_install"
+- p=${PACKAGE-default}
++ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+@@ -7220,10 +7789,11 @@
+ esac
+ else
+ enable_fast_install=yes
+-fi;
++fi
+
+-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++
++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ if test "${lt_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7247,7 +7817,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
@@ -4488,7 +9739,229 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7349,7 +7163,7 @@
+@@ -7276,37 +7846,184 @@
+ fi
+
+ SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
++ ac_path_GREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in grep ggrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++ # Check for GNU ac_path_GREP and select it if it is found.
++ # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'GREP' >> "conftest.nl"
++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_GREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_GREP="$ac_path_GREP"
++ ac_path_GREP_max=$ac_count
+ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++ $ac_path_GREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+
++else
++ ac_cv_path_GREP=$GREP
++fi
+
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
++
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- with_gnu_ld=no
+-fi;
+-ac_prog=ld
+-if test "$GCC" = yes; then
++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++ then ac_cv_path_EGREP="$GREP -E"
++ else
++ # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_path_EGREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in egrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
++ # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'EGREP' >> "conftest.nl"
++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_EGREP="$ac_path_EGREP"
++ ac_path_EGREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++ $ac_path_EGREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++else
++ ac_cv_path_EGREP=$EGREP
++fi
++
++
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++else
++ with_gnu_ld=no
++fi
++
++ac_prog=ld
++if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -7335,11 +8052,11 @@
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7352,7 +8069,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,
@@ -4497,7 +9970,27 @@
# 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'*)
-@@ -7383,7 +7197,7 @@
+@@ -7372,21 +8089,21 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4506,7 +9999,33 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7413,6 +7227,15 @@
+@@ -7396,29 +8113,38 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_ld_reload_flag='-r'
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4520,9 +10039,14 @@
+ ;;
+esac
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7423,36 +7246,43 @@
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7426,56 +8152,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -4590,7 +10114,37 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-@@ -7499,44 +7329,36 @@
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+
+-echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7502,44 +8235,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -4645,7 +10199,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7552,7 +7374,7 @@
+@@ -7555,7 +8280,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -4654,7 +10208,7 @@
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
-@@ -7568,43 +7390,27 @@
+@@ -7571,43 +8296,27 @@
esac
;;
@@ -4711,7 +10265,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7623,32 +7429,22 @@
+@@ -7626,32 +8335,22 @@
;;
openbsd*)
@@ -4747,7 +10301,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7669,10 +7465,13 @@
+@@ -7672,17 +8371,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4762,7 +10316,16 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -7688,6 +7487,9 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -7691,14 +8393,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -4772,16 +10335,27 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-@@ -7722,7 +7524,7 @@
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
++ enableval=$enable_libtool_lock;
++fi
+
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+ # Some flags need to be propagated to the compiler or linker for good
+@@ -7725,7 +8430,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7725 "configure"' > conftest.$ac_ext
-+ echo '#line 7527 "configure"' > conftest.$ac_ext
+- echo '#line 7728 "configure"' > conftest.$ac_ext
++ echo '#line 8433 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7765,14 +7567,13 @@
+@@ -7768,14 +8473,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4798,7 +10372,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7784,7 +7585,6 @@
+@@ -7787,7 +8491,6 @@
esac
;;
*64-bit*)
@@ -4806,17 +10380,38 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7844,8 +7644,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=$?
-@@ -7880,6 +7679,26 @@
+@@ -7812,8 +8515,8 @@
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7865,8 +8568,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-lt_cv_cc_needs_belf=no
++ lt_cv_cc_needs_belf=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -7876,13 +8580,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -4843,38 +10438,194 @@
esac
-@@ -7920,8 +7739,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=$?
-@@ -8091,8 +7909,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=$?
-@@ -8159,8 +7976,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=$?
-@@ -8275,6 +8091,243 @@
+@@ -7890,8 +8614,8 @@
+
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7941,8 +8665,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_stdc=no
++ ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test $ac_cv_header_stdc = yes; then
+@@ -7999,6 +8724,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -8018,8 +8744,8 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -8042,12 +8768,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -8070,9 +8798,9 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -8112,12 +8840,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Header=no"
++ eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -8132,18 +8862,19 @@
+ for ac_header in dlfcn.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8180,15 +8911,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8222,9 +8954,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -8248,25 +8981,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -8278,17 +9005,258 @@
+
done
+
@@ -4882,13 +10633,13 @@
+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_ext=cpp
+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
++{ 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
@@ -4944,9 +10695,10 @@
+ # 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
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -4984,6 +10736,7 @@
+ac_preproc_ok=:
+break
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -5001,8 +10754,8 @@
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
-+echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6
++{ 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
@@ -5051,9 +10804,10 @@
+ # 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
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -5091,6 +10845,7 @@
+ac_preproc_ok=:
+break
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -5106,7 +10861,7 @@
+ { (exit 1); exit 1; }; }
+fi
+
-+ac_ext=cc
++ac_ext=cpp
+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'
@@ -5117,45 +10872,219 @@
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'
-@@ -8367,7 +8420,7 @@
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8301,36 +9269,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+ fi
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+- echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
++ { echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
++
+ test -n "$F77" && break
+ done
+ fi
+ if test -z "$F77"; then
+ ac_ct_F77=$F77
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8343,48 +9313,63 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_F77="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$ac_ct_F77" && break
+ done
+
+- F77=$ac_ct_F77
++ if test "x$ac_ct_F77" = x; then
++ F77=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ F77=$ac_ct_F77
++ fi
+ fi
+
+
# Provide some information about the compiler.
--echo "$as_me:8370:" \
-+echo "$as_me:8423:" \
- "checking for Fortran 77 compiler version" >&5
+-echo "$as_me:8373:" \
+- "checking for Fortran 77 compiler version" >&5
++echo "$as_me:$LINENO: 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
-@@ -8413,8 +8466,7 @@
- cat conftest.err >&5
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++ (eval $ac_compiler --version >&5) 2>&5
+ ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++ (eval $ac_compiler -v >&5) 2>&5
ac_status=$?
-@@ -8463,8 +8515,7 @@
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++ (eval $ac_compiler -V >&5) 2>&5
ac_status=$?
-@@ -8522,7 +8573,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+@@ -8394,8 +9379,8 @@
+ # input file. (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
+@@ -8434,20 +9419,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8484,13 +9470,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_f77_g=no
++ ac_cv_prog_f77_g=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+ if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8519,13 +9506,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
i=0
- testring="ABCD"
+ teststring="ABCD"
case $build_os in
msdosdjgpp*)
-@@ -8551,20 +8602,70 @@
+@@ -8554,20 +9541,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -5232,7 +11161,33 @@
# 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.
-@@ -8601,9 +8702,6 @@
+@@ -8578,19 +9615,19 @@
+ fi
+
+ if test -n $lt_cv_sys_max_cmd_len ; then
+- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+- echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
++ { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+
+
+
+
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8604,9 +9641,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -5242,7 +11197,7 @@
# 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'"
-@@ -8625,14 +8723,30 @@
+@@ -8628,14 +9662,30 @@
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'"
;;
@@ -5275,7 +11230,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8650,14 +8764,17 @@
+@@ -8653,14 +9703,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -5295,8 +11250,41 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8819,7 +8936,7 @@
+@@ -8778,15 +9831,15 @@
+ lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+- echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++ { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
+- echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${lt_cv_objdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8800,8 +9853,8 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+
+
+@@ -8822,7 +9875,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//'
@@ -5304,7 +11292,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8839,7 +8956,7 @@
+@@ -8842,7 +9895,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -5313,7 +11301,313 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9096,6 +9213,7 @@
+@@ -8852,8 +9905,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8866,32 +9919,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++ { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8904,27 +9959,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- AR=$ac_ct_AR
++ if test "x$ac_ct_AR" = x; then
++ AR="false"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ AR=$ac_ct_AR
++ fi
+ else
+ AR="$ac_cv_prog_AR"
+ fi
+@@ -8932,8 +10001,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8946,32 +10015,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8984,27 +10055,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- RANLIB=$ac_ct_RANLIB
++ if test "x$ac_ct_RANLIB" = x; then
++ RANLIB=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ RANLIB=$ac_ct_RANLIB
++ fi
+ else
+ RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -9012,8 +10097,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9026,32 +10111,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9064,27 +10151,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- STRIP=$ac_ct_STRIP
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
+ else
+ STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -9099,6 +10200,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -5321,7 +11615,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9115,15 +9233,26 @@
+@@ -9118,21 +10220,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -5350,7 +11644,15 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -9149,7 +9278,7 @@
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9152,7 +10265,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5359,7 +11661,31 @@
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
-@@ -9211,7 +9340,7 @@
+@@ -9184,17 +10297,17 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+- echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9214,7 +10327,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5368,7 +11694,52 @@
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
-@@ -9306,68 +9435,25 @@
+@@ -9246,11 +10359,11 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ else
+@@ -9265,21 +10378,21 @@
+ enable_dlopen=yes
+ enable_win32_dll=no
+
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
++ enableval=$enable_libtool_lock;
++fi
+
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+
+-# Check whether --with-pic or --without-pic was given.
++# Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then
+- withval="$with_pic"
+- pic_mode="$withval"
++ withval=$with_pic; pic_mode="$withval"
+ else
+ pic_mode=default
+-fi;
++fi
++
+ test -z "$pic_mode" && pic_mode=default
+
+ # Use C for the default configuration in the libtool script
+@@ -9309,68 +10422,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -5452,7 +11823,18 @@
## CAVEAT EMPTOR:
-@@ -9396,18 +9482,20 @@
+@@ -9384,8 +10454,8 @@
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9399,26 +10469,28 @@
# 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 \
@@ -5460,13 +11842,13 @@
+ -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:9402: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9405: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10475: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9406: \$? = $ac_status" >&5
-+ echo "$as_me:9492: \$? = $ac_status" >&5
+- echo "$as_me:9409: \$? = $ac_status" >&5
++ echo "$as_me:10479: \$? = $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
@@ -5478,7 +11860,28 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9468,6 +9556,11 @@
+ $rm conftest*
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+@@ -9432,8 +10504,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -9471,6 +10543,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -5490,7 +11893,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9484,7 +9577,7 @@
+@@ -9487,7 +10564,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5499,7 +11902,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9510,6 +9603,16 @@
+@@ -9513,6 +10590,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -5516,7 +11919,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9521,7 +9624,7 @@
+@@ -9524,7 +10611,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.
@@ -5525,7 +11928,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9544,13 +9647,20 @@
+@@ -9547,13 +10634,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -5548,7 +11951,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9565,15 +9675,15 @@
+@@ -9568,15 +10662,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5570,7 +11973,7 @@
;;
sunos4*)
-@@ -9582,7 +9692,7 @@
+@@ -9585,7 +10679,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -5579,7 +11982,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9595,6 +9705,17 @@
+@@ -9598,6 +10692,17 @@
fi
;;
@@ -5597,7 +12000,28 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9629,18 +9750,20 @@
+@@ -9609,16 +10714,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9632,26 +10737,28 @@
# 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 \
@@ -5605,13 +12029,13 @@
+ -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:9635: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9756: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9638: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10743: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9639: \$? = $ac_status" >&5
-+ echo "$as_me:9760: \$? = $ac_status" >&5
+- echo "$as_me:9642: \$? = $ac_status" >&5
++ echo "$as_me:10747: \$? = $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
@@ -5623,25 +12047,37 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9661,7 +9784,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+@@ -9664,7 +10771,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=
-@@ -9671,6 +9794,48 @@
+@@ -9674,8 +10781,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -5668,8 +12104,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+ :
@@ -5678,10 +12114,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9683,38 +9848,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9686,60 +10835,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5702,13 +12140,13 @@
+ -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:9702: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9860: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9705: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10847: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9706: \$? = $ac_status" >&5
-+ echo "$as_me:9864: \$? = $ac_status" >&5
+- echo "$as_me:9709: \$? = $ac_status" >&5
++ echo "$as_me:10851: \$? = $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
@@ -5732,10 +12170,50 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9785,6 +9948,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -9749,8 +10896,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag=
+@@ -9788,7 +10935,17 @@
# 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
@@ -5746,10 +12224,11 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
++
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9795,6 +9968,10 @@
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -9798,6 +10955,10 @@
with_gnu_ld=no
fi
;;
@@ -5760,7 +12239,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9805,6 +9982,27 @@
+@@ -9808,6 +10969,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5788,7 +12267,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9842,7 +10040,7 @@
+@@ -9845,7 +11027,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5797,7 +12276,7 @@
else
ld_shlibs=no
fi
-@@ -9852,13 +10050,13 @@
+@@ -9855,13 +11037,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'
@@ -5814,7 +12293,7 @@
# 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
-@@ -9867,23 +10065,70 @@
+@@ -9870,23 +11052,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5890,7 +12369,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9897,13 +10142,40 @@
+@@ -9900,13 +11129,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5933,7 +12412,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9913,24 +10185,19 @@
+@@ -9916,24 +11172,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5965,7 +12444,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9942,7 +10209,7 @@
+@@ -9945,7 +11196,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -5974,7 +12453,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9964,9 +10231,21 @@
+@@ -9967,9 +11218,21 @@
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
@@ -5998,7 +12477,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9983,7 +10262,7 @@
+@@ -9986,7 +11249,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -6007,7 +12486,7 @@
# 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`
-@@ -10002,8 +10281,12 @@
+@@ -10005,8 +11268,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -6020,7 +12499,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10011,22 +10294,23 @@
+@@ -10014,22 +11281,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -6051,17 +12530,14 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10050,8 +10334,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=$?
-@@ -10078,14 +10361,13 @@
+@@ -10076,19 +11344,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -6079,17 +12555,17 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10112,8 +10394,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=$?
-@@ -10145,13 +10426,11 @@
+@@ -10138,7 +11407,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10148,13 +11419,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -6106,7 +12582,7 @@
fi
fi
;;
-@@ -10164,7 +10443,7 @@
+@@ -10167,7 +11436,7 @@
ld_shlibs=no
;;
@@ -6115,7 +12591,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10174,13 +10453,13 @@
+@@ -10177,13 +11446,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -6132,7 +12608,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -10190,52 +10469,52 @@
+@@ -10193,52 +11462,52 @@
;;
darwin* | rhapsody*)
@@ -6225,7 +12701,7 @@
fi
;;
-@@ -10269,8 +10548,8 @@
+@@ -10272,8 +11541,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6236,7 +12712,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10278,7 +10557,7 @@
+@@ -10281,7 +11550,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -6245,7 +12721,7 @@
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
-@@ -10292,47 +10571,62 @@
+@@ -10295,47 +11564,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -6332,7 +12808,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10346,7 +10640,7 @@
+@@ -10349,7 +11633,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -6341,7 +12817,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'
-@@ -10356,7 +10650,7 @@
+@@ -10359,7 +11643,7 @@
link_all_deplibs=yes
;;
@@ -6350,7 +12826,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10379,7 +10673,8 @@
+@@ -10382,7 +11666,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
@@ -6360,7 +12836,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10389,7 +10684,7 @@
+@@ -10392,7 +11677,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -6369,7 +12845,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10400,14 +10695,14 @@
+@@ -10403,14 +11688,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -6386,7 +12862,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'
-@@ -10419,13 +10714,13 @@
+@@ -10422,13 +11707,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6402,7 +12878,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10433,21 +10728,15 @@
+@@ -10436,21 +11721,15 @@
hardcode_libdir_separator=:
;;
@@ -6428,7 +12904,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10456,8 +10745,18 @@
+@@ -10459,8 +11738,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6449,7 +12925,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10466,7 +10765,7 @@
+@@ -10469,7 +11758,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.
@@ -6458,7 +12934,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10514,36 +10813,45 @@
+@@ -10517,36 +11806,45 @@
fi
;;
@@ -6525,8 +13001,14 @@
;;
uts4*)
-@@ -10562,11 +10870,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
+@@ -10561,15 +11859,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -6537,7 +13019,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -10599,6 +10902,7 @@
+@@ -10587,8 +11880,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -10602,6 +11895,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -6545,7 +13038,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10634,7 +10938,7 @@
+@@ -10624,20 +11918,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6554,7 +13064,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10644,7 +10948,20 @@
+@@ -10647,7 +11941,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6576,7 +13086,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10709,7 +11026,7 @@
+@@ -10712,7 +12019,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6585,7 +13095,7 @@
;;
beos*)
-@@ -10718,7 +11035,7 @@
+@@ -10721,7 +12028,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6594,7 +13104,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10734,7 +11051,7 @@
+@@ -10737,7 +12044,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6603,7 +13113,7 @@
need_version=no
need_lib_prefix=no
-@@ -10746,7 +11063,8 @@
+@@ -10749,7 +12056,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6613,7 +13123,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10776,7 +11094,7 @@
+@@ -10779,7 +12087,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6622,7 +13132,7 @@
;;
esac
;;
-@@ -10799,7 +11117,7 @@
+@@ -10802,7 +12110,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6631,7 +13141,7 @@
# 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"`
-@@ -10822,20 +11140,17 @@
+@@ -10825,20 +12133,17 @@
dynamic_linker=no
;;
@@ -6663,7 +13173,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10853,14 +11168,19 @@
+@@ -10856,14 +12161,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6685,7 +13195,7 @@
esac
;;
-@@ -10880,9 +11200,9 @@
+@@ -10883,9 +12193,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6697,7 +13207,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10897,7 +11217,7 @@
+@@ -10900,7 +12210,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6706,7 +13216,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10908,7 +11228,7 @@
+@@ -10911,7 +12221,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6715,7 +13225,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10920,6 +11240,18 @@
+@@ -10923,6 +12233,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6734,7 +13244,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10963,29 +11295,26 @@
+@@ -10966,29 +12288,26 @@
;;
# This must be Linux ELF.
@@ -6771,7 +13281,7 @@
# 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,
-@@ -10995,6 +11324,18 @@
+@@ -10998,6 +12317,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6790,7 +13300,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11004,7 +11345,7 @@
+@@ -11007,7 +12338,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6799,7 +13309,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11032,8 +11373,13 @@
+@@ -11035,8 +12366,13 @@
openbsd*)
version_type=sunos
@@ -6814,7 +13324,7 @@
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
-@@ -11053,7 +11399,7 @@
+@@ -11056,7 +12392,7 @@
os2*)
libname_spec='$name'
@@ -6823,7 +13333,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11071,13 +11417,6 @@
+@@ -11074,13 +12410,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6837,7 +13347,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11103,7 +11442,7 @@
+@@ -11106,7 +12435,7 @@
need_version=yes
;;
@@ -6846,7 +13356,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11136,6 +11475,29 @@
+@@ -11139,6 +12468,29 @@
fi
;;
@@ -6876,17 +13386,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11151,12 +11513,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -11150,16 +12502,21 @@
+ dynamic_linker=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var " || \
@@ -6896,77 +13414,428 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11282,8 +11649,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=$?
-@@ -11386,8 +11752,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=$?
-@@ -11452,8 +11817,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=$?
-@@ -11546,8 +11910,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=$?
-@@ -11612,8 +11975,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=$?
-@@ -11679,8 +12041,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=$?
-@@ -11746,8 +12107,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=$?
-@@ -11806,7 +12166,7 @@
+@@ -11179,8 +12536,8 @@
+ # directories.
+ hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+@@ -11193,29 +12550,29 @@
+
+ striplib=
+ old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ ;;
+ *)
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+ fi
+@@ -11247,8 +12604,8 @@
+
+ darwin*)
+ # if libdl is installed we need to link against it
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11261,17 +12618,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11303,14 +12660,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11324,8 +12682,8 @@
+ ;;
+
+ *)
+- echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11352,30 +12710,24 @@
+
+ #undef shl_load
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char shl_load ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
++#if defined __stub_shl_load || defined __stub___shl_load
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != shl_load;
++return shl_load ();
+ ;
+ return 0;
+ }
+@@ -11407,18 +12759,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_shl_load=no
++ ac_cv_func_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+ lt_cv_dlopen="shl_load"
+ else
+- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11431,17 +12784,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char shl_load ();
+ int
+ main ()
+ {
+-shl_load ();
++return shl_load ();
+ ;
+ return 0;
+ }
+@@ -11473,19 +12826,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_shl_load=no
++ ac_cv_lib_dld_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ else
+- echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11512,30 +12866,24 @@
+
+ #undef dlopen
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
++#if defined __stub_dlopen || defined __stub___dlopen
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != dlopen;
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11567,18 +12915,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_dlopen=no
++ ac_cv_func_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+ if test $ac_cv_func_dlopen = yes; then
+ lt_cv_dlopen="dlopen"
+ else
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11591,17 +12940,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11633,19 +12982,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11658,17 +13008,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11700,19 +13050,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_svld_dlopen=no
++ ac_cv_lib_svld_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11725,17 +13076,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dld_link ();
+ int
+ main ()
+ {
+-dld_link ();
++return dld_link ();
+ ;
+ return 0;
+ }
+@@ -11767,14 +13118,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_dld_link=no
++ ac_cv_lib_dld_dld_link=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+@@ -11809,13 +13161,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -6975,16 +13844,24 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11822,7 +12182,7 @@
+
+- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11825,7 +13177,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11825 "configure"
-+#line 12185 "configure"
+-#line 11828 "configure"
++#line 13180 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11879,6 +12239,8 @@
+@@ -11882,6 +13234,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -6993,7 +13870,7 @@
exit (status);
}
-@@ -11888,12 +12250,12 @@
+@@ -11891,12 +13245,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7008,25 +13885,35 @@
esac
else :
# compilation failed
-@@ -11908,7 +12270,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+@@ -11907,13 +13261,13 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11920,7 +12282,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11923,7 +13277,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11923 "configure"
-+#line 12285 "configure"
+-#line 11926 "configure"
++#line 13280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11977,6 +12339,8 @@
+@@ -11980,6 +13334,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -7035,7 +13922,7 @@
exit (status);
}
-@@ -11986,12 +12350,12 @@
+@@ -11989,12 +13345,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7050,17 +13937,38 @@
esac
else :
# compilation failed
-@@ -12024,7 +12388,7 @@
+@@ -12005,8 +13361,8 @@
+
+
fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ fi
+ CPPFLAGS="$save_CPPFLAGS"
+@@ -12027,19 +13383,19 @@
+ fi
+
-# Report which librarie types wil actually be built
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
+# Report which library types will actually be built
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -12036,7 +12400,7 @@
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -7068,7 +13976,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12045,47 +12409,10 @@
+@@ -12048,58 +13404,21 @@
fi
;;
@@ -7116,8 +14024,25 @@
- fi
;;
esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12111,7 +12438,8 @@
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12114,7 +13433,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.
@@ -7127,7 +14052,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 \
-@@ -12225,11 +12553,11 @@
+@@ -12228,11 +13548,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -7141,7 +14066,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12259,6 +12587,12 @@
+@@ -12262,6 +13582,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7154,7 +14079,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12270,6 +12604,9 @@
+@@ -12273,6 +13599,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -7164,7 +14089,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12289,7 +12626,7 @@
+@@ -12292,7 +13621,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7173,7 +14098,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12320,7 +12657,7 @@
+@@ -12323,7 +13652,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7182,7 +14107,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12335,7 +12672,7 @@
+@@ -12338,7 +13667,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -7191,7 +14116,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12562,7 +12899,10 @@
+@@ -12565,7 +13894,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.
@@ -7203,7 +14128,23 @@
fi
-@@ -12597,6 +12937,9 @@
+@@ -12578,11 +13910,11 @@
+ CC="$lt_save_CC"
+
+
+-# Check whether --with-tags or --without-tags was given.
++# Check whether --with-tags was given.
+ if test "${with_tags+set}" = set; then
+- withval="$with_tags"
+- tagnames="$withval"
+-fi;
++ withval=$with_tags; tagnames="$withval"
++fi
++
+
+ if test -f "$ltmain" && test -n "$tagnames"; then
+ if test ! -f "${ofile}"; then
+@@ -12600,6 +13932,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -7213,18 +14154,20 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12627,7 +12970,9 @@
+@@ -12630,8 +13965,10 @@
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
+- ac_ext=cc
+ 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_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12647,6 +12992,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -12650,6 +13987,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -7232,7 +14175,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12664,7 +13010,7 @@
+@@ -12667,7 +14005,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -7241,7 +14184,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12674,17 +13020,34 @@
+@@ -12677,17 +14015,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -7277,7 +14220,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12695,18 +13058,27 @@
+@@ -12698,18 +14053,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -7308,7 +14251,48 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12777,7 +13149,7 @@
+@@ -12723,18 +14087,18 @@
+ # Set up default GNU C++ configuration
+
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++# Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+ with_gnu_ld=no
+-fi;
++fi
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -12763,11 +14127,11 @@
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12780,7 +14144,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,
@@ -7317,7 +14301,27 @@
# 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'*)
-@@ -12811,7 +13183,7 @@
+@@ -12800,21 +14164,21 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7326,7 +14330,18 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12830,8 +13202,8 @@
+@@ -12824,8 +14188,8 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+@@ -12833,8 +14197,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
@@ -7337,7 +14352,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12857,7 +13229,7 @@
+@@ -12860,7 +14224,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.
@@ -7346,7 +14361,18 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12888,8 +13260,23 @@
+@@ -12875,8 +14239,8 @@
+ fi
+
+ # PORTME: fill in a description of your system's C++ link characteristics
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+ aix3*)
+@@ -12891,8 +14255,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -7372,7 +14398,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12906,7 +13293,7 @@
+@@ -12909,7 +14288,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -7381,7 +14407,7 @@
# 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`
-@@ -12925,8 +13312,12 @@
+@@ -12928,8 +14307,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -7394,7 +14420,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12935,15 +13326,16 @@
+@@ -12938,15 +14321,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7415,18 +14441,17 @@
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.
-@@ -12973,8 +13365,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=$?
-@@ -13003,13 +13394,12 @@
+@@ -12999,20 +14383,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
@@ -7441,17 +14466,17 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13036,8 +13426,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=$?
-@@ -13069,16 +13458,26 @@
+@@ -13062,7 +14447,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13072,16 +14459,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -7483,7 +14508,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13092,12 +13491,12 @@
+@@ -13095,12 +14492,12 @@
# _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'
@@ -7498,7 +14523,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
-@@ -13106,70 +13505,81 @@
+@@ -13109,70 +14506,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7632,7 +14657,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13180,14 +13590,14 @@
+@@ -13183,14 +14591,14 @@
;;
esac
;;
@@ -7649,7 +14674,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13204,12 +13614,12 @@
+@@ -13207,12 +14615,12 @@
# location of the library.
case $cc_basename in
@@ -7665,7 +14690,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13218,11 +13628,11 @@
+@@ -13221,11 +14629,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.
@@ -7679,7 +14704,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13232,33 +13642,22 @@
+@@ -13235,33 +14643,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -7720,7 +14745,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13269,17 +13668,20 @@
+@@ -13272,17 +14669,20 @@
esac
case $cc_basename in
@@ -7747,7 +14772,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13295,12 +13697,15 @@
+@@ -13298,12 +14698,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -7767,7 +14792,7 @@
;;
esac
fi
-@@ -13311,11 +13716,25 @@
+@@ -13314,11 +14717,25 @@
;;
esac
;;
@@ -7795,7 +14820,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13326,9 +13745,9 @@
+@@ -13329,9 +14746,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -7807,7 +14832,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13337,16 +13756,16 @@
+@@ -13340,16 +14757,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -7828,7 +14853,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13364,20 +13783,44 @@
+@@ -13367,20 +14784,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7879,7 +14904,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13405,7 +13848,7 @@
+@@ -13408,7 +14849,7 @@
;;
mvs*)
case $cc_basename in
@@ -7888,7 +14913,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13415,7 +13858,7 @@
+@@ -13418,7 +14859,7 @@
;;
esac
;;
@@ -7897,7 +14922,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13426,15 +13869,31 @@
+@@ -13429,15 +14870,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::"'
;;
@@ -7931,7 +14956,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13444,14 +13903,14 @@
+@@ -13447,14 +14904,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7949,7 +14974,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13469,7 +13928,7 @@
+@@ -13472,7 +14929,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7958,7 +14983,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13488,13 +13947,13 @@
+@@ -13491,13 +14948,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -7974,7 +14999,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13503,17 +13962,17 @@
+@@ -13506,17 +14963,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -7996,7 +15021,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13532,7 +13991,7 @@
+@@ -13535,7 +14992,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8005,7 +15030,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13553,27 +14012,14 @@
+@@ -13556,27 +15013,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -8035,7 +15060,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13586,36 +14032,33 @@
+@@ -13589,36 +15033,33 @@
;;
solaris*)
case $cc_basename in
@@ -8084,7 +15109,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13623,9 +14066,9 @@
+@@ -13626,9 +15067,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -8096,7 +15121,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13635,9 +14078,9 @@
+@@ -13638,9 +15079,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
@@ -8108,7 +15133,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13646,9 +14089,9 @@
+@@ -13649,9 +15090,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -8120,7 +15145,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13661,12 +14104,63 @@
+@@ -13664,12 +15105,63 @@
;;
esac
;;
@@ -8186,7 +15211,18 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13723,7 +14217,7 @@
+@@ -13689,8 +15181,8 @@
+ ld_shlibs_CXX=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+ GCC_CXX="$GXX"
+@@ -13726,7 +15218,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.
@@ -8195,7 +15231,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13763,7 +14257,7 @@
+@@ -13766,7 +15258,7 @@
fi
;;
@@ -8204,7 +15240,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13799,6 +14293,29 @@
+@@ -13802,6 +15294,29 @@
$rm -f confest.$objext
@@ -8234,7 +15270,18 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13846,6 +14363,10 @@
+@@ -13810,8 +15325,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -13849,6 +15364,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -8245,7 +15292,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13854,7 +14375,7 @@
+@@ -13857,7 +15376,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8254,7 +15301,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13879,18 +14400,28 @@
+@@ -13882,18 +15401,28 @@
;;
chorus*)
case $cc_basename in
@@ -8286,7 +15333,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13898,22 +14429,22 @@
+@@ -13901,22 +15430,22 @@
;;
esac
;;
@@ -8315,7 +15362,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13926,9 +14457,13 @@
+@@ -13929,9 +15458,13 @@
;;
esac
;;
@@ -8330,7 +15377,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13937,20 +14472,26 @@
+@@ -13940,20 +15473,26 @@
;;
esac
;;
@@ -8361,7 +15408,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13967,25 +14508,25 @@
+@@ -13970,25 +15509,25 @@
;;
mvs*)
case $cc_basename in
@@ -8392,7 +15439,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13999,24 +14540,15 @@
+@@ -14002,24 +15541,15 @@
;;
psos*)
;;
@@ -8419,7 +15466,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14026,12 +14558,12 @@
+@@ -14029,12 +15559,12 @@
;;
sunos4*)
case $cc_basename in
@@ -8434,7 +15481,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14041,7 +14573,7 @@
+@@ -14044,7 +15574,7 @@
;;
tandem*)
case $cc_basename in
@@ -8443,7 +15490,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14049,7 +14581,14 @@
+@@ -14052,7 +15582,14 @@
;;
esac
;;
@@ -8459,7 +15506,28 @@
;;
vxworks*)
;;
-@@ -14082,18 +14621,20 @@
+@@ -14062,16 +15599,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14085,26 +15622,28 @@
# 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 \
@@ -8467,13 +15535,13 @@
+ -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:14088: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14627: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14091: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15628: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14092: \$? = $ac_status" >&5
-+ echo "$as_me:14631: \$? = $ac_status" >&5
+- echo "$as_me:14095: \$? = $ac_status" >&5
++ echo "$as_me:15632: \$? = $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
@@ -8485,46 +15553,40 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -14114,7 +14655,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+ if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+@@ -14117,7 +15656,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=
-@@ -14124,50 +14665,90 @@
+@@ -14127,8 +15666,50 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_cv_prog_compiler_c_o_CXX=no
-- $rm -r conftest 2>/dev/null
-- mkdir conftest
-- cd conftest
-- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
-- lt_compiler_flag="-o out/conftest2.$ac_objext"
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -8548,8 +15610,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+ :
@@ -8558,19 +15620,23 @@
+fi
+
+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o_CXX=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14139,60 +15720,58 @@
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+-
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -8580,13 +15646,13 @@
+ -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:14155: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14731: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14158: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15732: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14159: \$? = $ac_status" >&5
-+ echo "$as_me:14735: \$? = $ac_status" >&5
+- echo "$as_me:14162: \$? = $ac_status" >&5
++ echo "$as_me:15736: \$? = $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
@@ -8610,7 +15676,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14217,7 +14798,10 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -14202,8 +15781,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -14220,22 +15799,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -8622,8 +15727,13 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14228,11 +14812,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8634,7 +15744,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -14265,6 +14844,7 @@
+@@ -14253,8 +15830,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -14268,6 +15845,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -8642,7 +15763,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14300,7 +14880,7 @@
+@@ -14290,20 +15868,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8651,7 +15789,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14310,7 +14890,20 @@
+@@ -14313,7 +15891,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8673,7 +15811,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14375,7 +14968,7 @@
+@@ -14378,7 +15969,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8682,7 +15820,7 @@
;;
beos*)
-@@ -14384,7 +14977,7 @@
+@@ -14387,7 +15978,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8691,7 +15829,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14400,7 +14993,7 @@
+@@ -14403,7 +15994,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8700,7 +15838,7 @@
need_version=no
need_lib_prefix=no
-@@ -14412,7 +15005,8 @@
+@@ -14415,7 +16006,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8710,7 +15848,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14442,7 +15036,7 @@
+@@ -14445,7 +16037,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8719,7 +15857,7 @@
;;
esac
;;
-@@ -14465,7 +15059,7 @@
+@@ -14468,7 +16060,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8728,7 +15866,7 @@
# 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"`
-@@ -14488,20 +15082,17 @@
+@@ -14491,20 +16083,17 @@
dynamic_linker=no
;;
@@ -8760,7 +15898,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14519,14 +15110,19 @@
+@@ -14522,14 +16111,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8782,7 +15920,7 @@
esac
;;
-@@ -14546,9 +15142,9 @@
+@@ -14549,9 +16143,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8794,7 +15932,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14563,7 +15159,7 @@
+@@ -14566,7 +16160,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8803,7 +15941,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14574,7 +15170,7 @@
+@@ -14577,7 +16171,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8812,7 +15950,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14586,6 +15182,18 @@
+@@ -14589,6 +16183,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -8831,7 +15969,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14629,29 +15237,26 @@
+@@ -14632,29 +16238,26 @@
;;
# This must be Linux ELF.
@@ -8868,10 +16006,11 @@
# 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,
-@@ -14661,6 +15266,18 @@
+@@ -14664,7 +16267,19 @@
dynamic_linker='GNU/Linux ld.so'
;;
+-netbsd*)
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -8884,10 +16023,11 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- netbsd*)
++netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14670,7 +15287,7 @@
+ need_version=no
+@@ -14673,7 +16288,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8896,7 +16036,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14698,8 +15315,13 @@
+@@ -14701,8 +16316,13 @@
openbsd*)
version_type=sunos
@@ -8911,7 +16051,7 @@
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
-@@ -14719,7 +15341,7 @@
+@@ -14722,7 +16342,7 @@
os2*)
libname_spec='$name'
@@ -8920,7 +16060,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14737,13 +15359,6 @@
+@@ -14740,13 +16360,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -8934,7 +16074,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14769,7 +15384,7 @@
+@@ -14772,7 +16385,7 @@
need_version=yes
;;
@@ -8943,7 +16083,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14802,6 +15417,29 @@
+@@ -14805,6 +16418,29 @@
fi
;;
@@ -8973,17 +16113,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14817,12 +15455,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -14816,16 +16452,21 @@
+ dynamic_linker=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var CXX" || \
@@ -8993,7 +16141,18 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14854,1118 +15497,293 @@
+@@ -14845,8 +16486,8 @@
+ # directories.
+ hardcode_action_CXX=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-echo "${ECHO_T}$hardcode_action_CXX" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+
+ if test "$hardcode_action_CXX" = relink; then
+ # Fast installation is not supported
+@@ -14857,1155 +16498,330 @@
enable_fast_install=needless
fi
@@ -9022,17 +16181,7 @@
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- ;;
-- esac
--fi
-
--if test "x$enable_dlopen" != xyes; then
-- enable_dlopen=unknown
-- enable_dlopen_self=unknown
-- enable_dlopen_self_static=unknown
--else
-- lt_cv_dlopen=no
-- lt_cv_dlopen_libs=
++
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
@@ -9090,12 +16239,7 @@
+ lt_cv_prog_compiler_c_o_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
-
-- case $host_os in
-- beos*)
-- lt_cv_dlopen="load_add_on"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
++
+ case $var in
+ old_archive_cmds_CXX | \
+ old_archive_from_new_cmds_CXX | \
@@ -9122,20 +16266,39 @@
+ *'\$0 --fallback-echo"')
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
;;
-+ esac
+ esac
+-fi
+-if test "x$enable_dlopen" != xyes; then
+- enable_dlopen=unknown
+- enable_dlopen_self=unknown
+- enable_dlopen_self_static=unknown
+-else
+- lt_cv_dlopen=no
+- lt_cv_dlopen_libs=
++cfgfile="$ofile"
+
+- case $host_os in
+- beos*)
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ;;
++ cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-+cfgfile="$ofile"
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
- darwin*)
- # if libdl is installed we need to link against it
@@ -9152,7 +16315,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9195,8 +16359,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
-ac_cv_lib_dl_dlopen=no
-fi
@@ -9209,22 +16373,24 @@
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-fi
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
- ;;
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -9241,31 +16407,30 @@
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
-#undef shl_load
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# A C compiler.
++LTCC=$lt_LTCC
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9286,9 +16451,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-int
-main ()
@@ -9324,8 +16488,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A C compiler.
-+LTCC=$lt_LTCC
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-ac_cv_func_shl_load=no
-fi
@@ -9350,8 +16514,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9394,8 +16558,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
-ac_cv_lib_dld_shl_load=no
-fi
@@ -9422,27 +16586,27 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# The linker used to build libraries.
++LD=$lt_LD_CXX
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# A BSD-compatible nm program.
++NM=$lt_NM
-#undef dlopen
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# A symbol stripping program
++STRIP=$lt_STRIP
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9463,8 +16627,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
-int
-main ()
@@ -9500,8 +16664,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
-ac_cv_func_dlopen=no
-fi
@@ -9526,8 +16690,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9570,8 +16734,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# Used on cygwin: assembler.
++AS="$AS"
-ac_cv_lib_dl_dlopen=no
-fi
@@ -9597,8 +16761,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9641,8 +16805,9 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: assembler.
-+AS="$AS"
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
-ac_cv_lib_svld_dlopen=no
-fi
@@ -9668,8 +16833,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9712,9 +16877,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# Object file suffix (normally "o").
++objext="$ac_objext"
-ac_cv_lib_dld_dld_link=no
-fi
@@ -9727,13 +16891,6 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-
--fi
+# Old archive suffix (normally "a").
+libext="$libext"
@@ -9766,35 +16923,42 @@
+# Do we need a version for libraries?
+need_version=$need_version
-- ;;
-- esac
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+-fi
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+
+- ;;
+- esac
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -9807,20 +16971,20 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15491 "configure"
+-#line 15494 "configure"
-#include "confdefs.h"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Library versioning type.
++version_type=$version_type
-#include <stdio.h>
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -9831,8 +16995,9 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Library versioning type.
-+version_type=$version_type
++# List of archive names. First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -9855,23 +17020,25 @@
-# endif
-# endif
-#endif
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
- if (self)
- {
@@ -9879,11 +17046,8 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
- exit (status);
-}
@@ -9906,21 +17070,23 @@
- fi
-fi
-rm -fr conftest*
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -9934,23 +17100,23 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15589 "configure"
+-#line 15592 "configure"
-#include "confdefs.h"
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
-#include <stdio.h>
+# Dependencies to place before the objects being linked to create a
+# shared library.
-+predep_objects=$lt_predep_objects_CXX
++predeps=$lt_predeps_CXX
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -9963,7 +17129,7 @@
-#endif
+# Dependencies to place after the objects being linked to create a
+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
++postdeps=$lt_postdeps_CXX
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -9986,27 +17152,33 @@
-# endif
-# endif
-#endif
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
- exit (status);
-}
-EOF
@@ -10028,31 +17200,45 @@
- fi
-fi
-rm -fr conftest*
--
--
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
--
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
--
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
--
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
--
--
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
+
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -10329,13 +17515,49 @@
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+-
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -16081,7 +15899,10 @@
+ # Is shlibpath searched before the hard-coded library search path?
+ shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+@@ -16084,7 +16900,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.
@@ -10347,7 +17569,7 @@
fi
-@@ -16153,16 +15974,42 @@
+@@ -16156,29 +16975,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -10387,12 +17609,23 @@
+ 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
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
+
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16175,7 +16022,7 @@
-
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -10400,7 +17633,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16183,8 +16030,10 @@
+@@ -16186,21 +17031,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -10412,17 +17645,38 @@
+ fi
;;
esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16197,8 +16046,6 @@
- echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
+-
-test "$ld_shlibs_F77" = no && can_build_shared=no
--
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
GCC_F77="$G77"
LD_F77="$LD"
+@@ -16209,8 +17054,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
-@@ -16245,6 +16092,11 @@
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_F77='-Wl,'
+@@ -16248,6 +17093,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -10434,7 +17688,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16261,7 +16113,7 @@
+@@ -16264,7 +17114,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -10443,7 +17697,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16287,6 +16139,16 @@
+@@ -16290,6 +17140,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -10460,7 +17714,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16298,7 +16160,7 @@
+@@ -16301,7 +17161,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.
@@ -10469,7 +17723,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16321,13 +16183,20 @@
+@@ -16324,13 +17184,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10492,7 +17746,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16342,15 +16211,15 @@
+@@ -16345,15 +17212,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -10514,7 +17768,7 @@
;;
sunos4*)
-@@ -16359,7 +16228,7 @@
+@@ -16362,7 +17229,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10523,7 +17777,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16372,6 +16241,17 @@
+@@ -16375,6 +17242,17 @@
fi
;;
@@ -10541,7 +17795,28 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16406,18 +16286,20 @@
+@@ -16386,16 +17264,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16409,26 +17287,28 @@
# 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 \
@@ -10549,13 +17824,13 @@
+ -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:16412: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16292: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16415: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17293: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16416: \$? = $ac_status" >&5
-+ echo "$as_me:16296: \$? = $ac_status" >&5
+- echo "$as_me:16419: \$? = $ac_status" >&5
++ echo "$as_me:17297: \$? = $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
@@ -10567,25 +17842,37 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16438,7 +16320,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+@@ -16441,7 +17321,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=
-@@ -16448,6 +16330,48 @@
+@@ -16451,8 +17331,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -10612,8 +17899,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+ :
@@ -10622,10 +17909,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16460,38 +16384,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16463,60 +17385,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -10646,13 +17935,13 @@
+ -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:16479: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16396: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16482: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17397: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16483: \$? = $ac_status" >&5
-+ echo "$as_me:16400: \$? = $ac_status" >&5
+- echo "$as_me:16486: \$? = $ac_status" >&5
++ echo "$as_me:17401: \$? = $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
@@ -10676,7 +17965,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16562,6 +16484,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -16526,8 +17446,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_F77=
+@@ -16565,6 +17485,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -10693,7 +18021,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16572,6 +16504,10 @@
+@@ -16575,6 +17505,10 @@
with_gnu_ld=no
fi
;;
@@ -10704,7 +18032,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16582,6 +16518,27 @@
+@@ -16585,6 +17519,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -10732,7 +18060,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16619,7 +16576,7 @@
+@@ -16622,7 +17577,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -10741,7 +18069,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16629,13 +16586,13 @@
+@@ -16632,13 +17587,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'
@@ -10758,7 +18086,7 @@
# 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
-@@ -16644,23 +16601,70 @@
+@@ -16647,23 +17602,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -10835,7 +18163,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16674,13 +16678,40 @@
+@@ -16677,13 +17679,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10878,7 +18206,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16690,24 +16721,19 @@
+@@ -16693,24 +17722,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10910,7 +18238,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16719,7 +16745,7 @@
+@@ -16722,7 +17746,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -10919,7 +18247,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16741,9 +16767,21 @@
+@@ -16744,9 +17768,21 @@
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
@@ -10943,7 +18271,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16760,7 +16798,7 @@
+@@ -16763,7 +17799,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -10952,7 +18280,7 @@
# 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`
-@@ -16779,8 +16817,12 @@
+@@ -16782,8 +17818,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -10965,7 +18293,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16788,22 +16830,23 @@
+@@ -16791,22 +17831,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -10996,17 +18324,14 @@
program main
end
-@@ -16817,8 +16860,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -16845,14 +16887,13 @@
+@@ -16843,19 +17884,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11024,17 +18349,17 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16869,8 +16910,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -16902,13 +16942,11 @@
+@@ -16895,7 +17937,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -16905,13 +17949,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -11051,7 +18376,7 @@
fi
fi
;;
-@@ -16921,7 +16959,7 @@
+@@ -16924,7 +17966,7 @@
ld_shlibs_F77=no
;;
@@ -11060,7 +18385,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16931,68 +16969,68 @@
+@@ -16934,68 +17976,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -11173,7 +18498,7 @@
fi
;;
-@@ -17026,8 +17064,8 @@
+@@ -17029,8 +18071,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -11184,7 +18509,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17035,7 +17073,7 @@
+@@ -17038,7 +18080,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -11193,7 +18518,7 @@
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
-@@ -17049,47 +17087,62 @@
+@@ -17052,47 +18094,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -11280,7 +18605,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17103,7 +17156,7 @@
+@@ -17106,7 +18163,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -11289,7 +18614,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'
-@@ -17113,7 +17166,7 @@
+@@ -17116,7 +18173,7 @@
link_all_deplibs_F77=yes
;;
@@ -11298,7 +18623,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17136,7 +17189,8 @@
+@@ -17139,7 +18196,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
@@ -11308,7 +18633,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17146,7 +17200,7 @@
+@@ -17149,7 +18207,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -11317,7 +18642,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17157,14 +17211,14 @@
+@@ -17160,14 +18218,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -11334,7 +18659,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'
-@@ -17176,13 +17230,13 @@
+@@ -17179,13 +18237,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -11350,7 +18675,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17190,21 +17244,15 @@
+@@ -17193,21 +18251,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -11376,7 +18701,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17213,8 +17261,18 @@
+@@ -17216,8 +18268,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -11397,7 +18722,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17223,7 +17281,7 @@
+@@ -17226,7 +18288,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.
@@ -11406,7 +18731,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17271,36 +17329,45 @@
+@@ -17274,36 +18336,45 @@
fi
;;
@@ -11473,8 +18798,14 @@
;;
uts4*)
-@@ -17319,11 +17386,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
+@@ -17318,15 +18389,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
test "$ld_shlibs_F77" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -11485,7 +18816,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -17356,6 +17418,7 @@
+@@ -17344,8 +18410,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -17359,6 +18425,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -11493,7 +18835,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17391,7 +17454,7 @@
+@@ -17381,20 +18448,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -11502,7 +18861,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17401,7 +17464,20 @@
+@@ -17404,7 +18471,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -11524,7 +18883,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17466,7 +17542,7 @@
+@@ -17469,7 +18549,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11533,7 +18892,7 @@
;;
beos*)
-@@ -17475,7 +17551,7 @@
+@@ -17478,7 +18558,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -11542,7 +18901,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17491,7 +17567,7 @@
+@@ -17494,7 +18574,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -11551,7 +18910,7 @@
need_version=no
need_lib_prefix=no
-@@ -17503,7 +17579,8 @@
+@@ -17506,7 +18586,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -11561,7 +18920,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17533,7 +17610,7 @@
+@@ -17536,7 +18617,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11570,7 +18929,7 @@
;;
esac
;;
-@@ -17556,7 +17633,7 @@
+@@ -17559,7 +18640,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -11579,7 +18938,7 @@
# 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"`
-@@ -17579,20 +17656,17 @@
+@@ -17582,20 +18663,17 @@
dynamic_linker=no
;;
@@ -11611,7 +18970,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17610,14 +17684,19 @@
+@@ -17613,14 +18691,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -11633,7 +18992,7 @@
esac
;;
-@@ -17637,9 +17716,9 @@
+@@ -17640,9 +18723,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -11645,7 +19004,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17654,7 +17733,7 @@
+@@ -17657,7 +18740,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -11654,7 +19013,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17665,7 +17744,7 @@
+@@ -17668,7 +18751,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -11663,7 +19022,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17677,6 +17756,18 @@
+@@ -17680,6 +18763,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -11682,7 +19041,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17720,29 +17811,26 @@
+@@ -17723,29 +18818,26 @@
;;
# This must be Linux ELF.
@@ -11719,7 +19078,7 @@
# 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,
-@@ -17752,6 +17840,18 @@
+@@ -17755,6 +18847,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11738,7 +19097,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17761,7 +17861,7 @@
+@@ -17764,7 +18868,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -11747,7 +19106,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17789,8 +17889,13 @@
+@@ -17792,8 +18896,13 @@
openbsd*)
version_type=sunos
@@ -11762,7 +19121,7 @@
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
-@@ -17810,7 +17915,7 @@
+@@ -17813,7 +18922,7 @@
os2*)
libname_spec='$name'
@@ -11771,7 +19130,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17828,13 +17933,6 @@
+@@ -17831,13 +18940,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -11785,7 +19144,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17860,7 +17958,7 @@
+@@ -17863,7 +18965,7 @@
need_version=yes
;;
@@ -11794,17 +19153,23 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17893,6 +17991,29 @@
+@@ -17896,27 +18998,55 @@
fi
;;
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-*)
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -11821,20 +19186,32 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17908,12 +18029,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++*)
+ dynamic_linker=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var F77" || \
@@ -11844,7 +19221,18 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17945,36 +18071,6 @@
+@@ -17936,8 +19066,8 @@
+ # directories.
+ hardcode_action_F77=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
+
+ if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+@@ -17948,36 +19078,6 @@
enable_fast_install=needless
fi
@@ -11881,7 +19269,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17989,7 +18085,8 @@
+@@ -17992,7 +19092,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.
@@ -11891,7 +19279,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 \
-@@ -18089,6 +18186,12 @@
+@@ -18092,6 +19193,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -11904,7 +19292,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18100,6 +18203,9 @@
+@@ -18103,6 +19210,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -11914,7 +19302,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18119,7 +18225,7 @@
+@@ -18122,7 +19232,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -11923,7 +19311,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18150,7 +18256,7 @@
+@@ -18153,7 +19263,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -11932,7 +19320,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18165,7 +18271,7 @@
+@@ -18168,7 +19278,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -11941,7 +19329,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18367,7 +18473,10 @@
+@@ -18370,7 +19480,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.
@@ -11953,7 +19341,15 @@
fi
-@@ -18400,26 +18509,55 @@
+@@ -18391,7 +19504,6 @@
+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+
+
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
+
+@@ -18403,26 +19515,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -12010,7 +19406,18 @@
## 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
-@@ -18446,18 +18584,20 @@
+@@ -18434,8 +19575,8 @@
+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+
+
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18449,26 +19590,28 @@
# 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 \
@@ -12018,13 +19425,13 @@
+ -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:18452: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18590: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18455: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18456: \$? = $ac_status" >&5
-+ echo "$as_me:18594: \$? = $ac_status" >&5
+- echo "$as_me:18459: \$? = $ac_status" >&5
++ echo "$as_me:19600: \$? = $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
@@ -12036,7 +19443,28 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18518,6 +18658,11 @@
+ $rm conftest*
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+@@ -18482,8 +19625,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18521,6 +19664,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -12048,7 +19476,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18534,7 +18679,7 @@
+@@ -18537,7 +19685,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -12057,7 +19485,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18560,6 +18705,16 @@
+@@ -18563,6 +19711,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -12074,7 +19502,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18571,7 +18726,7 @@
+@@ -18574,7 +19732,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.
@@ -12083,7 +19511,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18594,13 +18749,20 @@
+@@ -18597,13 +19755,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -12106,7 +19534,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18615,15 +18777,15 @@
+@@ -18618,15 +19783,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -12128,7 +19556,7 @@
;;
sunos4*)
-@@ -18632,7 +18794,7 @@
+@@ -18635,7 +19800,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -12137,7 +19565,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18645,6 +18807,17 @@
+@@ -18648,6 +19813,17 @@
fi
;;
@@ -12155,7 +19583,28 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18679,18 +18852,20 @@
+@@ -18659,16 +19835,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18682,26 +19858,28 @@
# 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 \
@@ -12163,13 +19612,13 @@
+ -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:18685: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18858: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18688: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19864: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18689: \$? = $ac_status" >&5
-+ echo "$as_me:18862: \$? = $ac_status" >&5
+- echo "$as_me:18692: \$? = $ac_status" >&5
++ echo "$as_me:19868: \$? = $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
@@ -12181,25 +19630,37 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18711,7 +18886,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+@@ -18714,7 +19892,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=
-@@ -18721,6 +18896,48 @@
+@@ -18724,8 +19902,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -12226,8 +19687,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+ :
@@ -12236,10 +19697,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18733,38 +18950,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18736,60 +19956,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -12260,13 +19723,13 @@
+ -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:18752: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18962: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18755: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18756: \$? = $ac_status" >&5
-+ echo "$as_me:18966: \$? = $ac_status" >&5
+- echo "$as_me:18759: \$? = $ac_status" >&5
++ echo "$as_me:19972: \$? = $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
@@ -12290,7 +19753,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18835,6 +19050,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -18799,8 +20017,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_GCJ=
+@@ -18838,6 +20056,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -12307,7 +19809,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18845,6 +19070,10 @@
+@@ -18848,6 +20076,10 @@
with_gnu_ld=no
fi
;;
@@ -12318,7 +19820,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18855,6 +19084,27 @@
+@@ -18858,6 +20090,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -12346,7 +19848,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18892,7 +19142,7 @@
+@@ -18895,7 +20148,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -12355,7 +19857,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18902,13 +19152,13 @@
+@@ -18905,13 +20158,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'
@@ -12372,7 +19874,7 @@
# 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
-@@ -18917,23 +19167,70 @@
+@@ -18920,23 +20173,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -12449,7 +19951,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18947,13 +19244,40 @@
+@@ -18950,13 +20250,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12492,7 +19994,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18963,24 +19287,19 @@
+@@ -18966,24 +20293,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12524,7 +20026,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18992,7 +19311,7 @@
+@@ -18995,7 +20317,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -12533,7 +20035,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -19014,9 +19333,21 @@
+@@ -19017,9 +20339,21 @@
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
@@ -12557,7 +20059,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19033,7 +19364,7 @@
+@@ -19036,7 +20370,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -12566,7 +20068,7 @@
# 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`
-@@ -19052,8 +19383,12 @@
+@@ -19055,8 +20389,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -12579,7 +20081,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19061,22 +19396,23 @@
+@@ -19064,22 +20402,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -12610,17 +20112,14 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19100,8 +19436,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=$?
-@@ -19128,14 +19463,13 @@
+@@ -19126,19 +20465,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -12638,17 +20137,17 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19162,8 +19496,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=$?
-@@ -19195,13 +19528,11 @@
+@@ -19188,7 +20528,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -19198,13 +20540,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -12665,7 +20164,7 @@
fi
fi
;;
-@@ -19214,7 +19545,7 @@
+@@ -19217,7 +20557,7 @@
ld_shlibs_GCJ=no
;;
@@ -12674,7 +20173,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19224,68 +19555,68 @@
+@@ -19227,68 +20567,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -12787,7 +20286,7 @@
fi
;;
-@@ -19319,8 +19650,8 @@
+@@ -19322,8 +20662,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12798,7 +20297,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19328,7 +19659,7 @@
+@@ -19331,7 +20671,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -12807,7 +20306,7 @@
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
-@@ -19342,47 +19673,62 @@
+@@ -19345,47 +20685,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -12894,7 +20393,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19396,7 +19742,7 @@
+@@ -19399,7 +20754,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -12903,7 +20402,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'
-@@ -19406,7 +19752,7 @@
+@@ -19409,7 +20764,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -12912,7 +20411,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19429,7 +19775,8 @@
+@@ -19432,7 +20787,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
@@ -12922,7 +20421,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19439,7 +19786,7 @@
+@@ -19442,7 +20798,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -12931,7 +20430,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19450,14 +19797,14 @@
+@@ -19453,14 +20809,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -12948,7 +20447,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'
-@@ -19469,13 +19816,13 @@
+@@ -19472,13 +20828,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -12964,7 +20463,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19483,21 +19830,15 @@
+@@ -19486,21 +20842,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -12990,7 +20489,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19506,8 +19847,18 @@
+@@ -19509,8 +20859,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13011,7 +20510,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19516,7 +19867,7 @@
+@@ -19519,7 +20879,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.
@@ -13020,7 +20519,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19564,36 +19915,45 @@
+@@ -19567,36 +20927,45 @@
fi
;;
@@ -13087,8 +20586,14 @@
;;
uts4*)
-@@ -19612,11 +19972,6 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+@@ -19611,15 +20980,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
test "$ld_shlibs_GCJ" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -13099,7 +20604,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -19649,6 +20004,7 @@
+@@ -19637,8 +21001,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -19652,6 +21016,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -13107,7 +20623,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19684,7 +20040,7 @@
+@@ -19674,20 +21039,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -13116,7 +20649,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19694,7 +20050,20 @@
+@@ -19697,7 +21062,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13138,7 +20671,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19759,7 +20128,7 @@
+@@ -19762,7 +21140,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13147,7 +20680,7 @@
;;
beos*)
-@@ -19768,7 +20137,7 @@
+@@ -19771,7 +21149,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -13156,7 +20689,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19784,7 +20153,7 @@
+@@ -19787,7 +21165,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -13165,7 +20698,7 @@
need_version=no
need_lib_prefix=no
-@@ -19796,7 +20165,8 @@
+@@ -19799,7 +21177,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -13175,7 +20708,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19826,7 +20196,7 @@
+@@ -19829,7 +21208,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13184,7 +20717,7 @@
;;
esac
;;
-@@ -19849,7 +20219,7 @@
+@@ -19852,7 +21231,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -13193,7 +20726,7 @@
# 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"`
-@@ -19872,20 +20242,17 @@
+@@ -19875,20 +21254,17 @@
dynamic_linker=no
;;
@@ -13225,7 +20758,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19903,14 +20270,19 @@
+@@ -19906,14 +21282,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -13247,7 +20780,7 @@
esac
;;
-@@ -19930,9 +20302,9 @@
+@@ -19933,9 +21314,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -13259,7 +20792,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19947,7 +20319,7 @@
+@@ -19950,7 +21331,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -13268,7 +20801,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19958,7 +20330,7 @@
+@@ -19961,7 +21342,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -13277,7 +20810,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19970,6 +20342,18 @@
+@@ -19973,6 +21354,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -13296,33 +20829,18 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -19997,1080 +20381,280 @@
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
-- esac
-- ;;
-- esac
-- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-- shlibpath_overrides_runpath=no
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-- hardcode_into_libs=yes
-- ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
-- dynamic_linker=no
-- ;;
--
--# This must be Linux ELF.
+@@ -20016,29 +21409,26 @@
+ ;;
+
+ # This must be Linux ELF.
-linux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -13330,80 +20848,71 @@
- libsuff=64
- fi
- fi
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-- # This implies no fast_install, which is unacceptable.
-- # Some rework will be needed to allow for fast_install
-- # before this can be enabled.
-- hardcode_into_libs=yes
--
-- # We used to test for /lib/ld.so.1 and disable shared libraries on
-- # powerpc, because MkLinux only supported shared libraries with the
-- # GNU dynamic linker. Since this was broken with cross compilers,
-- # most powerpc-linux boxes support dynamic linking these days and
-- # people can always --disable-shared, the test was removed, and we
-- # assume the GNU/Linux dynamic linker is in use.
-- dynamic_linker='GNU/Linux ld.so'
-- ;;
--
--netbsd*)
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- dynamic_linker='NetBSD (a.out) ld.so'
-- else
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
++
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -20048,6 +21438,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -20057,7 +21459,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- dynamic_linker='NetBSD ld.elf_so'
-- fi
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
--
--newsos6)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- ;;
--
--nto-qnx*)
-- version_type=linux
-- need_lib_prefix=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -20085,8 +21487,13 @@
+
+ openbsd*)
+ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- ;;
--
--openbsd*)
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- case $host_os in
-- openbsd2.[89] | openbsd2.[89].*)
-- shlibpath_overrides_runpath=no
-- ;;
-- *)
-- shlibpath_overrides_runpath=yes
-- ;;
-- esac
-- else
-- shlibpath_overrides_runpath=yes
-- fi
-- ;;
--
++ # 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
+@@ -20104,976 +21511,162 @@
+ fi
+ ;;
+
-os2*)
- libname_spec='$name'
- shrext=".dll"
@@ -14131,133 +21640,28 @@
-
-
-fi
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-
+-
+-
-fi
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-
+-
+-
-fi
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-
+-
+-
-fi
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
+-
+-
-fi
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
+-
- ;;
-+openbsd*)
-+ version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ need_lib_prefix=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
- esac
+- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[89] | openbsd2.[89].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
- else
+- else
- enable_dlopen=no
-+ shlibpath_overrides_runpath=yes
- fi
-+ ;;
-
+- fi
+-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
@@ -14280,7 +21684,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20875 "configure"
+-#line 20878 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -14288,6 +21692,104 @@
-#endif
-
-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
+-
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
+-
+- exit (status);
+-}
+-EOF
+- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self=no
+- fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-
+- if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self_static=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 20976 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
@@ -14421,9 +21923,9 @@
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -14445,134 +21947,52 @@
esac
- else :
- # compilation failed
-- lt_cv_dlopen_self=no
+- lt_cv_dlopen_self_static=no
fi
-fi
-rm -fr conftest*
--
--
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
-- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self_static=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 20973 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
--
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
++
+*)
+ dynamic_linker=no
+ ;;
+esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
-- exit (status);
--}
--EOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self_static=no
-- fi
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
--rm -fr conftest*
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -14590,23 +22010,9 @@
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-- fi
--
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
-- ;;
-- esac
--
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
-+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6
++fi
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -14622,7 +22028,7 @@
fi
-@@ -21087,7 +20671,8 @@
+@@ -21090,7 +21683,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.
@@ -14632,7 +22038,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 \
-@@ -21187,6 +20772,12 @@
+@@ -21190,6 +21784,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14645,7 +22051,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21198,6 +20789,9 @@
+@@ -21201,6 +21801,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14655,7 +22061,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21217,7 +20811,7 @@
+@@ -21220,7 +21823,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14664,7 +22070,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21248,7 +20842,7 @@
+@@ -21251,7 +21854,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14673,7 +22079,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21263,7 +20857,7 @@
+@@ -21266,7 +21869,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -14682,7 +22088,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21465,7 +21059,10 @@
+@@ -21468,7 +22071,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.
@@ -14694,7 +22100,15 @@
fi
-@@ -21504,15 +21101,42 @@
+@@ -21488,7 +22094,6 @@
+ RC)
+
+
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
+
+@@ -21507,15 +22112,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14737,7 +22151,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21528,7 +21152,8 @@
+@@ -21531,7 +22163,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.
@@ -14747,7 +22161,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 \
-@@ -21628,6 +21253,12 @@
+@@ -21631,6 +22264,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14760,7 +22174,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21639,6 +21270,9 @@
+@@ -21642,6 +22281,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14770,7 +22184,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21658,7 +21292,7 @@
+@@ -21661,7 +22303,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14779,7 +22193,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21689,7 +21323,7 @@
+@@ -21692,7 +22334,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14788,7 +22202,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21704,7 +21338,7 @@
+@@ -21707,7 +22349,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -14797,7 +22211,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21906,7 +21540,10 @@
+@@ -21909,7 +22551,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.
@@ -14809,7 +22223,7 @@
fi
-@@ -21953,7 +21590,7 @@
+@@ -21956,7 +22601,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -14818,17 +22232,182 @@
# Prevent multiple expansion
-@@ -22194,8 +21831,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=$?
-@@ -22269,9 +21905,6 @@
+@@ -22011,8 +22656,8 @@
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22038,17 +22683,17 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test -n "$MSGFMT"; then
+- echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22063,32 +22708,33 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+-
+ if test -n "$GMSGFMT"; then
+- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-echo "${ECHO_T}$GMSGFMT" >&6
++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
++
+ if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
+- echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
++ { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+ GMSGFMT=":"
+ fi
+ MSGFMT=$GMSGFMT
+@@ -22097,8 +22743,8 @@
+
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22124,11 +22770,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test -n "$XGETTEXT"; then
+- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -22136,8 +22782,8 @@
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+- echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
++ { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+ fi
+@@ -22147,8 +22793,7 @@
+
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -22160,8 +22805,8 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+
+- echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
++echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
+ if test "${kde_cv_stl_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22215,15 +22860,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_stl_works=no
++ kde_cv_stl_works=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+
+
+- echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
+-echo "${ECHO_T}$kde_cv_stl_works" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
++echo "${ECHO_T}$kde_cv_stl_works" >&6; }
+
+ if test "$kde_cv_stl_works" = "yes"; then
+ # back compatible
+@@ -22252,15 +22898,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for strlcat" >&5
+-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcat" >&5
++echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -22272,9 +22917,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14838,27 +22417,86 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22305,8 +21938,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=$?
-@@ -22410,8 +22042,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=$?
-@@ -22490,9 +22121,6 @@
+@@ -22326,8 +22968,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_strlcat=no
++ kde_cv_func_strlcat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22341,11 +22984,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
++echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
+
+-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
++echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22366,8 +23009,7 @@
+ if test "x$kde_cv_proto_strlcat" = xunknown; then
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -22432,9 +23074,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_strlcat="strlcat unavailable"
++ kde_cv_proto_strlcat="strlcat unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22448,8 +23091,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
+
+ if test "x$kde_cv_func_strlcat" = xyes; then
+
+@@ -22473,15 +23116,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for strlcpy" >&5
+-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcpy" >&5
++echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcpy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -22493,9 +23135,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14868,247 +22506,1341 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22525,8 +22153,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=$?
-@@ -22629,8 +22256,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=$?
-@@ -22720,8 +22346,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=$?
-@@ -22782,8 +22407,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=$?
-@@ -22851,8 +22475,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=$?
-@@ -22918,8 +22541,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=$?
-@@ -23012,8 +22634,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=$?
-@@ -23091,8 +22712,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=$?
-@@ -23176,8 +22796,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=$?
-@@ -23245,8 +22864,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=$?
-@@ -23341,8 +22959,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=$?
-@@ -23406,8 +23023,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=$?
-@@ -23502,8 +23118,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=$?
-@@ -23567,8 +23182,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=$?
-@@ -23664,8 +23278,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=$?
-@@ -23729,8 +23342,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=$?
-@@ -23827,8 +23439,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=$?
-@@ -23893,8 +23504,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=$?
-@@ -23962,8 +23572,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=$?
-@@ -24114,8 +23723,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=$?
-@@ -24270,8 +23878,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=$?
-@@ -24336,8 +23943,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=$?
-@@ -24484,8 +24090,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=$?
-@@ -24640,8 +24245,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=$?
-@@ -24697,9 +24301,6 @@
+@@ -22546,8 +23185,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_strlcpy=no
++ kde_cv_func_strlcpy=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22561,11 +23201,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
+
+-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
++echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcpy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22586,8 +23226,7 @@
+ if test "x$kde_cv_proto_strlcpy" = xunknown; then
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -22651,9 +23290,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_strlcpy="strlcpy unavailable"
++ kde_cv_proto_strlcpy="strlcpy unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22667,8 +23307,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
+
+ if test "x$kde_cv_func_strlcpy" = xyes; then
+
+@@ -22691,8 +23331,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking for main in -lutil" >&5
+-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for main in -lutil" >&5
++echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22709,7 +23349,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+ ;
+ return 0;
+ }
+@@ -22741,20 +23381,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_util_main=no
++ ac_cv_lib_util_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
++echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
+ if test $ac_cv_lib_util_main = yes; then
+ LIBUTIL="-lutil"
+ fi
+
+- echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
++echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_compat_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22771,7 +23412,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+ ;
+ return 0;
+ }
+@@ -22803,21 +23444,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_compat_main=no
++ ac_cv_lib_compat_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
++echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
+ if test $ac_cv_lib_compat_main = yes; then
+ LIBCOMPAT="-lcompat"
+ fi
+
+ kde_have_crypt=
+- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22830,17 +23472,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+ ;
+ return 0;
+ }
+@@ -22872,19 +23514,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_crypt_crypt=no
++ ac_cv_lib_crypt_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
+ if test $ac_cv_lib_crypt_crypt = yes; then
+ LIBCRYPT="-lcrypt"; kde_have_crypt=yes
+ else
+- echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
++echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_crypt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22897,17 +23540,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+ ;
+ return 0;
+ }
+@@ -22939,14 +23582,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_c_crypt=no
++ ac_cv_lib_c_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
+ if test $ac_cv_lib_c_crypt = yes; then
+ kde_have_crypt=yes
+ else
+@@ -22972,13 +23616,13 @@
+
+ fi
+
+- echo "$as_me:$LINENO: checking for socklen_t" >&5
+-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+ if test "${kde_cv_socklen_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -23036,7 +23680,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23047,17 +23693,17 @@
+
+ fi
+
+- echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
++echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
+ if test $kde_cv_socklen_t = no; then
+- echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
++echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
+ if test "${kde_cv_socklen_t_equiv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ kde_cv_socklen_t_equiv=int
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -23115,7 +23761,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ ac_ext=c
+@@ -23127,8 +23775,8 @@
+
+ fi
+
+- echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
++echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
+ fi
+
+ cat >>confdefs.h <<_ACEOF
+@@ -23141,8 +23789,8 @@
+ _ACEOF
+
+
+- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23155,17 +23803,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -23197,21 +23845,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dnet_dnet_ntoa=no
++ ac_cv_lib_dnet_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23224,17 +23873,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -23266,21 +23915,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dnet_stub_dnet_ntoa=no
++ ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+
+ fi
+- echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
++echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
+ if test "${ac_cv_func_inet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23307,30 +23957,24 @@
+
+ #undef inet_ntoa
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char inet_ntoa ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
++#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
+ choke me
+-#else
+-char (*f) () = inet_ntoa;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != inet_ntoa;
++return inet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -23362,17 +24006,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_inet_ntoa=no
++ ac_cv_func_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
+
+ if test $ac_cv_func_inet_ntoa = no; then
+- echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
++echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23385,17 +24030,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char inet_ntoa ();
+ int
+ main ()
+ {
+-inet_ntoa ();
++return inet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -23427,21 +24072,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_nsl_inet_ntoa=no
++ ac_cv_lib_nsl_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ fi
+- echo "$as_me:$LINENO: checking for connect" >&5
+-echo $ECHO_N "checking for connect... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+ if test "${ac_cv_func_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23468,30 +24114,24 @@
+
+ #undef connect
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char connect ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_connect) || defined (__stub___connect)
++#if defined __stub_connect || defined __stub___connect
+ choke me
+-#else
+-char (*f) () = connect;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != connect;
++return connect ();
+ ;
+ return 0;
+ }
+@@ -23523,17 +24163,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_connect=no
++ ac_cv_func_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+
+ if test $ac_cv_func_connect = no; then
+- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23546,17 +24187,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char connect ();
+ int
+ main ()
+ {
+-connect ();
++return connect ();
+ ;
+ return 0;
+ }
+@@ -23588,22 +24229,23 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_socket_connect=no
++ ac_cv_lib_socket_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+ fi
+
+- echo "$as_me:$LINENO: checking for remove" >&5
+-echo $ECHO_N "checking for remove... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+ if test "${ac_cv_func_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23630,30 +24272,24 @@
+
+ #undef remove
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char remove ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_remove) || defined (__stub___remove)
++#if defined __stub_remove || defined __stub___remove
+ choke me
+-#else
+-char (*f) () = remove;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != remove;
++return remove ();
+ ;
+ return 0;
+ }
+@@ -23685,17 +24321,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_remove=no
++ ac_cv_func_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-echo "${ECHO_T}$ac_cv_func_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+
+ if test $ac_cv_func_remove = no; then
+- echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23708,17 +24345,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char remove ();
+ int
+ main ()
+ {
+-remove ();
++return remove ();
+ ;
+ return 0;
+ }
+@@ -23750,14 +24387,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_posix_remove=no
++ ac_cv_lib_posix_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -23765,8 +24403,8 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:$LINENO: checking for shmat" >&5
+-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23793,30 +24431,24 @@
+
+ #undef shmat
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char shmat ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shmat) || defined (__stub___shmat)
++#if defined __stub_shmat || defined __stub___shmat
+ choke me
+-#else
+-char (*f) () = shmat;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != shmat;
++return shmat ();
+ ;
+ return 0;
+ }
+@@ -23848,18 +24480,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_shmat=no
++ ac_cv_func_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-echo "${ECHO_T}$ac_cv_func_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+ if test $ac_cv_func_shmat = yes; then
+ :
+ else
+- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23872,17 +24505,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char shmat ();
+ int
+ main ()
+ {
+-shmat ();
++return shmat ();
+ ;
+ return 0;
+ }
+@@ -23914,14 +24547,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_ipc_shmat=no
++ ac_cv_lib_ipc_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -23935,18 +24569,19 @@
+ for ac_header in sys/types.h stdint.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23983,15 +24618,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24025,9 +24661,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24051,25 +24688,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24087,18 +24718,19 @@
+ for ac_header in sys/bitypes.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24135,15 +24767,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24177,9 +24810,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24203,25 +24837,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24235,8 +24863,8 @@
+
+
+ # darwin requires a poll emulation library
+- echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
++echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_poll_poll+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24249,17 +24877,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char poll ();
+ int
+ main ()
+ {
+-poll ();
++return poll ();
+ ;
+ return 0;
+ }
+@@ -24291,14 +24919,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_poll_poll=no
++ ac_cv_lib_poll_poll=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
++echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
+ if test $ac_cv_lib_poll_poll = yes; then
+ LIB_POLL="-lpoll"
+ fi
+@@ -24309,18 +24938,19 @@
+ for ac_header in Carbon/Carbon.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24357,15 +24987,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24399,9 +25030,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24425,25 +25057,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24458,17 +25084,17 @@
+
+ # CoreAudio framework
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24505,15 +25131,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24547,9 +25174,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24573,25 +25201,18 @@
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+
+ fi
+ if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+@@ -24608,8 +25229,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
++echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
+ kde_libs_safe="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24658,8 +25279,8 @@
+ (exit $ac_status); }; }; then
+
+ LIBRESOLV="-lresolv"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RES_INIT 1
+@@ -24670,25 +25291,25 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_libs_safe
+
+
+
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${kde_cv_func_res_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -24700,9 +25321,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15118,809 +23850,4535 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24733,8 +24334,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=$?
-@@ -24838,8 +24438,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=$?
-@@ -24939,8 +24538,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=$?
-@@ -25014,8 +24612,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=$?
-@@ -25078,8 +24675,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=$?
-@@ -25141,8 +24737,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=$?
-@@ -25182,8 +24777,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=$?
-@@ -25239,8 +24833,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=$?
-@@ -25280,8 +24873,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=$?
-@@ -25345,8 +24937,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=$?
-@@ -25377,10 +24968,8 @@
+@@ -24754,8 +25372,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_res_init=no
++ kde_cv_func_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -24769,11 +25388,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+-echo "${ECHO_T}$kde_cv_func_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
++echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
+
+-echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
++echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_res_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24794,8 +25413,7 @@
+ if test "x$kde_cv_proto_res_init" = xunknown; then
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -24860,9 +25478,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_res_init="res_init unavailable"
++ kde_cv_proto_res_init="res_init unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -24876,8 +25495,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
++echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
+
+ if test "x$kde_cv_func_res_init" = xyes; then
+
+@@ -24904,8 +25523,8 @@
+ LIBSOCKET="$X_EXTRA_LIBS"
+
+
+- echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
++echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ucb_killpg+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24918,17 +25537,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char killpg ();
+ int
+ main ()
+ {
+-killpg ();
++return killpg ();
+ ;
+ return 0;
+ }
+@@ -24960,27 +25579,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_ucb_killpg=no
++ ac_cv_lib_ucb_killpg=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
+ if test $ac_cv_lib_ucb_killpg = yes; then
+ LIBUCB="-lucb"
+ fi
+
+
+ case $host in *-*-lynxos* )
+- echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
++echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
+ CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+- echo "$as_me:$LINENO: result: disabled" >&5
+-echo "${ECHO_T}disabled" >&6
+- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6; }
++ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24993,17 +25613,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char gethostbyname ();
+ int
+ main ()
+ {
+-gethostbyname ();
++return gethostbyname ();
+ ;
+ return 0;
+ }
+@@ -25035,22 +25655,23 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_bsd_gethostbyname=no
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+ LIBSOCKET="-lbsd"
+ fi
+ ;;
+ esac
+
+- echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25061,12 +25682,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef int ac__type_new_;
+ int
+ main ()
+ {
+-if ((int *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (int))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -25099,20 +25721,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_int=no
++ ac_cv_type_int=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_int" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -25125,10 +25748,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -25166,10 +25790,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -25203,30 +25828,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -25264,10 +25891,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -25301,23 +25929,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25329,10 +25960,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -25366,26 +25998,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25393,8 +26019,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++ typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25403,22 +26030,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (int))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (int))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (int))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -25442,28 +26069,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25491,8 +25080,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=$?
-@@ -25554,8 +25142,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=$?
-@@ -25595,8 +25182,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=$?
-@@ -25652,8 +25238,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=$?
-@@ -25693,8 +25278,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=$?
-@@ -25758,8 +25342,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=$?
-@@ -25790,10 +25373,8 @@
+ ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+
+- echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+ if test "${ac_cv_type_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25474,12 +26100,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef short ac__type_new_;
+ int
+ main ()
+ {
+-if ((short *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (short))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -25512,20 +26139,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_short=no
++ ac_cv_type_short=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_short" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -25538,10 +26166,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -25579,10 +26208,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -25616,30 +26246,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -25677,10 +26309,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -25714,23 +26347,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25742,10 +26378,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -25779,26 +26416,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25806,8 +26437,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++ typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25816,22 +26448,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (short))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (short))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (short))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -25855,28 +26487,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25904,8 +25485,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=$?
-@@ -25967,8 +25547,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=$?
-@@ -26008,8 +25587,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=$?
-@@ -26065,8 +25643,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=$?
-@@ -26106,8 +25683,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=$?
-@@ -26171,8 +25747,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=$?
-@@ -26203,10 +25778,8 @@
+ ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+
+- echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25887,12 +26518,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef long ac__type_new_;
+ int
+ main ()
+ {
+-if ((long *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (long))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -25925,20 +26557,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_long=no
++ ac_cv_type_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_long" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -25951,10 +26584,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -25992,10 +26626,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -26029,30 +26664,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -26090,10 +26727,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -26127,23 +26765,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26155,10 +26796,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -26192,26 +26834,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26219,8 +26855,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++ typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26229,22 +26866,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (long))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (long))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (long))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -26268,28 +26905,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26317,8 +25890,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=$?
-@@ -26380,8 +25952,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=$?
-@@ -26421,8 +25992,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=$?
-@@ -26478,8 +26048,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=$?
-@@ -26519,8 +26088,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=$?
-@@ -26584,8 +26152,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=$?
-@@ -26616,10 +26183,8 @@
+ ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+
+- echo "$as_me:$LINENO: checking for char *" >&5
+-echo $ECHO_N "checking for char *... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for char *" >&5
++echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26300,12 +26936,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef char * ac__type_new_;
+ int
+ main ()
+ {
+-if ((char * *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (char *))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -26338,20 +26975,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_char_p=no
++ ac_cv_type_char_p=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+-echo "${ECHO_T}$ac_cv_type_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
++echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+
+-echo "$as_me:$LINENO: checking size of char *" >&5
+-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of char *" >&5
++echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_char_p" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -26364,10 +27002,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -26405,10 +27044,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -26442,30 +27082,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -26503,10 +27145,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -26540,23 +27183,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26568,10 +27214,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -26605,26 +27252,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26632,8 +27273,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char *)); }
+-unsigned long ulongval () { return (long) (sizeof (char *)); }
++ typedef char * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26642,22 +27284,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (char *))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (char *))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (char *))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -26681,30 +27323,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26738,8 +26303,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=$?
-@@ -26810,8 +26374,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=$?
-@@ -26881,8 +26444,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=$?
-@@ -26944,8 +26506,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=$?
-@@ -26985,8 +26546,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=$?
-@@ -27042,8 +26602,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=$?
-@@ -27083,8 +26642,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=$?
-@@ -27148,8 +26706,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=$?
-@@ -27180,10 +26737,8 @@
+ ac_cv_sizeof_char_p=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+
+
+
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26717,17 +27358,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -26759,14 +27400,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+
+ LIBDL="-ldl"
+@@ -26775,8 +27417,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
++echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26789,17 +27431,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char shl_unload ();
+ int
+ main ()
+ {
+-shl_unload ();
++return shl_unload ();
+ ;
+ return 0;
+ }
+@@ -26831,14 +27473,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_shl_unload=no
++ ac_cv_lib_dld_shl_unload=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
+ if test $ac_cv_lib_dld_shl_unload = yes; then
+
+ LIBDL="-ldld"
+@@ -26852,8 +27495,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26864,12 +27507,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((size_t *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (size_t))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -26902,20 +27546,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_size_t=no
++ ac_cv_type_size_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+
+-echo "$as_me:$LINENO: checking size of size_t" >&5
+-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of size_t" >&5
++echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_size_t" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -26928,10 +27573,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -26969,10 +27615,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -27006,30 +27653,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -27067,10 +27716,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -27104,23 +27754,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27132,10 +27785,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -27169,26 +27823,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27196,8 +27844,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (size_t)); }
+-unsigned long ulongval () { return (long) (sizeof (size_t)); }
++ typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27206,22 +27855,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (size_t))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (size_t))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (size_t))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -27245,29 +27894,28 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -27295,8 +26850,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=$?
-@@ -27358,8 +26912,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=$?
-@@ -27399,8 +26952,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=$?
-@@ -27456,8 +27008,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=$?
-@@ -27497,8 +27048,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=$?
-@@ -27562,8 +27112,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=$?
-@@ -27594,10 +27143,8 @@
+ ac_cv_sizeof_size_t=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+
+
+- echo "$as_me:$LINENO: checking for unsigned long" >&5
+-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for unsigned long" >&5
++echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_unsigned_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27278,12 +27926,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef unsigned long ac__type_new_;
+ int
+ main ()
+ {
+-if ((unsigned long *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (unsigned long))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -27316,20 +27965,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_unsigned_long=no
++ ac_cv_type_unsigned_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+
+-echo "$as_me:$LINENO: checking size of unsigned long" >&5
+-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
++echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_unsigned_long" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -27342,10 +27992,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -27383,10 +28034,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -27420,30 +28072,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -27481,10 +28135,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -27518,23 +28173,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27546,10 +28204,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -27583,26 +28242,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27610,8 +28263,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (unsigned long)); }
+-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
++ typedef unsigned long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27620,22 +28274,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (unsigned long))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (unsigned long))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (unsigned long))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -27659,30 +28313,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
else
+ ac_cv_sizeof_unsigned_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
+
+
+
+- echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
++echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
-@@ -27708,8 +27255,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
+ /* confdefs.h. */
+ _ACEOF
+@@ -27724,15 +28377,15 @@
ac_status=$?
-@@ -27790,8 +27336,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=$?
-@@ -27891,8 +27436,7 @@
- cat conftest.err >&5
+ (exit $ac_status); }; }; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error:
+ Apparently on your system our assumption sizeof size_t == sizeof unsigned long
+ does not apply. Please mail kde-devel at kde.org with a description of your system!
+@@ -27744,18 +28397,18 @@
+ { (exit 1); exit 1; }; }
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+- echo "$as_me:$LINENO: checking for PIE support" >&5
+-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for PIE support" >&5
++echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
+ if test "${kde_cv_val_pie_support+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -27811,8 +28464,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_val_pie_support=no
++ kde_cv_val_pie_support=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -27826,26 +28480,26 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
++echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
+
+- echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
++echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
+
+- # Check whether --enable-pie or --disable-pie was given.
++ # Check whether --enable-pie was given.
+ if test "${enable_pie+set}" = set; then
+- enableval="$enable_pie"
+- kde_has_pie_support=$enableval
++ enableval=$enable_pie; kde_has_pie_support=$enableval
+ else
+ kde_has_pie_support=detect
+-fi;
++fi
++
+
+ if test "$kde_has_pie_support" = "detect"; then
+ kde_has_pie_support=$kde_cv_val_pie_support
+ fi
+
+- echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+-echo "${ECHO_T}$kde_has_pie_support" >&6
++ { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
++echo "${ECHO_T}$kde_has_pie_support" >&6; }
+
+ KDE_USE_FPIE=""
+ KDE_USE_PIE=""
+@@ -27864,18 +28518,19 @@
+ for ac_header in crt_externs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27912,15 +28567,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27954,9 +28610,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -27980,25 +28637,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -28010,8 +28661,8 @@
+
+ done
+
+-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
++echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28038,30 +28689,24 @@
+
+ #undef _NSGetEnviron
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char _NSGetEnviron ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
+ choke me
+-#else
+-char (*f) () = _NSGetEnviron;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != _NSGetEnviron;
++return _NSGetEnviron ();
+ ;
+ return 0;
+ }
+@@ -28093,13 +28738,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func__NSGetEnviron=no
++ ac_cv_func__NSGetEnviron=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
++echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
+ if test $ac_cv_func__NSGetEnviron = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -28120,9 +28766,9 @@
+ for ac_func in vsnprintf snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -28148,30 +28794,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -28203,13 +28843,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -28226,32 +28868,32 @@
+
+
+
+-# Check whether --enable-embedded or --disable-embedded was given.
++# Check whether --enable-embedded was given.
+ if test "${enable_embedded+set}" = set; then
+- enableval="$enable_embedded"
+- kde_use_qt_emb=$enableval
++ enableval=$enable_embedded; kde_use_qt_emb=$enableval
+ else
+ kde_use_qt_emb=no
+
+-fi;
++fi
++
+
+-# Check whether --enable-qtopia or --disable-qtopia was given.
++# Check whether --enable-qtopia was given.
+ if test "${enable_qtopia+set}" = set; then
+- enableval="$enable_qtopia"
+- kde_use_qt_emb_palm=$enableval
++ enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
+ else
+ kde_use_qt_emb_palm=no
+
+-fi;
++fi
+
+-# Check whether --enable-mac or --disable-mac was given.
++
++# Check whether --enable-mac was given.
+ if test "${enable_mac+set}" = set; then
+- enableval="$enable_mac"
+- kde_use_qt_mac=$enableval
++ enableval=$enable_mac; kde_use_qt_mac=$enableval
+ else
+ kde_use_qt_mac=no
+
+-fi;
++fi
++
+
+ # used to disable x11-specific stuff on special platforms
+
+@@ -28267,8 +28909,8 @@
+
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+
+ if test "${kde_cv_have_x+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28373,6 +29015,7 @@
+ fi
+ done
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
+
+@@ -28430,7 +29073,7 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-LIBS="$ac_save_LIBS"
++ LIBS="$ac_save_LIBS"
+ # First see if replacing the include by lib works.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+@@ -28478,6 +29121,7 @@
+ done
+ done
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+@@ -28488,7 +29132,7 @@
+ *-*-solaris*)
+ ;;
+ *)
+- rm -fr conftest.dir
++ rm -f -r conftest.dir
+ if mkdir conftest.dir; then
+ cd conftest.dir
+ # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+@@ -28496,13 +29140,13 @@
+ acfindx:
+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+ _ACEOF
+- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+ for ac_extension in a so sl; do
+- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+- test -f $ac_im_libdir/libX11.$ac_extension; then
++ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
++ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+ fi
+ done
+@@ -28510,7 +29154,7 @@
+ # bogus both because they are the default anyway, and because
+ # using them would break gcc on systems where it needs fixed includes.
+ case $ac_im_incroot in
+- /usr/include) ;;
++ /usr/include) ac_x_includes= ;;
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+ esac
+ case $ac_im_usrlibdir in
+@@ -28519,7 +29163,7 @@
+ esac
+ fi
+ cd ..
+- rm -fr conftest.dir
++ rm -f -r conftest.dir
+ fi
+
+ if test -z "$ac_x_includes"; then
+@@ -28563,12 +29207,12 @@
+ eval "$kde_cv_have_x"
+
+ if test "$have_x" != yes; then
+- echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
++ { echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6; }
+ no_x=yes
+ else
+- echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
++ { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
++echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+ fi
+
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -28596,8 +29240,8 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28610,17 +29254,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char IceConnectionNumber ();
+ int
+ main ()
+ {
+-IceConnectionNumber ();
++return IceConnectionNumber ();
+ ;
+ return 0;
+ }
+@@ -28652,14 +29296,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_ICE_IceConnectionNumber=no
++ ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+ LIBSM="-lSM -lICE"
+ fi
+@@ -28668,8 +29313,8 @@
+
+ LIB_X11='-lX11 $(LIBSOCKET)'
+
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libXext" >&5
++echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+ if test "${kde_cv_have_libXext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28729,9 +29374,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_have_libXext=no
++ kde_cv_have_libXext=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -28741,8 +29387,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
++echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
+
+ if test "$kde_cv_have_libXext" = "no"; then
+ { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -28888,8 +29534,8 @@
+ else
+ PTHREAD_LIBS_save="$PTHREAD_LIBS"
+ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+- echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
+
+ kde_save_LDFLAGS="$LDFLAGS"
+ kde_save_LIBS="$LIBS"
+@@ -28900,9 +29546,9 @@
+ ;;
+ esac
+ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -28914,17 +29560,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+ ;
+ return 0;
+ }
+@@ -28956,14 +29602,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Lib=no"
++ eval "$as_ac_Lib=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -28976,8 +29624,8 @@
+ fi
+
+ if test -z "$LIBPTHREAD"; then
+- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28990,17 +29638,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+ ;
+ return 0;
+ }
+@@ -29032,14 +29680,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_pthread_pthread_create=no
++ ac_cv_lib_pthread_pthread_create=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+ LIBPTHREAD="-lpthread"
+ fi
+@@ -29047,8 +29696,8 @@
+ fi
+
+ if test -z "$LIBPTHREAD" ; then
+- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ kde_safe_libs=$LIBS
+ LIBS="$LIBS -lpthread"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -29089,17 +29738,18 @@
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=$?
-@@ -28072,8 +27616,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=$?
-@@ -28182,8 +27725,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=$?
-@@ -28407,8 +27949,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=$?
-@@ -28631,8 +28172,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=$?
-@@ -28708,8 +28248,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=$?
-@@ -28935,8 +28474,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=$?
-@@ -29011,8 +28549,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=$?
-@@ -29072,8 +28609,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=$?
-@@ -29156,8 +28692,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=$?
-@@ -29250,8 +28785,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=$?
-@@ -29425,8 +28959,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=$?
-@@ -29524,8 +29057,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=$?
-@@ -29612,8 +29144,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=$?
-@@ -29690,8 +29221,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=$?
-@@ -29744,7 +29274,7 @@
+ (exit $ac_status); }; }; then
+
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ LIBPTHREAD="-lpthread"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -29115,16 +29765,15 @@
+ USE_THREADS=""
+ if test -z "$LIBPTHREAD"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
++echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -29177,7 +29826,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -29191,13 +29842,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_THREADS="-D_THREAD_SAFE -pthread"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -29209,16 +29860,15 @@
+ case $host_os in
+ solaris*)
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
++echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
+ kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -29271,7 +29921,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -29285,13 +29937,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_THREADS="-mt"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -29318,17 +29970,17 @@
+
+
+
+-echo "$as_me:$LINENO: checking for extra includes" >&5
+-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra includes" >&5
++echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
+
+-# Check whether --with-extra-includes or --without-extra-includes was given.
++# Check whether --with-extra-includes was given.
+ if test "${with_extra_includes+set}" = set; then
+- withval="$with_extra_includes"
+- kde_use_extra_includes="$withval"
++ withval=$with_extra_includes; kde_use_extra_includes="$withval"
+ else
+ kde_use_extra_includes=NONE
+
+-fi;
++fi
++
+ kde_extra_includes=
+ if test -n "$kde_use_extra_includes" && \
+ test "$kde_use_extra_includes" != "NONE"; then
+@@ -29346,21 +29998,21 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+-echo "${ECHO_T}$kde_use_extra_includes" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
++echo "${ECHO_T}$kde_use_extra_includes" >&6; }
+
+ kde_extra_libs=
+-echo "$as_me:$LINENO: checking for extra libs" >&5
+-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra libs" >&5
++echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
+
+-# Check whether --with-extra-libs or --without-extra-libs was given.
++# Check whether --with-extra-libs was given.
+ if test "${with_extra_libs+set}" = set; then
+- withval="$with_extra_libs"
+- kde_use_extra_libs=$withval
++ withval=$with_extra_libs; kde_use_extra_libs=$withval
+ else
+ kde_use_extra_libs=NONE
+
+-fi;
++fi
++
+ if test -n "$kde_use_extra_libs" && \
+ test "$kde_use_extra_libs" != "NONE"; then
+
+@@ -29379,14 +30031,14 @@
+
+
+
+-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+-echo "${ECHO_T}$kde_use_extra_libs" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
++echo "${ECHO_T}$kde_use_extra_libs" >&6; }
+
+
+
+
+-echo "$as_me:$LINENO: checking for libz" >&5
+-echo $ECHO_N "checking for libz... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libz" >&5
++echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_z+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29446,8 +30098,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_z=no"
++ eval "ac_cv_lib_z=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29461,8 +30114,8 @@
+ _ACEOF
+
+ LIBZ="$ac_cv_lib_z"
+- echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+-echo "${ECHO_T}$ac_cv_lib_z" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
++echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: not found.
+ Possibly configure picks up an outdated version
+@@ -29482,8 +30135,8 @@
+
+
+
+-echo "$as_me:$LINENO: checking for libpng" >&5
+-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libpng" >&5
++echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29545,9 +30198,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_png=no"
++ eval "ac_cv_lib_png=no"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29562,19 +30216,19 @@
+
+ LIBPNG="$ac_cv_lib_png"
+
+- echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+-echo "${ECHO_T}$ac_cv_lib_png" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
++echo "${ECHO_T}$ac_cv_lib_png" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBPNG=""
+
+ fi
+
+
+
+-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
++echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29633,8 +30287,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_jpeg_6b=no"
++ eval "ac_cv_lib_jpeg_6b=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29645,14 +30300,14 @@
+
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_6b"
+- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+-echo "$as_me:$LINENO: checking for libjpeg" >&5
+-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg" >&5
++echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29711,8 +30366,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_jpeg_normal=no"
++ eval "ac_cv_lib_jpeg_normal=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29723,11 +30379,11 @@
+
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_normal"
+- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ LIBJPEG=
+
+@@ -29747,7 +30403,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29747: $i/$j" >&5
-+ echo "configure: 29277: $i/$j" >&5
+- echo "configure: 29750: $i/$j" >&5
++ echo "configure: 30406: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -30042,7 +29572,7 @@
+@@ -29794,14 +30450,14 @@
+
+
+
+- echo "$as_me:$LINENO: checking for perl" >&5
+-echo $ECHO_N "checking for perl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for perl" >&5
++echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
+ if test -n "$PERL"; then
+ kde_cv_path="$PERL";
+ else
+ kde_cache=`echo perl | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -29844,8 +30500,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+ We need perl to generate some code." >&5
+@@ -29854,8 +30510,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PERL=$kde_cv_path
+
+ fi
+@@ -29869,10 +30525,9 @@
+
+
+
+-# Check whether --enable-mt or --disable-mt was given.
++# Check whether --enable-mt was given.
+ if test "${enable_mt+set}" = set; then
+- enableval="$enable_mt"
+- kde_use_qt_mt=$enableval
++ enableval=$enable_mt; kde_use_qt_mt=$enableval
+ else
+
+ if test $kde_qtver = 3; then
+@@ -29882,7 +30537,8 @@
+ fi
+
+
+-fi;
++fi
++
+
+ USING_QT_MT=""
+
+@@ -29902,13 +30558,13 @@
+ else
+ kde_check_threading_default=yes
+ fi
+- # Check whether --enable-threading or --disable-threading was given.
++ # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
+- enableval="$enable_threading"
+- kde_use_threading=$enableval
++ enableval=$enable_threading; kde_use_threading=$enableval
+ else
+ kde_use_threading=$kde_check_threading_default
+-fi;
++fi
++
+ if test "x$kde_use_threading" = "xyes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -29980,8 +30636,8 @@
+ LIBQT="$LIBQT $LIBDL"
+ fi
+
+-echo "$as_me:$LINENO: checking for Qt" >&5
+-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt" >&5
++echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
+
+ if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+ LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
+@@ -29990,34 +30646,34 @@
+ qt_libraries=""
+ qt_includes=""
+
+-# Check whether --with-qt-dir or --without-qt-dir was given.
++# Check whether --with-qt-dir was given.
+ if test "${with_qt_dir+set}" = set; then
+- withval="$with_qt_dir"
+- ac_qt_includes="$withval"/include
++ withval=$with_qt_dir; ac_qt_includes="$withval"/include
+ ac_qt_libraries="$withval"/lib${kdelibsuff}
+ ac_qt_bindir="$withval"/bin
+
+-fi;
++fi
+
+
+-# Check whether --with-qt-includes or --without-qt-includes was given.
+-if test "${with_qt_includes+set}" = set; then
+- withval="$with_qt_includes"
+
++# Check whether --with-qt-includes was given.
++if test "${with_qt_includes+set}" = set; then
++ withval=$with_qt_includes;
+ ac_qt_includes="$withval"
+
+-fi;
++fi
++
+
+ kde_qt_libs_given=no
+
+
+-# Check whether --with-qt-libraries or --without-qt-libraries was given.
++# Check whether --with-qt-libraries was given.
+ if test "${with_qt_libraries+set}" = set; then
+- withval="$with_qt_libraries"
+- ac_qt_libraries="$withval"
++ withval=$with_qt_libraries; ac_qt_libraries="$withval"
+ kde_qt_libs_given=yes
+
+-fi;
++fi
++
+
+ if test "${ac_cv_have_qt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -30045,7 +30701,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 30045: $i/$j" >&5
-+ echo "configure: 29575: $i/$j" >&5
+- echo "configure: 30048: $i/$j" >&5
++ echo "configure: 30704: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30719,8 +30249,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=$?
-@@ -30879,7 +30408,7 @@
+@@ -30082,8 +30738,7 @@
+ ac_qt_libraries="$qt_libdir"
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -30220,13 +30875,13 @@
+ eval "$ac_cv_have_qt"
+
+ if test "$have_qt" != yes; then
+- echo "$as_me:$LINENO: result: $have_qt" >&5
+-echo "${ECHO_T}$have_qt" >&6;
++ { echo "$as_me:$LINENO: result: $have_qt" >&5
++echo "${ECHO_T}$have_qt" >&6; };
+ else
+ ac_cv_have_qt="have_qt=yes \
+ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
+- echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
++ { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
++echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
+
+ qt_libraries="$ac_qt_libraries"
+ qt_includes="$ac_qt_includes"
+@@ -30235,15 +30890,14 @@
+ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
+
+
+-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
++echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_direct+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -30364,12 +31018,12 @@
+
+
+ if test "$kde_cv_qt_direct" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ qt_libraries=
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -30407,14 +31061,14 @@
+ fi
+
+
+- echo "$as_me:$LINENO: checking for moc" >&5
+-echo $ECHO_N "checking for moc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for moc" >&5
++echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
+ if test -n "$MOC"; then
+ kde_cv_path="$MOC";
+ else
+ kde_cache=`echo moc | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -30457,8 +31111,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+ Please check whether you installed Qt correctly.
+@@ -30479,22 +31133,22 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MOC=$kde_cv_path
+
+ fi
+
+ if test -z "$UIC_NOT_NEEDED"; then
+
+- echo "$as_me:$LINENO: checking for uic" >&5
+-echo $ECHO_N "checking for uic... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for uic" >&5
++echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
+ if test -n "$UIC_PATH"; then
+ kde_cv_path="$UIC_PATH";
+ else
+ kde_cache=`echo uic | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -30537,12 +31191,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ UIC_PATH=""
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ UIC_PATH=$kde_cv_path
+
+ fi
+@@ -30572,10 +31226,10 @@
+
+ if test $kde_qtver = 3; then
+
+- echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
++echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
+ kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
+- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -30598,22 +31252,22 @@
+
+
+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ ac_uic_supports_libpath=yes
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ ac_uic_supports_libpath=no
+ fi
+
+
+- echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
++echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
+ kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
+- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -30636,13 +31290,13 @@
+
+
+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ ac_uic_supports_nounload=yes
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ ac_uic_supports_nounload=no
+ fi
+@@ -30673,15 +31327,14 @@
+
+
+ if test -n "$LIBJPEG"; then
+-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
++echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_jpeg+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -30740,8 +31393,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "kde_cv_qt_jpeg=yes"
++ eval "kde_cv_qt_jpeg=yes"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -30758,12 +31412,12 @@
+
+
+ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ LIBJPEG_QT='$(LIBJPEG)'
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBJPEG_QT=
+ fi
+
+@@ -30794,15 +31448,15 @@
+
+
+
+-echo "$as_me:$LINENO: checking for rpath" >&5
+-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
+-# Check whether --enable-rpath or --disable-rpath was given.
++{ echo "$as_me:$LINENO: checking for rpath" >&5
++echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
++# Check whether --enable-rpath was given.
+ if test "${enable_rpath+set}" = set; then
+- enableval="$enable_rpath"
+- USE_RPATH=$enableval
++ enableval=$enable_rpath; USE_RPATH=$enableval
+ else
+ USE_RPATH=yes
+-fi;
++fi
++
+
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+
+@@ -30826,11 +31480,11 @@
+
+
+
+-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+-echo "${ECHO_T}$USE_RPATH" >&6
++{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
++echo "${ECHO_T}$USE_RPATH" >&6; }
+
+-echo "$as_me:$LINENO: checking for KDE" >&5
+-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE" >&5
++echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
+
+ if test "${prefix}" != NONE; then
+ kde_includes=${includedir}
+@@ -30882,7 +31536,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30882: $i/$j" >&5
-+ echo "configure: 30411: $i/$j" >&5
+- echo "configure: 30885: $i/$j" >&5
++ echo "configure: 31539: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30909,7 +30438,7 @@
+@@ -30912,7 +31566,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30912: $i/$j" >&5
-+ echo "configure: 30441: $i/$j" >&5
+- echo "configure: 30915: $i/$j" >&5
++ echo "configure: 31569: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30927,7 +30456,7 @@
+@@ -30930,7 +31584,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30930: $i/$j" >&5
-+ echo "configure: 30459: $i/$j" >&5
+- echo "configure: 30933: $i/$j" >&5
++ echo "configure: 31587: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32450,7 +31979,7 @@
+@@ -30989,12 +31643,12 @@
+ fi
+ if test "$exec_prefix" = NONE; then
+ ac_kde_exec_prefix="$ac_kde_prefix"
+- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
++ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
+ else
+ ac_kde_exec_prefix="$exec_prefix"
+- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
++ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+ fi
+
+ kde_libraries="${libdir}"
+@@ -31003,8 +31657,8 @@
+ else
+ ac_cv_have_kde="have_kde=yes \
+ ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+- echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
++ { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
++echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
+
+ kde_libraries="$ac_kde_libraries"
+ kde_includes="$ac_kde_includes"
+@@ -31042,8 +31696,8 @@
+
+ if test x$ac_uic_supports_libpath = xyes; then
+
+-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
++echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
+ if test "${kde_cv_uic_plugins+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31086,8 +31740,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
++echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
+ if test "$kde_cv_uic_plugins" != yes; then
+ { { echo "$as_me:$LINENO: error:
+ you need to install kdelibs first.
+@@ -31119,10 +31773,9 @@
+
+
+
+- # Check whether --enable-path-check or --disable-path-check was given.
++ # Check whether --enable-path-check was given.
+ if test "${enable_path_check+set}" = set; then
+- enableval="$enable_path_check"
+-
++ enableval=$enable_path_check;
+ if test "$enableval" = "no";
+ then ac_use_path_checking="default"
+ else ac_use_path_checking=""
+@@ -31136,13 +31789,14 @@
+ fi
+
+
+-fi;
++fi
+
+
+
+
+-echo "$as_me:$LINENO: checking for KDE paths" >&5
+-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
++
++{ echo "$as_me:$LINENO: checking for KDE paths" >&5
++echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
+ kde_result=""
+ kde_cached_paths=yes
+ if test "${kde_cv_all_paths+set}" = set; then
+@@ -31253,15 +31907,14 @@
+ else
+
+ if test $kde_qtver = 1; then
+- echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
+-
++ { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+
+- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
++ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -31313,8 +31966,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31353,8 +32006,8 @@
+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+ fi
+
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31362,8 +32015,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31556,15 +32209,14 @@
+ else
+
+ if test $kde_qtver = 1; then
+- echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
++ { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+
+
+- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -31616,8 +32268,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31656,8 +32308,8 @@
+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+ fi
+
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31665,8 +32317,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31758,22 +32410,22 @@
+ { (exit 1); exit 1; }; }
+ else
+ rm -f conftest*
+- echo "$as_me:$LINENO: result: $kde_result" >&5
+-echo "${ECHO_T}$kde_result" >&6
++ { echo "$as_me:$LINENO: result: $kde_result" >&5
++echo "${ECHO_T}$kde_result" >&6; }
+ fi
+
+ bindir=$kde_bindir
+
+
+
+-# Check whether --with-arts or --without-arts was given.
++# Check whether --with-arts was given.
+ if test "${with_arts+set}" = set; then
+- withval="$with_arts"
+- build_arts=$withval
++ withval=$with_arts; build_arts=$withval
+ else
+ build_arts=yes
+
+-fi;
++fi
++
+
+
+ if test "$build_arts" '!=' "no"; then
+@@ -31806,14 +32458,14 @@
+
+ kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
+
+- echo "$as_me:$LINENO: checking for dcopidl" >&5
+-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dcopidl" >&5
++echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
+ if test -n "$DCOPIDL"; then
+ kde_cv_path="$DCOPIDL";
+ else
+ kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -31856,8 +32508,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+ Please check whether you installed KDE correctly.
+@@ -31868,21 +32520,21 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDL=$kde_cv_path
+
+ fi
+
+
+- echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
++echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
+ if test -n "$DCOPIDL2CPP"; then
+ kde_cv_path="$DCOPIDL2CPP";
+ else
+ kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -31925,8 +32577,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+ Please check whether you installed KDE correctly.
+@@ -31937,22 +32589,22 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDL2CPP=$kde_cv_path
+
+ fi
+
+ if test "$build_arts" '!=' "no"; then
+
+- echo "$as_me:$LINENO: checking for mcopidl" >&5
+-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for mcopidl" >&5
++echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
+ if test -n "$MCOPIDL"; then
+ kde_cv_path="$MCOPIDL";
+ else
+ kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -31995,8 +32647,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+ Please check whether you installed aRts correctly or use
+@@ -32009,21 +32661,21 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MCOPIDL=$kde_cv_path
+
+ fi
+
+
+- echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for artsc-config" >&5
++echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
+ if test -n "$ARTSCCONFIG"; then
+ kde_cv_path="$ARTSCCONFIG";
+ else
+ kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -32066,8 +32718,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+ Please check whether you installed aRts correctly or use
+@@ -32080,22 +32732,22 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ ARTSCCONFIG=$kde_cv_path
+
+ fi
+
+ fi
+
+- echo "$as_me:$LINENO: checking for meinproc" >&5
+-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for meinproc" >&5
++echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
+ if test -n "$MEINPROC"; then
+ kde_cv_path="$MEINPROC";
+ else
+ kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -32138,12 +32790,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MEINPROC=$kde_cv_path
+
+ fi
+@@ -32172,14 +32824,14 @@
+
+ if test -n "$kde32ornewer"; then
+
+- echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
++echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+ if test -n "$KCONFIG_COMPILER"; then
+ kde_cv_path="$KCONFIG_COMPILER";
+ else
+ kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -32222,8 +32874,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+ Please check whether you installed KDE correctly.
+@@ -32234,21 +32886,21 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KCONFIG_COMPILER=$kde_cv_path
+
+ fi
+
+
+- echo "$as_me:$LINENO: checking for dcopidlng" >&5
+-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dcopidlng" >&5
++echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
+ if test -n "$DCOPIDLNG"; then
+ kde_cv_path="$DCOPIDLNG";
+ else
+ kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -32291,8 +32943,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+ Please check whether you installed KDE correctly.
+@@ -32303,8 +32955,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDLNG=$kde_cv_path
+
+ fi
+@@ -32312,14 +32964,14 @@
+ fi
+ if test -n "$kde33ornewer"; then
+
+- echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
++echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
+ if test -n "$MAKEKDEWIDGETS"; then
+ kde_cv_path="$MAKEKDEWIDGETS";
+ else
+ kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -32362,8 +33014,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+ Please check whether you installed KDE correctly.
+@@ -32374,8 +33026,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MAKEKDEWIDGETS=$kde_cv_path
+
+ fi
+@@ -32383,14 +33035,14 @@
+
+ fi
+
+- echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+ if test -n "$XMLLINT"; then
+ kde_cv_path="$XMLLINT";
+ else
+ kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -32433,12 +33085,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ XMLLINT=""
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ XMLLINT=$kde_cv_path
+
+ fi
+@@ -32453,7 +33105,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32453: $i/$j" >&5
-+ echo "configure: 31982: $i/$j" >&5
+- echo "configure: 32456: $i/$j" >&5
++ echo "configure: 33108: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32649,8 +32178,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+@@ -32620,9 +33272,9 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -32670,12 +33322,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Header=no"
++ eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+@@ -32687,13 +33341,12 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+- echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32701,77 +33354,29 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-+ { 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
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in dir; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' dir; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
-@@ -32722,8 +32250,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
+@@ -32793,34 +33398,43 @@
ac_status=$?
-@@ -32777,8 +32304,7 @@
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+ (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
++ ac_cv_search_opendir=$ac_res
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
++else
++ ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
+ else
+- echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32828,77 +33442,29 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-+ { 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
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' x; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
-@@ -32849,8 +32375,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
+@@ -32920,30 +33486,40 @@
ac_status=$?
-@@ -32904,8 +32429,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=$?
-@@ -32972,8 +32496,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=$?
-@@ -33143,8 +32666,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=$?
-@@ -33281,9 +32803,6 @@
+ (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
++ ac_cv_search_opendir=$ac_res
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
++else
++ ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
+ fi
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32993,8 +33569,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_stdc=no
++ ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test $ac_cv_header_stdc = yes; then
+@@ -33051,6 +33628,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -33070,8 +33648,8 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -33094,12 +33672,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -33116,18 +33696,19 @@
+ for ac_header in fcntl.h sys/time.h unistd.h stdlib.h paths.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -33164,15 +33745,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -33206,9 +33788,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33232,25 +33815,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33264,15 +33841,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for setenv" >&5
+-echo $ECHO_N "checking for setenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for setenv" >&5
++echo $ECHO_N "checking for setenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_setenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -33284,9 +33860,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15930,27 +28388,86 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33314,8 +32833,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=$?
-@@ -33416,8 +32934,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=$?
-@@ -33496,9 +33013,6 @@
+@@ -33335,8 +33908,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_setenv=no
++ kde_cv_func_setenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -33350,11 +33924,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
+-echo "${ECHO_T}$kde_cv_func_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
++echo "${ECHO_T}$kde_cv_func_setenv" >&6; }
+
+-echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
+-echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
++echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_setenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33375,8 +33949,7 @@
+ if test "x$kde_cv_proto_setenv" = xunknown; then
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -33438,9 +34011,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_setenv="setenv unavailable"
++ kde_cv_proto_setenv="setenv unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -33454,8 +34028,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
++echo "${ECHO_T}$kde_cv_proto_setenv" >&6; }
+
+ if test "x$kde_cv_func_setenv" = xyes; then
+
+@@ -33479,15 +34053,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for unsetenv" >&5
+-echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for unsetenv" >&5
++echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_unsetenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -33499,9 +34072,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15960,27 +28477,86 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33529,8 +33043,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=$?
-@@ -33631,8 +33144,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=$?
-@@ -33711,9 +33223,6 @@
+@@ -33550,8 +34120,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_unsetenv=no
++ kde_cv_func_unsetenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -33565,11 +34136,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_func_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_func_unsetenv" >&6; }
+
+-echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
+-echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
++echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_unsetenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33590,8 +34161,7 @@
+ if test "x$kde_cv_proto_unsetenv" = xunknown; then
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -33653,9 +34223,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_unsetenv="unsetenv unavailable"
++ kde_cv_proto_unsetenv="unsetenv unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -33669,8 +34240,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6; }
+
+ if test "x$kde_cv_func_unsetenv" = xyes; then
+
+@@ -33694,15 +34265,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for usleep" >&5
+-echo $ECHO_N "checking for usleep... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for usleep" >&5
++echo $ECHO_N "checking for usleep... $ECHO_C" >&6; }
+ if test "${kde_cv_func_usleep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -33714,9 +34284,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15990,27 +28566,86 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33746,8 +33255,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=$?
-@@ -33850,8 +33358,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=$?
-@@ -33930,9 +33437,6 @@
+@@ -33767,8 +34334,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_usleep=no
++ kde_cv_func_usleep=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -33782,11 +34350,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
+-echo "${ECHO_T}$kde_cv_func_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
++echo "${ECHO_T}$kde_cv_func_usleep" >&6; }
+
+-echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
+-echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
++echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_usleep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33807,8 +34375,7 @@
+ if test "x$kde_cv_proto_usleep" = xunknown; then
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -33872,9 +34439,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_usleep="usleep unavailable"
++ kde_cv_proto_usleep="usleep unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -33888,8 +34456,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
+-echo "${ECHO_T}$kde_cv_proto_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
++echo "${ECHO_T}$kde_cv_proto_usleep" >&6; }
+
+ if test "x$kde_cv_func_usleep" = xyes; then
+
+@@ -33913,15 +34481,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for mkstemps" >&5
+-echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mkstemps" >&5
++echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mkstemps+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -33933,9 +34500,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16020,726 +28655,4419 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33966,8 +33470,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=$?
-@@ -34071,8 +33574,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=$?
-@@ -34162,8 +33664,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=$?
-@@ -34211,7 +33712,7 @@
+@@ -33987,8 +34551,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_mkstemps=no
++ kde_cv_func_mkstemps=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -34002,11 +34567,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_func_mkstemps" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
++echo "${ECHO_T}$kde_cv_func_mkstemps" >&6; }
+
+-echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
+-echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
++echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_mkstemps+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34027,8 +34592,7 @@
+ if test "x$kde_cv_proto_mkstemps" = xunknown; then
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -34093,9 +34657,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_mkstemps="mkstemps unavailable"
++ kde_cv_proto_mkstemps="mkstemps unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -34109,8 +34674,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
++echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6; }
+
+ if test "x$kde_cv_func_mkstemps" = xyes; then
+
+@@ -34132,8 +34697,8 @@
+
+
+
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34183,12 +34748,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_time=no
++ ac_cv_header_time=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -34201,8 +34767,8 @@
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+
+
+-echo "$as_me:$LINENO: checking for Qt docs" >&5
+-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt docs" >&5
++echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
+ kde_qtdir=
+ if test "${with_qt_dir+set}" = set; then
+ kde_qtdir="$with_qt_dir"
+@@ -34214,7 +34780,7 @@
do
for j in qsql.html;
do
-- echo "configure: 34214: $i/$j" >&5
-+ echo "configure: 33715: $i/$j" >&5
+- echo "configure: 34217: $i/$j" >&5
++ echo "configure: 34783: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -34411,11 +33912,47 @@
- set dummy gphoto2-config; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_gphoto_devel+set}" = set; then
-+if test "${ac_cv_prog_gphoto2_config+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$gphoto2_config"; then
-+ ac_cv_prog_gphoto2_config="$gphoto2_config" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_gphoto2_config="gphoto2-config"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
+@@ -34223,20 +34789,20 @@
+ done
+ done
+
+-echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+-echo "${ECHO_T}$QTDOCDIR" >&6
++{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
++echo "${ECHO_T}$QTDOCDIR" >&6; }
+
+
+
+
+- echo "$as_me:$LINENO: checking for dot" >&5
+-echo $ECHO_N "checking for dot... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dot" >&5
++echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
+ if test -n "$DOT"; then
+ kde_cv_path="$DOT";
+ else
+ kde_cache=`echo dot | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -34279,12 +34845,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DOT=$kde_cv_path
+
+ fi
+@@ -34296,14 +34862,14 @@
+ fi
+
+
+- echo "$as_me:$LINENO: checking for doxygen" >&5
+-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for doxygen" >&5
++echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
+ if test -n "$DOXYGEN"; then
+ kde_cv_path="$DOXYGEN";
+ else
+ kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -34346,12 +34912,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DOXYGEN=$kde_cv_path
+
+ fi
+@@ -34385,35 +34951,35 @@
+
+ # Process user input to configure
+
+-# Check whether --with-kamera or --without-kamera was given.
++# Check whether --with-kamera was given.
+ if test "${with_kamera+set}" = set; then
+- withval="$with_kamera"
+- if test "$withval" = "no" ; then
++ withval=$with_kamera; if test "$withval" = "no" ; then
+ gphoto2_includes=none
+ gphoto2_libraries=none
+ fi
+-fi;
++fi
+
-+ test -z "$ac_cv_prog_gphoto2_config" && ac_cv_prog_gphoto2_config="no"
+
+-# Check whether --with-gphoto2-includes or --without-gphoto2-includes was given.
++# Check whether --with-gphoto2-includes was given.
+ if test "${with_gphoto2_includes+set}" = set; then
+- withval="$with_gphoto2_includes"
+- gphoto2_includes="$withval"
+-fi;
++ withval=$with_gphoto2_includes; gphoto2_includes="$withval"
+fi
+
+
+-# Check whether --with-gphoto2-libraries or --without-gphoto2-libraries was given.
++
++# Check whether --with-gphoto2-libraries was given.
+ if test "${with_gphoto2_libraries+set}" = set; then
+- withval="$with_gphoto2_libraries"
+- gphoto2_libraries="$withval"
+-fi;
++ withval=$with_gphoto2_libraries; gphoto2_libraries="$withval"
+fi
-+gphoto2_config=$ac_cv_prog_gphoto2_config
-+if test -n "$gphoto2_config"; then
-+ echo "$as_me:$LINENO: result: $gphoto2_config" >&5
-+echo "${ECHO_T}$gphoto2_config" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
+
-+# Extract the first word of "gphoto2-port-config", so it can be a program name with args.
-+set dummy gphoto2-port-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_gphoto2_port_config+set}" = set; then
+
+-echo "$as_me:$LINENO: checking for gPhoto2" >&5
+-echo $ECHO_N "checking for gPhoto2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for gPhoto2" >&5
++echo $ECHO_N "checking for gPhoto2... $ECHO_C" >&6; }
+ # the pkg-config way first, if user did not use --with-
+ # Extract the first word of "gphoto2-config", so it can be a program name with args.
+ set dummy gphoto2-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_gphoto2_config+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test -n "$gphoto_devel"; then
-- ac_cv_prog_gphoto_devel="$gphoto_devel" # Let the user override the test.
-+ if test -n "$gphoto2_port_config"; then
-+ ac_cv_prog_gphoto2_port_config="$gphoto2_port_config" # Let the user override the test.
+@@ -34426,30 +34992,32 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_gphoto2_config="gphoto2-config"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_gphoto2_config" && ac_cv_prog_gphoto2_config="no"
+ fi
+ fi
+ gphoto2_config=$ac_cv_prog_gphoto2_config
+ if test -n "$gphoto2_config"; then
+- echo "$as_me:$LINENO: result: $gphoto2_config" >&5
+-echo "${ECHO_T}$gphoto2_config" >&6
++ { echo "$as_me:$LINENO: result: $gphoto2_config" >&5
++echo "${ECHO_T}$gphoto2_config" >&6; }
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -34424,30 +33961,30 @@
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ # Extract the first word of "gphoto2-port-config", so it can be a program name with args.
+ set dummy gphoto2-port-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_gphoto2_port_config+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34462,26 +35030,28 @@
+ IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_gphoto_devel="gphoto2-config"
-+ ac_cv_prog_gphoto2_port_config="gphoto2-port-config"
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_gphoto2_port_config="gphoto2-port-config"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
++IFS=$as_save_IFS
-- test -z "$ac_cv_prog_gphoto_devel" && ac_cv_prog_gphoto_devel="no"
-+ test -z "$ac_cv_prog_gphoto2_port_config" && ac_cv_prog_gphoto2_port_config="no"
+ test -z "$ac_cv_prog_gphoto2_port_config" && ac_cv_prog_gphoto2_port_config="no"
fi
fi
--gphoto_devel=$ac_cv_prog_gphoto_devel
--if test -n "$gphoto_devel"; then
-- echo "$as_me:$LINENO: result: $gphoto_devel" >&5
--echo "${ECHO_T}$gphoto_devel" >&6
-+gphoto2_port_config=$ac_cv_prog_gphoto2_port_config
-+if test -n "$gphoto2_port_config"; then
-+ echo "$as_me:$LINENO: result: $gphoto2_port_config" >&5
-+echo "${ECHO_T}$gphoto2_port_config" >&6
+ gphoto2_port_config=$ac_cv_prog_gphoto2_port_config
+ if test -n "$gphoto2_port_config"; then
+- echo "$as_me:$LINENO: result: $gphoto2_port_config" >&5
+-echo "${ECHO_T}$gphoto2_port_config" >&6
++ { echo "$as_me:$LINENO: result: $gphoto2_port_config" >&5
++echo "${ECHO_T}$gphoto2_port_config" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
fi
--if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto_devel" = "gphoto2-config"
-+if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto2_config" != "no" -a "$gphoto2_port_config" != "no"
++
+ if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto2_config" != "no" -a "$gphoto2_port_config" != "no"
then
with_kamera="yes"
-- GPHOTO2_INCS="`$gphoto_devel --cflags`"
-- GPHOTO2_LIBS="`$gphoto_devel --libs`"
-+ GPHOTO2_INCS="`$gphoto2_config --cflags` `$gphoto2_port_config --cflags`"
-+ GPHOTO2_LIBS="`$gphoto2_config --libs` `$gphoto2_port_config --libs`"
+@@ -34556,6 +35126,7 @@
+ done
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ #
+ LIBS="$ac_gphoto2_save_LIBS"
+@@ -34632,6 +35203,7 @@
+ done
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ #
+@@ -34718,13 +35290,14 @@
+ with_kamera="no"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_gphoto2_save_LIBS"
+ CFLAGS="$ac_gphoto2_save_CFLAGS"
+ fi
+-echo "$as_me:$LINENO: checking for va_copy" >&5
+-echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for va_copy" >&5
++echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; }
+ if test "${ac_cv_c_va_copy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- #
- # Search for gphoto2 include files.
-@@ -34484,8 +34021,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
+@@ -34772,14 +35345,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_c_va_copy="no"
++ ac_cv_c_va_copy="no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_va_copy" >&5
+-echo "${ECHO_T}$ac_cv_c_va_copy" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_va_copy" >&5
++echo "${ECHO_T}$ac_cv_c_va_copy" >&6; }
+ if test "$ac_cv_c_va_copy" = "yes"
+ then
+
+@@ -34788,8 +35362,8 @@
+ _ACEOF
+
+ fi
+-echo "$as_me:$LINENO: checking for __va_copy" >&5
+-echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for __va_copy" >&5
++echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6; }
+ if test "${ac_cv_c___va_copy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34837,14 +35411,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_c___va_copy="no"
++ ac_cv_c___va_copy="no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c___va_copy" >&5
+-echo "${ECHO_T}$ac_cv_c___va_copy" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c___va_copy" >&5
++echo "${ECHO_T}$ac_cv_c___va_copy" >&6; }
+ if test "$ac_cv_c___va_copy" = "yes"
+ then
+
+@@ -34869,8 +35444,8 @@
+ test "$gphoto2_libraries" = "none" && gphoto2_libraries_result="(none)"
+ test "$gphoto2_includes" = "none" && gphoto2_includes_result="(none)"
+
+-echo "$as_me:$LINENO: result: gphoto2 libraries $gphoto2_libraries_result, gphoto2 headers $gphoto2_includes_result" >&5
+-echo "${ECHO_T}gphoto2 libraries $gphoto2_libraries_result, gphoto2 headers $gphoto2_includes_result" >&6
++{ echo "$as_me:$LINENO: result: gphoto2 libraries $gphoto2_libraries_result, gphoto2 headers $gphoto2_includes_result" >&5
++echo "${ECHO_T}gphoto2 libraries $gphoto2_libraries_result, gphoto2 headers $gphoto2_includes_result" >&6; }
+
+
+ if test "$with_kamera" = "no"; then
+@@ -34891,14 +35466,14 @@
+ if test "$compile_kdvi" = "yes"; then
+
+
+- echo "$as_me:$LINENO: checking for kpsewhich" >&5
+-echo $ECHO_N "checking for kpsewhich... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kpsewhich" >&5
++echo $ECHO_N "checking for kpsewhich... $ECHO_C" >&6; }
+ if test -n "$KPSEWHICH"; then
+ kde_cv_path="$KPSEWHICH";
+ else
+ kde_cache=`echo kpsewhich | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -34941,12 +35516,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KPSEWHICH=$kde_cv_path
+
+ fi
+@@ -34964,18 +35539,19 @@
+ for ac_header in sys/types.h sys/params.h limits.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -35012,15 +35588,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -35054,9 +35631,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -35080,25 +35658,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -35113,14 +35685,14 @@
+
+ # Check for freetype2
+
+- echo "$as_me:$LINENO: checking for freetype-config" >&5
+-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for freetype-config" >&5
++echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
+ if test -n "$FREETYPE_CONFIG"; then
+ kde_cv_path="$FREETYPE_CONFIG";
+ else
+ kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -35163,12 +35735,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FREETYPE_CONFIG=$kde_cv_path
+
+ fi
+@@ -35209,13 +35781,13 @@
+
+
+
+-# Check whether --with-openexr or --without-openexr was given.
++# Check whether --with-openexr was given.
+ if test "${with_openexr+set}" = set; then
+- withval="$with_openexr"
+-
++ withval=$with_openexr;
+ else
+ with_openexr=check
+-fi;
++fi
++
+
+ if test "x$with_openexr" != xno; then
+
+@@ -35228,8 +35800,8 @@
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35244,56 +35816,56 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+
+- echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
+-echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
++echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6; }
+
+ if test "$PKG_CONFIG" = "no" ; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ EXRSTATUS=no
+ else
+ if !(`$PKG_CONFIG --atleast-version="1.1.0" OpenEXR`) ; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ EXRSTATUS=old
+ else
+ kde_save_LIBS="$LIBS"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -35354,9 +35926,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_libexr=no"
++ eval "ac_cv_libexr=no"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -35376,11 +35949,11 @@
+ _ACEOF
+
+ LIB_EXR="$ac_cv_libexr"
+- echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
+-echo "${ECHO_T}$ac_cv_libexr" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
++echo "${ECHO_T}$ac_cv_libexr" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIB_EXR=""
+ fi
+ fi
+@@ -35409,13 +35982,13 @@
+
+
+
+-# Check whether --with-poppler or --without-poppler was given.
++# Check whether --with-poppler was given.
+ if test "${with_poppler+set}" = set; then
+- withval="$with_poppler"
+-
++ withval=$with_poppler;
+ else
+ with_poppler=check
+-fi;
++fi
++
+
+ # Compile the pdf meta info plugin only if Poppler is available
+ if test "x$with_poppler" != xno; then
+@@ -35425,8 +35998,8 @@
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35441,28 +36014,29 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+@@ -35473,25 +36047,25 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for poppler-qt >= 0.3.1" >&5
+-echo $ECHO_N "checking for poppler-qt >= 0.3.1... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for poppler-qt >= 0.3.1" >&5
++echo $ECHO_N "checking for poppler-qt >= 0.3.1... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "poppler-qt >= 0.3.1" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ succeeded=yes
+
+- echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
+-echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
++echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6; }
+ POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler-qt >= 0.3.1"`
+- echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
+-echo "${ECHO_T}$POPPLER_CFLAGS" >&6
++ { echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
++echo "${ECHO_T}$POPPLER_CFLAGS" >&6; }
+
+- echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
+-echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
++echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6; }
+ POPPLER_LIBS=`$PKG_CONFIG --libs "poppler-qt >= 0.3.1"`
+- echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
+-echo "${ECHO_T}$POPPLER_LIBS" >&6
++ { echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
++echo "${ECHO_T}$POPPLER_LIBS" >&6; }
+ else
+ POPPLER_CFLAGS=""
+ POPPLER_LIBS=""
+@@ -35542,16 +36116,15 @@
+
+
+
+-echo "$as_me:$LINENO: checking for libtiff tiff" >&5
+-echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libtiff tiff" >&5
++echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6; }
+
+ if test "${kde_cv_libtiff_tiff+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -35619,6 +36192,7 @@
+ kde_cv_libtiff_tiff=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -35635,20 +36209,19 @@
+
+
+ if test "$kde_cv_libtiff_tiff" = "no"; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBTIFF=""
+
+-echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
+-echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
++echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6; }
+
+ if test "${kde_cv_libtiff_tiff34+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -35716,6 +36289,7 @@
+ kde_cv_libtiff_tiff34=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -35732,14 +36306,14 @@
+
+
+ if test "$kde_cv_libtiff_tiff34" = "no"; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBTIFF=""
+
+ else
+ LIBTIFF="$kde_cv_libtiff_tiff34"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBTIFF 1
+@@ -35751,8 +36325,8 @@
+
+ else
+ LIBTIFF="$kde_cv_libtiff_tiff"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBTIFF 1
+@@ -35781,8 +36355,8 @@
+
+
+
+-echo "$as_me:$LINENO: checking for XFree86-VidModeExtension" >&5
+-echo $ECHO_N "checking for XFree86-VidModeExtension... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for XFree86-VidModeExtension" >&5
++echo $ECHO_N "checking for XFree86-VidModeExtension... $ECHO_C" >&6; }
+
+ if test "${ac_cv_lib_vm+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -35837,10 +36411,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ eval "ac_cv_lib_vm=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -35852,11 +36427,11 @@
+ if eval "test ! \"`echo $ac_cv_lib_vm`\" = no"; then
+ LIBVM="$ac_cv_lib_vm"
+
+- echo "$as_me:$LINENO: result: $ac_cv_lib_vm" >&5
+-echo "${ECHO_T}$ac_cv_lib_vm" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_vm" >&5
++echo "${ECHO_T}$ac_cv_lib_vm" >&6; }
+
+- echo "$as_me:$LINENO: checking for gamma functions in XFree86-VidModeExtension" >&5
+-echo $ECHO_N "checking for gamma functions in XFree86-VidModeExtension... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for gamma functions in XFree86-VidModeExtension" >&5
++echo $ECHO_N "checking for gamma functions in XFree86-VidModeExtension... $ECHO_C" >&6; }
+
+ if test "${ac_cv_lib_vmgamma+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -35902,17 +36477,18 @@
ac_status=$?
-@@ -34561,8 +34097,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=$?
-@@ -34650,8 +34185,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=$?
-@@ -34715,8 +34249,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=$?
-@@ -34780,8 +34313,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=$?
-@@ -34955,8 +34487,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=$?
-@@ -35297,8 +34828,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=$?
-@@ -35556,8 +35086,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=$?
-@@ -35653,8 +35182,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=$?
-@@ -35780,8 +35308,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=$?
-@@ -35850,8 +35377,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=$?
-@@ -35933,8 +35459,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=$?
-@@ -36423,8 +35948,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=$?
-@@ -36631,8 +36155,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=$?
-@@ -36671,7 +36194,7 @@
+ (exit $ac_status); }; }; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ eval "ac_cv_lib_vm='-lXxf86vm'"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ eval "ac_cv_lib_vm=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -35927,8 +36503,7 @@
+ fi
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -35942,18 +36517,19 @@
+ for ac_header in sstream
do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -35990,15 +36566,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -36032,9 +36609,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -36058,25 +36636,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -36097,22 +36669,22 @@
+
+
+
+-# Check whether --with-kadmos or --without-kadmos was given.
++# Check whether --with-kadmos was given.
+ if test "${with_kadmos+set}" = set; then
+- withval="$with_kadmos"
+-
++ withval=$with_kadmos;
+ else
+ with_kadmos=check
+-fi;
++fi
++
+
+
+-# Check whether --with-kadmos-dir or --without-kadmos-dir was given.
++# Check whether --with-kadmos-dir was given.
+ if test "${with_kadmos_dir+set}" = set; then
+- withval="$with_kadmos_dir"
+- ac_kadmos_value=$withval
++ withval=$with_kadmos_dir; ac_kadmos_value=$withval
+ else
+ ac_kadmos_value=/usr/local
+-fi;
++fi
++
+
+ KADMOS_INC=
+ KADMOS_LIB=
+@@ -36143,14 +36715,14 @@
+
+
+
+- echo "$as_me:$LINENO: checking for freetype-config" >&5
+-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for freetype-config" >&5
++echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
+ if test -n "$FREETYPE_CONFIG"; then
+ kde_cv_path="$FREETYPE_CONFIG";
+ else
+ kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -36193,15 +36765,15 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
+ echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FREETYPE_CONFIG=$kde_cv_path
+
+ fi
+@@ -36253,8 +36825,8 @@
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36269,28 +36841,29 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+@@ -36301,25 +36874,25 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for xft >= 2.0" >&5
+-echo $ECHO_N "checking for xft >= 2.0... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for xft >= 2.0" >&5
++echo $ECHO_N "checking for xft >= 2.0... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "xft >= 2.0" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ succeeded=yes
+
+- echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5
+-echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5
++echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; }
+ XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 2.0"`
+- echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5
+-echo "${ECHO_T}$XFT_CFLAGS" >&6
++ { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5
++echo "${ECHO_T}$XFT_CFLAGS" >&6; }
+
+- echo "$as_me:$LINENO: checking XFT_LIBS" >&5
+-echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking XFT_LIBS" >&5
++echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; }
+ XFT_LIBS=`$PKG_CONFIG --libs "xft >= 2.0"`
+- echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
+-echo "${ECHO_T}$XFT_LIBS" >&6
++ { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
++echo "${ECHO_T}$XFT_LIBS" >&6; }
+ else
+ XFT_CFLAGS=""
+ XFT_LIBS=""
+@@ -36342,14 +36915,14 @@
+ else
+ # This older xft-config stuff can (eventually) go away.
+
+- echo "$as_me:$LINENO: checking for xft-config" >&5
+-echo $ECHO_N "checking for xft-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for xft-config" >&5
++echo $ECHO_N "checking for xft-config... $ECHO_C" >&6; }
+ if test -n "$XFT_CONFIG"; then
+ kde_cv_path="$XFT_CONFIG";
+ else
+ kde_cache=`echo xft-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -36392,12 +36965,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ XFT_CONFIG=$kde_cv_path
+
+ fi
+@@ -36422,8 +36995,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -36433,17 +37005,17 @@
+
+
+ if test "${ac_cv_header_paper_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for paper.h" >&5
+-echo $ECHO_N "checking for paper.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for paper.h" >&5
++echo $ECHO_N "checking for paper.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_paper_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_paper_h" >&5
+-echo "${ECHO_T}$ac_cv_header_paper_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_paper_h" >&5
++echo "${ECHO_T}$ac_cv_header_paper_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking paper.h usability" >&5
+-echo $ECHO_N "checking paper.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking paper.h usability" >&5
++echo $ECHO_N "checking paper.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -36480,15 +37052,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking paper.h presence" >&5
+-echo $ECHO_N "checking paper.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking paper.h presence" >&5
++echo $ECHO_N "checking paper.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -36522,9 +37095,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -36548,25 +37122,18 @@
+ echo "$as_me: WARNING: paper.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: paper.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: paper.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for paper.h" >&5
+-echo $ECHO_N "checking for paper.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for paper.h" >&5
++echo $ECHO_N "checking for paper.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_paper_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_paper_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_paper_h" >&5
+-echo "${ECHO_T}$ac_cv_header_paper_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_paper_h" >&5
++echo "${ECHO_T}$ac_cv_header_paper_h" >&6; }
+
+ fi
+ if test $ac_cv_header_paper_h = yes; then
+@@ -36605,9 +37172,9 @@
+ for ac_func in fseek64 mkstemp mkstemps popen
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -36633,30 +37200,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -36688,13 +37249,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -36710,7 +37273,7 @@
+ do
for j in xpdfrc;
do
-- echo "configure: 36674: $i/$j" >&5
-+ echo "configure: 36197: $i/$j" >&5
+- echo "configure: 36713: $i/$j" >&5
++ echo "configure: 37276: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
xpdfrc=$i
-@@ -36739,8 +36262,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
+@@ -36728,15 +37291,15 @@
+ fi
+
+
+-# Check whether --enable-largefile or --disable-largefile was given.
++# Check whether --enable-largefile was given.
+ if test "${enable_largefile+set}" = set; then
+- enableval="$enable_largefile"
++ enableval=$enable_largefile;
++fi
+
+-fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36744,8 +37307,8 @@
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
+- # IRIX 6.2 and later do not support large files by default,
+- # so use the C compiler's -n32 option if that helps.
++ # IRIX 6.2 and later do not support large files by default,
++ # so use the C compiler's -n32 option if that helps.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -36769,7 +37332,7 @@
+ return 0;
+ }
+ _ACEOF
+- rm -f conftest.$ac_objext
++ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
-@@ -36769,8 +36291,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
+@@ -36796,10 +37359,12 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext
+- CC="$CC -n32"
+- rm -f conftest.$ac_objext
++ CC="$CC -n32"
++ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
-@@ -36840,8 +36361,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=$?
-@@ -36893,8 +36413,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=$?
-@@ -36965,8 +36484,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=$?
-@@ -37018,8 +36536,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=$?
-@@ -37093,8 +36610,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=$?
-@@ -37138,8 +36654,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=$?
-@@ -37204,8 +36719,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=$?
-@@ -37306,8 +36820,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=$?
-@@ -37410,8 +36923,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=$?
-@@ -37578,8 +37090,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+@@ -36826,7 +37391,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext
+ break
+ done
+@@ -36834,14 +37401,14 @@
+ rm -f conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
+
+- echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36897,7 +37464,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -36950,13 +37519,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ break
+ done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -36965,8 +37536,8 @@
+
+ fi
+ rm -f conftest*
+- echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_large_files+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37022,7 +37593,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -37075,13 +37648,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ break
+ done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
++echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+ if test "$ac_cv_sys_large_files" != no; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -37101,8 +37676,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+-echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37150,7 +37725,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -37195,13 +37772,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ break
+ done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+-echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
++echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
+ if test "$ac_cv_sys_largefile_source" != no; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -37214,8 +37793,8 @@
+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+ # in glibc 2.1.3, but that breaks too many other things.
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+-echo "$as_me:$LINENO: checking for fseeko" >&5
+-echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for fseeko" >&5
++echo $ECHO_N "checking for fseeko... $ECHO_C" >&6; }
+ if test "${ac_cv_func_fseeko+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37261,13 +37840,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_fseeko=no
++ ac_cv_func_fseeko=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
+-echo "${ECHO_T}$ac_cv_func_fseeko" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
++echo "${ECHO_T}$ac_cv_func_fseeko" >&6; }
+ if test $ac_cv_func_fseeko = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -37280,9 +37860,9 @@
+ for ac_func in fseek64
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -37308,30 +37888,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -37363,13 +37937,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -37384,9 +37960,9 @@
+ for ac_func in ftell64
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -37412,30 +37988,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -37467,13 +38037,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -37496,10 +38068,9 @@
+
+ fi
+
+-# Check whether --enable-multithreaded-kpdf or --disable-multithreaded-kpdf was given.
++# Check whether --enable-multithreaded-kpdf was given.
+ if test "${enable_multithreaded_kpdf+set}" = set; then
+- enableval="$enable_multithreaded_kpdf"
+-
++ enableval=$enable_multithreaded_kpdf;
+ case $enableval in
+ yes)
+
+@@ -37532,12 +38103,12 @@
+ _ACEOF
+
+
+-fi;
++fi
+
+-# Check whether --enable-force-kpdf-drm or --disable-force-kpdf-drm was given.
+-if test "${enable_force_kpdf_drm+set}" = set; then
+- enableval="$enable_force_kpdf_drm"
+
++# Check whether --enable-force-kpdf-drm was given.
++if test "${enable_force_kpdf_drm+set}" = set; then
++ enableval=$enable_force_kpdf_drm;
+ case $enableval in
+ yes)
+
+@@ -37570,19 +38141,19 @@
+ _ACEOF
+
+
+-fi;
++fi
++
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-regmove" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-regmove... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-regmove" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-regmove... $ECHO_C" >&6; }
+ kde_cache=`echo fno-regmove | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -37635,7 +38206,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -37649,13 +38222,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ SUPPORTS_NOREGMOVE=true
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ SUPPORTS_NOREGMOVE=false
+ fi
+@@ -37675,10 +38248,9 @@
+
+
+
+-
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -37693,18 +38265,19 @@
+ for ac_header in GL/gl.h GL/glu.h GL/glx.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -37741,15 +38314,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -37783,9 +38357,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -37809,25 +38384,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -37864,28 +38433,27 @@
+ test -z "$GL_INCLUDE" && GL_INCLUDE=
+
+
+-# Check whether --with-gl or --without-gl was given.
++# Check whether --with-gl was given.
+ if test "${with_gl+set}" = set; then
+- withval="$with_gl"
+- gl_test=$withval
++ withval=$with_gl; gl_test=$withval
+ else
+ gl_test="yes"
+-fi;
++fi
++
+ if test "x$kde_use_qt_emb" = "xyes"; then
+ # GL and Qt Embedded is a no-go for now.
+ ac_cv_have_gl=no
+ elif test "x$gl_test" = xno; then
+ ac_cv_have_gl=no
+ else
+- echo "$as_me:$LINENO: checking for GL" >&5
+-echo $ECHO_N "checking for GL... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for GL" >&5
++echo $ECHO_N "checking for GL... $ECHO_C" >&6; }
+ if test "${ac_cv_have_gl+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -37947,8 +38515,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_have_gl="no"
++ ac_cv_have_gl="no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -37964,8 +38533,8 @@
+ fi
+
+ if test "$ac_cv_have_gl" = "no"; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ GL_LDFLAGS=""
+ GLINC=""
+ can_link_gl=no
+@@ -37985,8 +38554,8 @@
+ else
+ GLINC="-I$GL_INCLUDE"
+ fi
+- echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6; }
+ can_link_gl=yes
+ fi
+ fi
+@@ -38008,14 +38577,14 @@
+
+
+
+- echo "$as_me:$LINENO: checking for freetype-config" >&5
+-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for freetype-config" >&5
++echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
+ if test -n "$FREETYPE_CONFIG"; then
+ kde_cv_path="$FREETYPE_CONFIG";
+ else
+ kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -38058,12 +38627,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FREETYPE_CONFIG=$kde_cv_path
+
+ fi
+@@ -38090,8 +38659,8 @@
+ #define HAVE_FREETYPE 1
+ _ACEOF
+
+- echo "$as_me:$LINENO: result: libraries $LIBFREETYPE_LIBS, headers $LIBFREETYPE_CFLAGS" >&5
+-echo "${ECHO_T}libraries $LIBFREETYPE_LIBS, headers $LIBFREETYPE_CFLAGS" >&6
++ { echo "$as_me:$LINENO: result: libraries $LIBFREETYPE_LIBS, headers $LIBFREETYPE_CFLAGS" >&5
++echo "${ECHO_T}libraries $LIBFREETYPE_LIBS, headers $LIBFREETYPE_CFLAGS" >&6; }
+ else
+ { echo "$as_me:$LINENO: WARNING: You need at least libfreetype 5.0" >&5
+ echo "$as_me: WARNING: You need at least libfreetype 5.0" >&2;}
+@@ -38107,10 +38676,9 @@
+
+
+
+-
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -38123,9 +38691,9 @@
+ for ac_header in X11/extensions/shape.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -38168,12 +38736,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Header=no"
++ eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -38194,14 +38764,14 @@
+
+ # Check for libart
+
+- echo "$as_me:$LINENO: checking for libart2-config" >&5
+-echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for libart2-config" >&5
++echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6; }
+ if test -n "$LIBART_CONFIG"; then
+ kde_cv_path="$LIBART_CONFIG";
+ else
+ kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -38244,12 +38814,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ LIBART_CONFIG=$kde_cv_path
+
+ fi
+@@ -38289,14 +38859,14 @@
+
+ # Check for fontconfig
+
+- echo "$as_me:$LINENO: checking for fontconfig-config" >&5
+-echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
++echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
+ if test -n "$FONTCONFIG_CONFIG"; then
+ kde_cv_path="$FONTCONFIG_CONFIG";
+ else
+ kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -38339,18 +38909,18 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+
+- echo "$as_me:$LINENO: checking for pkg-config" >&5
+-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pkg-config" >&5
++echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
+ if test -n "$PKG_CONFIG"; then
+ kde_cv_path="$PKG_CONFIG";
+ else
+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -38393,12 +38963,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PKG_CONFIG=$kde_cv_path
+
+ fi
+@@ -38410,8 +38980,8 @@
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FONTCONFIG_CONFIG=$kde_cv_path
+
+ fi
+@@ -38458,14 +39028,14 @@
+
+ # Check for freetype2
+
+- echo "$as_me:$LINENO: checking for freetype-config" >&5
+-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for freetype-config" >&5
++echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
+ if test -n "$FREETYPE_CONFIG"; then
+ kde_cv_path="$FREETYPE_CONFIG";
+ else
+ kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -38508,12 +39078,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FREETYPE_CONFIG=$kde_cv_path
+
+ fi
+@@ -38567,8 +39137,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -38578,17 +39147,17 @@
+
+
+ if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
+-echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
++echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
+-echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
++echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -38625,15 +39194,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
+-echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
++echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -38667,9 +39237,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -38693,25 +39264,18 @@
+ echo "$as_me: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
+-echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
++echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_lcms_lcms_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
+
+ fi
+ if test $ac_cv_header_lcms_lcms_h = yes; then
+@@ -38741,8 +39305,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -38752,17 +39315,17 @@
+
+
+ if test "${ac_cv_header_lcms_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for lcms.h" >&5
+-echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for lcms.h" >&5
++echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking lcms.h usability" >&5
+-echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms.h usability" >&5
++echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -38799,15 +39362,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking lcms.h presence" >&5
+-echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms.h presence" >&5
++echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -38841,9 +39405,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -38867,25 +39432,18 @@
+ echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for lcms.h" >&5
+-echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for lcms.h" >&5
++echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_lcms_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
+
+ fi
+ if test $ac_cv_header_lcms_h = yes; then
+@@ -38952,14 +39510,14 @@
+
+ # Check for fribidi
+
+- echo "$as_me:$LINENO: checking for fribidi-config" >&5
+-echo $ECHO_N "checking for fribidi-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for fribidi-config" >&5
++echo $ECHO_N "checking for fribidi-config... $ECHO_C" >&6; }
+ if test -n "$FRIBIDI_CONFIG"; then
+ kde_cv_path="$FRIBIDI_CONFIG";
+ else
+ kde_cache=`echo fribidi-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -39002,12 +39560,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FRIBIDI_CONFIG=$kde_cv_path
+
+ fi
+@@ -39046,8 +39604,7 @@
+ fi
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39060,18 +39617,19 @@
+ for ac_header in sstream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -39108,15 +39666,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -39150,9 +39709,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -39176,25 +39736,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -39269,8 +39823,8 @@
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39285,28 +39839,29 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+@@ -39317,25 +39872,25 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for imlib >= 1.9.10" >&5
+-echo $ECHO_N "checking for imlib >= 1.9.10... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for imlib >= 1.9.10" >&5
++echo $ECHO_N "checking for imlib >= 1.9.10... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "imlib >= 1.9.10" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ succeeded=yes
+
+- echo "$as_me:$LINENO: checking IMLIB_CFLAGS" >&5
+-echo $ECHO_N "checking IMLIB_CFLAGS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking IMLIB_CFLAGS" >&5
++echo $ECHO_N "checking IMLIB_CFLAGS... $ECHO_C" >&6; }
+ IMLIB_CFLAGS=`$PKG_CONFIG --cflags "imlib >= 1.9.10"`
+- echo "$as_me:$LINENO: result: $IMLIB_CFLAGS" >&5
+-echo "${ECHO_T}$IMLIB_CFLAGS" >&6
++ { echo "$as_me:$LINENO: result: $IMLIB_CFLAGS" >&5
++echo "${ECHO_T}$IMLIB_CFLAGS" >&6; }
+
+- echo "$as_me:$LINENO: checking IMLIB_LIBS" >&5
+-echo $ECHO_N "checking IMLIB_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking IMLIB_LIBS" >&5
++echo $ECHO_N "checking IMLIB_LIBS... $ECHO_C" >&6; }
+ IMLIB_LIBS=`$PKG_CONFIG --libs "imlib >= 1.9.10"`
+- echo "$as_me:$LINENO: result: $IMLIB_LIBS" >&5
+-echo "${ECHO_T}$IMLIB_LIBS" >&6
++ { echo "$as_me:$LINENO: result: $IMLIB_LIBS" >&5
++echo "${ECHO_T}$IMLIB_LIBS" >&6; }
+ else
+ IMLIB_CFLAGS=""
+ IMLIB_LIBS=""
+@@ -39358,57 +39913,57 @@
+
+
+ else
+- echo "$as_me:$LINENO: checking for imlib-config" >&5
+-echo $ECHO_N "checking for imlib-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for imlib-config" >&5
++echo $ECHO_N "checking for imlib-config... $ECHO_C" >&6; }
+
+ imlib_config_given=NO
+ ac_imlib_config=""
+
+
+ --with-imlib-config=DIR directory where "imlib-config" is located
+-# Check whether --with-imlib-config or --without-imlib-config was given.
++# Check whether --with-imlib-config was given.
+ if test "${with_imlib_config+set}" = set; then
+- withval="$with_imlib_config"
+- ac_imlib_config="$withval/imlib-config"
++ withval=$with_imlib_config; ac_imlib_config="$withval/imlib-config"
+ imlib_config_given=yes
+
+-fi;
++fi
++
+
+ if test "$imlib_config_given" = "yes"; then
+ if test ! -r $ac_imlib_config; then
+- echo "$as_me:$LINENO: result: wrong file specified" >&5
+-echo "${ECHO_T}wrong file specified" >&6
++ { echo "$as_me:$LINENO: result: wrong file specified" >&5
++echo "${ECHO_T}wrong file specified" >&6; }
+ ac_imlib_config=""
+ else
+- echo "$as_me:$LINENO: result: $ac_imlib_config" >&5
+-echo "${ECHO_T}$ac_imlib_config" >&6
++ { echo "$as_me:$LINENO: result: $ac_imlib_config" >&5
++echo "${ECHO_T}$ac_imlib_config" >&6; }
+ LIB_IMLIB=`$ac_imlib_config --libs`
+
+ fi
+ else
+ ac_imlib_config=`which imlib-config 2>/dev/null`
+ if test -z "$ac_imlib_config"; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ else
+ dummy=`echo "$ac_imlib_config" | grep '/imlib-config'`
+ if test -z "$dummy"; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ac_imlib_config=""
+ else
+ LIB_IMLIB=`$ac_imlib_config --libs`
+ IMLIB_CFLAGS=`$ac_imlib_config --cflags`
+ imlib_config=`echo "$LIB_IMLIB" | grep lImlib`
+ if test -z "$imlib_config"; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ac_imlib_config=""
+ else
+
+
+- echo "$as_me:$LINENO: result: $ac_imlib_config" >&5
+-echo "${ECHO_T}$ac_imlib_config" >&6
++ { echo "$as_me:$LINENO: result: $ac_imlib_config" >&5
++echo "${ECHO_T}$ac_imlib_config" >&6; }
+ fi
+ fi
+ fi
+@@ -39462,20 +40017,19 @@
+
+
+ # C++
+-ac_ext=cc
++ac_ext=cpp
+ 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 whether the compiler recognizes bool as a built-in type" >&5
+-echo $ECHO_N "checking whether the compiler recognizes bool as a built-in type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the compiler recognizes bool as a built-in type" >&5
++echo $ECHO_N "checking whether the compiler recognizes bool as a built-in type... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_bool+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39530,10 +40084,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_cxx_bool=no
++ ac_cv_cxx_bool=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39541,8 +40096,8 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_bool" >&5
+-echo "${ECHO_T}$ac_cv_cxx_bool" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_bool" >&5
++echo "${ECHO_T}$ac_cv_cxx_bool" >&6; }
+ if test "$ac_cv_cxx_bool" = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -39551,14 +40106,13 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether the compiler supports exceptions" >&5
+-echo $ECHO_N "checking whether the compiler supports exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the compiler supports exceptions" >&5
++echo $ECHO_N "checking whether the compiler supports exceptions... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39609,10 +40163,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_cxx_exceptions=no
++ ac_cv_cxx_exceptions=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39620,8 +40175,8 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_exceptions" >&5
+-echo "${ECHO_T}$ac_cv_cxx_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_exceptions" >&5
++echo "${ECHO_T}$ac_cv_cxx_exceptions" >&6; }
+ if test "$ac_cv_cxx_exceptions" = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -39630,14 +40185,13 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether the compiler recognizes typename" >&5
+-echo $ECHO_N "checking whether the compiler recognizes typename... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the compiler recognizes typename" >&5
++echo $ECHO_N "checking whether the compiler recognizes typename... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_typename+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39688,10 +40242,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_cxx_typename=no
++ ac_cv_cxx_typename=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39699,8 +40254,8 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_typename" >&5
+-echo "${ECHO_T}$ac_cv_cxx_typename" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_typename" >&5
++echo "${ECHO_T}$ac_cv_cxx_typename" >&6; }
+ if test "$ac_cv_cxx_typename" = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -39709,14 +40264,13 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether the compiler comes with standard includes" >&5
+-echo $ECHO_N "checking whether the compiler comes with standard includes... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the compiler comes with standard includes" >&5
++echo $ECHO_N "checking whether the compiler comes with standard includes... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_stdincludes+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39769,10 +40323,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_cxx_stdincludes=no
++ ac_cv_cxx_stdincludes=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39780,8 +40335,8 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_stdincludes" >&5
+-echo "${ECHO_T}$ac_cv_cxx_stdincludes" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_stdincludes" >&5
++echo "${ECHO_T}$ac_cv_cxx_stdincludes" >&6; }
+ if test "$ac_cv_cxx_stdincludes" = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -39790,14 +40345,13 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether the compiler implements namespaces" >&5
+-echo $ECHO_N "checking whether the compiler implements namespaces... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the compiler implements namespaces" >&5
++echo $ECHO_N "checking whether the compiler implements namespaces... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_namespaces+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39848,10 +40402,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_cxx_namespaces=no
++ ac_cv_cxx_namespaces=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39859,8 +40414,8 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_namespaces" >&5
+-echo "${ECHO_T}$ac_cv_cxx_namespaces" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_namespaces" >&5
++echo "${ECHO_T}$ac_cv_cxx_namespaces" >&6; }
+ if test "$ac_cv_cxx_namespaces" = yes && test "$ac_debug" = no; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -39869,14 +40424,13 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether the compiler supports member templates" >&5
+-echo $ECHO_N "checking whether the compiler supports member templates... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the compiler supports member templates" >&5
++echo $ECHO_N "checking whether the compiler supports member templates... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_member_templates+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39931,10 +40485,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_cxx_member_templates=no
++ ac_cv_cxx_member_templates=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
++ ac_ext=cpp
+ 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'
+@@ -39942,8 +40497,8 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_member_templates" >&5
+-echo "${ECHO_T}$ac_cv_cxx_member_templates" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_member_templates" >&5
++echo "${ECHO_T}$ac_cv_cxx_member_templates" >&6; }
+ if test "$ac_cv_cxx_member_templates" = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -39956,13 +40511,13 @@
+ RPO_YES='#'
+ RPO_NO=''
+ if test x$GXX = xyes ; then
+- # Check whether --enable-rpo or --disable-rpo was given.
++ # Check whether --enable-rpo was given.
+ if test "${enable_rpo+set}" = set; then
+- enableval="$enable_rpo"
+- ac_rpo=$enableval
++ enableval=$enable_rpo; ac_rpo=$enableval
+ else
+ ac_rpo=no
+-fi;
++fi
++
+ if test x$ac_rpo != xno ; then
+ CXXRPOFLAGS='-frepo -fno-rtti'
+ RPO_YES=''
+@@ -39979,8 +40534,8 @@
+ # ----------------------------------------
+
+
+-echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
+-echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
++echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_sqrt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39993,17 +40548,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char sqrt ();
+ int
+ main ()
+ {
+-sqrt ();
++return sqrt ();
+ ;
+ return 0;
+ }
+@@ -40035,14 +40590,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_m_sqrt=no
++ ac_cv_lib_m_sqrt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
+-echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
++echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6; }
+ if test $ac_cv_lib_m_sqrt = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBM 1
+@@ -40053,8 +40609,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
+-echo $ECHO_N "checking for libiconv in -liconv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
++echo $ECHO_N "checking for libiconv in -liconv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_iconv_libiconv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40067,17 +40623,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char libiconv ();
+ int
+ main ()
+ {
+-libiconv ();
++return libiconv ();
+ ;
+ return 0;
+ }
+@@ -40109,14 +40665,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_iconv_libiconv=no
++ ac_cv_lib_iconv_libiconv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv" >&5
+-echo "${ECHO_T}$ac_cv_lib_iconv_libiconv" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv" >&5
++echo "${ECHO_T}$ac_cv_lib_iconv_libiconv" >&6; }
+ if test $ac_cv_lib_iconv_libiconv = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBICONV 1
+@@ -40131,8 +40688,8 @@
+ # Header Files
+ # ----------------------------------------
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40182,8 +40739,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_stdc=no
++ ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test $ac_cv_header_stdc = yes; then
+@@ -40240,6 +40798,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -40259,8 +40818,8 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -40283,12 +40842,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -40305,9 +40866,9 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -40355,12 +40916,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Header=no"
++ eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+@@ -40372,13 +40935,12 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+- echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -40386,77 +40948,29 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-+ { 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
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in dir; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' dir; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
-@@ -37684,8 +37195,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
+@@ -40478,34 +40992,43 @@
ac_status=$?
-@@ -37890,8 +37400,7 @@
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+ (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
++ ac_cv_search_opendir=$ac_res
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
++else
++ ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
+ else
+- echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -40513,77 +41036,29 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-+ { 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
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' x; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
-@@ -38111,8 +37620,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
+@@ -40605,30 +41080,40 @@
ac_status=$?
-@@ -38558,8 +38066,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=$?
-@@ -38732,8 +38239,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=$?
-@@ -39041,8 +38547,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=$?
-@@ -39463,8 +38968,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=$?
-@@ -39542,8 +39046,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=$?
-@@ -39621,8 +39124,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=$?
-@@ -39702,8 +39204,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=$?
-@@ -39781,8 +39282,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=$?
-@@ -39864,8 +39364,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=$?
-@@ -39968,8 +39467,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=$?
-@@ -40042,8 +39540,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=$?
-@@ -40115,8 +39612,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=$?
-@@ -40288,8 +39784,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=$?
-@@ -40361,8 +39856,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=$?
-@@ -40416,8 +39910,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=$?
-@@ -40488,8 +39981,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=$?
-@@ -40543,8 +40035,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=$?
-@@ -40611,8 +40102,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=$?
-@@ -40682,8 +40172,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=$?
-@@ -40751,8 +40240,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=$?
-@@ -40903,8 +40391,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=$?
-@@ -41056,8 +40543,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=$?
-@@ -41121,8 +40607,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=$?
-@@ -41187,8 +40672,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=$?
-@@ -41260,8 +40744,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=$?
-@@ -41445,8 +40928,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=$?
-@@ -41685,8 +41167,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=$?
-@@ -41754,8 +41235,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=$?
-@@ -41940,8 +41420,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=$?
-@@ -41983,18 +41462,24 @@
+ (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
++ ac_cv_search_opendir=$ac_res
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
++else
++ ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40678,12 +41163,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_time=no
++ ac_cv_header_time=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -40692,8 +41178,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_wait_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40706,7 +41192,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #ifndef WEXITSTATUS
+-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+ #endif
+ #ifndef WIFEXITED
+ # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+@@ -40749,12 +41235,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_sys_wait_h=no
++ ac_cv_header_sys_wait_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
+ if test $ac_cv_header_sys_wait_h = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -40770,18 +41257,19 @@
+ for ac_header in wchar.h wctype.h sys/mman.h iconv.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -40818,15 +41306,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -40860,9 +41349,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -40886,25 +41376,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -40922,18 +41406,19 @@
+ for ac_header in stdint.h sys/ipc.h sys/shm.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -40970,15 +41455,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -41012,9 +41498,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -41038,25 +41525,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -41073,8 +41554,8 @@
+ # Types
+ # ----------------------------------------
+
+-echo "$as_me:$LINENO: checking for wchar_t" >&5
+-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for wchar_t" >&5
++echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41085,12 +41566,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef wchar_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((wchar_t *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (wchar_t))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -41123,12 +41605,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_wchar_t=no
++ ac_cv_type_wchar_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
+-echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
++echo "${ECHO_T}$ac_cv_type_wchar_t" >&6; }
+ if test $ac_cv_type_wchar_t = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -41138,8 +41621,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for long long int" >&5
+-echo $ECHO_N "checking for long long int... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for long long int" >&5
++echo $ECHO_N "checking for long long int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long_long_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41150,12 +41633,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef long long int ac__type_new_;
+ int
+ main ()
+ {
+-if ((long long int *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (long long int))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -41188,12 +41672,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_long_long_int=no
++ ac_cv_type_long_long_int=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
+-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; }
+ if test $ac_cv_type_long_long_int = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -41203,8 +41688,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for mbstate_t" >&5
+-echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mbstate_t" >&5
++echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_mbstate_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41216,12 +41701,13 @@
+ /* end confdefs.h. */
+ #include "wchar.h"
+
++typedef mbstate_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((mbstate_t *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (mbstate_t))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -41254,12 +41740,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_mbstate_t=no
++ ac_cv_type_mbstate_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
+-echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
++echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; }
+ if test $ac_cv_type_mbstate_t = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -41279,18 +41766,19 @@
+ for ac_header in stdlib.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -41327,15 +41815,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -41369,9 +41858,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -41395,25 +41885,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -41429,9 +41913,9 @@
+ for ac_func in getpagesize
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -41457,30 +41941,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -41512,13 +41990,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -41527,8 +42007,8 @@
+ fi
+ done
+
+-echo "$as_me:$LINENO: checking for working mmap" >&5
+-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for working mmap" >&5
++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
+ if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41623,15 +42103,15 @@
+ /* First, make a file with some known garbage in it. */
+ data = (char *) malloc (pagesize);
+ if (!data)
+- exit (1);
++ return 1;
+ for (i = 0; i < pagesize; ++i)
+ *(data + i) = rand ();
+ umask (0);
+ fd = creat ("conftest.mmap", 0600);
+ if (fd < 0)
+- exit (1);
++ return 1;
+ if (write (fd, data, pagesize) != pagesize)
+- exit (1);
++ return 1;
+ close (fd);
+
+ /* Next, try to mmap the file at a fixed address which already has
+@@ -41639,17 +42119,17 @@
+ we see the same garbage. */
+ fd = open ("conftest.mmap", O_RDWR);
+ if (fd < 0)
+- exit (1);
++ return 1;
+ data2 = (char *) malloc (2 * pagesize);
+ if (!data2)
+- exit (1);
+- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
++ return 1;
++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
+- exit (1);
++ return 1;
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data2 + i))
+- exit (1);
++ return 1;
+
+ /* Finally, make sure that changes to the mapped area do not
+ percolate back to the file as seen by read(). (This is a bug on
+@@ -41658,14 +42138,14 @@
+ *(data2 + i) = *(data2 + i) + 1;
+ data3 = (char *) malloc (pagesize);
+ if (!data3)
+- exit (1);
++ return 1;
+ if (read (fd, data3, pagesize) != pagesize)
+- exit (1);
++ return 1;
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data3 + i))
+- exit (1);
++ return 1;
+ close (fd);
+- exit (0);
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -41688,11 +42168,13 @@
+ ( exit $ac_status )
+ ac_cv_func_mmap_fixed_mapped=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
+ if test $ac_cv_func_mmap_fixed_mapped = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -41702,8 +42184,8 @@
+ fi
+ rm -f conftest.mmap
+
+-echo "$as_me:$LINENO: checking for pid_t" >&5
+-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for pid_t" >&5
++echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_pid_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41714,12 +42196,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef pid_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((pid_t *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (pid_t))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -41752,12 +42235,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_pid_t=no
++ ac_cv_type_pid_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
++echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
+ if test $ac_cv_type_pid_t = yes; then
+ :
+ else
+@@ -41769,22 +42253,22 @@
+ fi
+
+
+-
+-for ac_header in unistd.h vfork.h
++for ac_header in vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -41821,15 +42305,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -41863,9 +42348,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -41889,25 +42375,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -41924,9 +42404,9 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -41952,30 +42432,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -42007,13 +42481,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -42023,8 +42499,8 @@
+ done
+
+ if test "x$ac_cv_func_fork" = xyes; then
+- echo "$as_me:$LINENO: checking for working fork" >&5
+-echo $ECHO_N "checking for working fork... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for working fork" >&5
++echo $ECHO_N "checking for working fork... $ECHO_C" >&6; }
+ if test "${ac_cv_func_fork_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42032,18 +42508,22 @@
ac_cv_func_fork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
@@ -16766,9 +33094,7 @@
+{
+
+ /* By Ruediger Kuhlmann. */
-+ if (fork() < 0)
-+ exit (1);
-+ exit (0);
++ return fork () < 0;
+
+ ;
+ return 0;
@@ -16776,87 +33102,1270 @@
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -42274,8 +41759,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=$?
-@@ -42378,8 +41862,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=$?
-@@ -42483,8 +41966,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=$?
-@@ -42584,8 +42066,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=$?
-@@ -42680,8 +42161,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=$?
-@@ -42841,8 +42321,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=$?
-@@ -42965,8 +42444,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=$?
-@@ -43094,8 +42572,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=$?
-@@ -43964,6 +43441,13 @@
+@@ -42065,11 +42545,13 @@
+ ( exit $ac_status )
+ ac_cv_func_fork_works=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
+-echo "${ECHO_T}$ac_cv_func_fork_works" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
++echo "${ECHO_T}$ac_cv_func_fork_works" >&6; }
+
+ else
+ ac_cv_func_fork_works=$ac_cv_func_fork
+@@ -42089,8 +42571,8 @@
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+- echo "$as_me:$LINENO: checking for working vfork" >&5
+-echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for working vfork" >&5
++echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; }
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42104,14 +42586,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Thanks to Paul Eggert for this test. */
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++$ac_includes_default
+ #include <sys/wait.h>
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
+ #if HAVE_VFORK_H
+ # include <vfork.h>
+ #endif
+@@ -42183,7 +42659,7 @@
+
+ while (wait(&status) != child)
+ ;
+- exit(
++ return (
+ /* Was there some problem with vforking? */
+ child < 0
+
+@@ -42219,11 +42695,13 @@
+ ( exit $ac_status )
+ ac_cv_func_vfork_works=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
+-echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
++echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; }
+
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+@@ -42258,9 +42736,9 @@
+ for ac_func in wcrtomb iswspace
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -42286,30 +42764,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -42341,13 +42813,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -42362,9 +42836,9 @@
+ for ac_func in putc_unlocked strerror vsnprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -42390,30 +42864,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -42445,13 +42913,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -42467,9 +42937,9 @@
+ for ac_func in gethostname iconv strftime getpwuid
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -42495,30 +42965,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -42550,13 +43014,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -42576,13 +43042,13 @@
+
+ ac_tiff=no
+
+-# Check whether --with-tiff or --without-tiff was given.
++# Check whether --with-tiff was given.
+ if test "${with_tiff+set}" = set; then
+- withval="$with_tiff"
+- ac_tiff=$withval
++ withval=$with_tiff; ac_tiff=$withval
+ else
+ ac_tiff=yes
+-fi;
++fi
++
+ # Process specification
+ if test x$ac_tiff = xyes ; then
+ test x${TIFF_LIBS+set} != xset && TIFF_LIBS="-ltiff"
+@@ -42592,8 +43058,8 @@
+ fi
+ # Try linking
+ if test x$ac_tiff != xno ; then
+- echo "$as_me:$LINENO: checking for the libtiff library" >&5
+-echo $ECHO_N "checking for the libtiff library... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for the libtiff library" >&5
++echo $ECHO_N "checking for the libtiff library... $ECHO_C" >&6; }
+ save_CFLAGS="$CFLAGS"
+ save_CXXFLAGS="$CXXFLAGS"
+ save_LIBS="$LIBS"
+@@ -42651,15 +43117,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_tiff=no
++ ac_tiff=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$save_LIBS"
+- echo "$as_me:$LINENO: result: $ac_tiff" >&5
+-echo "${ECHO_T}$ac_tiff" >&6
++ { echo "$as_me:$LINENO: result: $ac_tiff" >&5
++echo "${ECHO_T}$ac_tiff" >&6; }
+ fi
+ # Finish
+ if test x$ac_tiff = xno; then
+@@ -42673,23 +43140,23 @@
+ #define HAVE_TIFF 1
+ _ACEOF
+
+- echo "$as_me:$LINENO: result: setting TIFF_CFLAGS=$TIFF_CFLAGS" >&5
+-echo "${ECHO_T}setting TIFF_CFLAGS=$TIFF_CFLAGS" >&6
+- echo "$as_me:$LINENO: result: setting TIFF_LIBS=$TIFF_LIBS" >&5
+-echo "${ECHO_T}setting TIFF_LIBS=$TIFF_LIBS" >&6
++ { echo "$as_me:$LINENO: result: setting TIFF_CFLAGS=$TIFF_CFLAGS" >&5
++echo "${ECHO_T}setting TIFF_CFLAGS=$TIFF_CFLAGS" >&6; }
++ { echo "$as_me:$LINENO: result: setting TIFF_LIBS=$TIFF_LIBS" >&5
++echo "${ECHO_T}setting TIFF_LIBS=$TIFF_LIBS" >&6; }
+ :
+ fi
+
+
+ # Search MULTITHREADING library
+
+-# Check whether --enable-threads or --disable-threads was given.
++# Check whether --enable-threads was given.
+ if test "${enable_threads+set}" = set; then
+- enableval="$enable_threads"
+- ac_use_threads=$enableval
++ enableval=$enable_threads; ac_use_threads=$enableval
+ else
+ ac_use_threads=auto
+-fi;
++fi
++
+ ac_threads=no
+ if test x$ac_use_threads != xno ; then
+ case x$ac_use_threads in
+@@ -42700,17 +43167,17 @@
+ # First, check if the POSIX threads header, pthread.h, is available.
+ # If it isn't, don't bother looking for the threads libraries.
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for pthread.h" >&5
+-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread.h" >&5
++echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
++echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking pthread.h usability" >&5
+-echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking pthread.h usability" >&5
++echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -42747,15 +43214,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking pthread.h presence" >&5
+-echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking pthread.h presence" >&5
++echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -42789,9 +43257,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -42815,25 +43284,18 @@
+ echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for pthread.h" >&5
+-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for pthread.h" >&5
++echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_pthread_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
++echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+
+ fi
+ if test $ac_cv_header_pthread_h = yes; then
+@@ -42857,8 +43319,8 @@
+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+- echo "$as_me:$LINENO: checking provided PTHREAD_LIBS/PTHREAD_CFLAGS." >&5
+-echo $ECHO_N "checking provided PTHREAD_LIBS/PTHREAD_CFLAGS.... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking provided PTHREAD_LIBS/PTHREAD_CFLAGS." >&5
++echo $ECHO_N "checking provided PTHREAD_LIBS/PTHREAD_CFLAGS.... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -42866,17 +43328,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char pthread_join ();
+ int
+ main ()
+ {
+-pthread_join ();
++return pthread_join ();
+ ;
+ return 0;
+ }
+@@ -42908,11 +43370,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+-echo "${ECHO_T}$acx_pthread_ok" >&6
++ { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
++echo "${ECHO_T}$acx_pthread_ok" >&6; }
+ if test x"$acx_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+@@ -42959,17 +43423,17 @@
+ for flag in $acx_pthread_flags; do
+ case $flag in
+ none)
+- echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
+-echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
++echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }
+ ;;
+ -*)
+- echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
+-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
++echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
+ PTHREAD_CFLAGS="$flag"
+ ;;
+ *)
+- echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
+-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
++echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+@@ -43032,14 +43496,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+ CXXFLAGS="$save_CXXFLAGS"
+- echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+-echo "${ECHO_T}$acx_pthread_ok" >&6
++ { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
++echo "${ECHO_T}$acx_pthread_ok" >&6; }
+ if test "x$acx_pthread_ok" = xyes; then
+ break;
+ fi
+@@ -43055,15 +43521,15 @@
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+- echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
+-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
++echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
+ flag=no
+ case "${host_cpu}-${host_os}" in
+ *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
+ *solaris* | alpha*-osf*) flag="-D_REENTRANT";;
+ esac
+- echo "$as_me:$LINENO: result: ${flag}" >&5
+-echo "${ECHO_T}${flag}" >&6
++ { echo "$as_me:$LINENO: result: ${flag}" >&5
++echo "${ECHO_T}${flag}" >&6; }
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+@@ -43099,20 +43565,20 @@
+
+ acx_cothread=no
+ if test x$GXX = xyes ; then
+- echo "$as_me:$LINENO: checking whether cothreads work with ${host_cpu}" >&5
+-echo $ECHO_N "checking whether cothreads work with ${host_cpu}... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether cothreads work with ${host_cpu}" >&5
++echo $ECHO_N "checking whether cothreads work with ${host_cpu}... $ECHO_C" >&6; }
+ case ${host_cpu} in
+ i?86|powerpc*|mips*|alpha*|hppa*)
+ acx_cothread=yes
+ ;;
+ esac
+- echo "$as_me:$LINENO: result: $acx_cothread" >&5
+-echo "${ECHO_T}$acx_cothread" >&6
++ { echo "$as_me:$LINENO: result: $acx_cothread" >&5
++echo "${ECHO_T}$acx_cothread" >&6; }
+ fi
+ if test x$acx_cothread != xno ; then
+- echo "$as_me:$LINENO: checking whether libgcc contains the cothread patch" >&5
+-echo $ECHO_N "checking whether libgcc contains the cothread patch... $ECHO_C" >&6
+- ac_ext=cc
++ { echo "$as_me:$LINENO: checking whether libgcc contains the cothread patch" >&5
++echo $ECHO_N "checking whether libgcc contains the cothread patch... $ECHO_C" >&6; }
++ ac_ext=cpp
+ 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'
+@@ -43161,21 +43627,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-acx_cothread_patch=no
++ acx_cothread_patch=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- ac_ext=cc
++ ac_ext=cpp
+ 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: result: $acx_cothread_patch" >&5
+-echo "${ECHO_T}$acx_cothread_patch" >&6
++ { echo "$as_me:$LINENO: result: $acx_cothread_patch" >&5
++echo "${ECHO_T}$acx_cothread_patch" >&6; }
+ if test x$acx_cothread_patch = xno ; then
+- echo "$as_me:$LINENO: checking if the cothread patch is critical" >&5
+-echo $ECHO_N "checking if the cothread patch is critical... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if the cothread patch is critical" >&5
++echo $ECHO_N "checking if the cothread patch is critical... $ECHO_C" >&6; }
+ echo 'void foo() { throw "Hello"; }' > conftest.cc
+ compile="$CXX $CXXFLAGS -c conftest.cc"
+ check="nm conftest.o | grep sjthrow | cat > conftest.out"
+@@ -43193,8 +43660,8 @@
+ acx_cothread_patch=no
+ fi
+ fi
+- echo "$as_me:$LINENO: result: $acx_cothread_patch" >&5
+-echo "${ECHO_T}$acx_cothread_patch" >&6
++ { echo "$as_me:$LINENO: result: $acx_cothread_patch" >&5
++echo "${ECHO_T}$acx_cothread_patch" >&6; }
+ rm conftest.*
+ if test x$acx_cothread_patch = xyes ; then
+ acx_cothread=no
+@@ -43241,15 +43708,15 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking threading model" >&5
+-echo $ECHO_N "checking threading model... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $ac_threads" >&5
+-echo "${ECHO_T}$ac_threads" >&6
++{ echo "$as_me:$LINENO: checking threading model" >&5
++echo $ECHO_N "checking threading model... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_threads" >&5
++echo "${ECHO_T}$ac_threads" >&6; }
+ if test $ac_threads != no ; then
+- echo "$as_me:$LINENO: result: setting THREAD_CFLAGS=$THREAD_CFLAGS" >&5
+-echo "${ECHO_T}setting THREAD_CFLAGS=$THREAD_CFLAGS" >&6
+- echo "$as_me:$LINENO: result: setting THREAD_LIBS=$THREAD_LIBS" >&5
+-echo "${ECHO_T}setting THREAD_LIBS=$THREAD_LIBS" >&6
++ { echo "$as_me:$LINENO: result: setting THREAD_CFLAGS=$THREAD_CFLAGS" >&5
++echo "${ECHO_T}setting THREAD_CFLAGS=$THREAD_CFLAGS" >&6; }
++ { echo "$as_me:$LINENO: result: setting THREAD_LIBS=$THREAD_LIBS" >&5
++echo "${ECHO_T}setting THREAD_LIBS=$THREAD_LIBS" >&6; }
+ :
+ else
+ no_threads=yes
+@@ -43272,14 +43739,14 @@
+
+
+
+- echo "$as_me:$LINENO: checking for sane-config" >&5
+-echo $ECHO_N "checking for sane-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for sane-config" >&5
++echo $ECHO_N "checking for sane-config... $ECHO_C" >&6; }
+ if test -n "$SANE_CONFIG"; then
+ kde_cv_path="$SANE_CONFIG";
+ else
+ kde_cache=`echo sane-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -43326,12 +43793,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ SANE_CONFIG=$kde_cv_path
+
+ fi
+@@ -43385,8 +43852,8 @@
+ fi
+
+ for i in $ac_topsubdirs; do
+- echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
++echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
+ if test -d $srcdir/$i; then
+ install_it="yes"
+ for j in $DO_NOT_COMPILE; do
+@@ -43397,8 +43864,8 @@
+ else
+ install_it="no"
+ fi
+- echo "$as_me:$LINENO: result: $install_it" >&5
+-echo "${ECHO_T}$install_it" >&6
++ { echo "$as_me:$LINENO: result: $install_it" >&5
++echo "${ECHO_T}$install_it" >&6; }
+ vari=`echo $i | sed -e 's,[-+.@],_,g'`
+ if test $install_it = "yes"; then
+ TOPSUBDIRS="$TOPSUBDIRS $i"
+@@ -43630,297 +44097,297 @@
+ kooka_SUBDIR_included_FALSE=
+ fi
+
+- ac_config_files="$ac_config_files Makefile"
++ac_config_files="$ac_config_files Makefile"
+
+- ac_config_files="$ac_config_files doc/Makefile"
++ac_config_files="$ac_config_files doc/Makefile"
+
+- ac_config_files="$ac_config_files doc/kamera/Makefile"
++ac_config_files="$ac_config_files doc/kamera/Makefile"
+
+- ac_config_files="$ac_config_files doc/kcoloredit/Makefile"
++ac_config_files="$ac_config_files doc/kcoloredit/Makefile"
+
+- ac_config_files="$ac_config_files doc/kdvi/Makefile"
++ac_config_files="$ac_config_files doc/kdvi/Makefile"
+
+- ac_config_files="$ac_config_files doc/kgamma/Makefile"
++ac_config_files="$ac_config_files doc/kgamma/Makefile"
+
+- ac_config_files="$ac_config_files doc/kghostview/Makefile"
++ac_config_files="$ac_config_files doc/kghostview/Makefile"
+
+- ac_config_files="$ac_config_files doc/kiconedit/Makefile"
++ac_config_files="$ac_config_files doc/kiconedit/Makefile"
+
+- ac_config_files="$ac_config_files doc/kolourpaint/Makefile"
++ac_config_files="$ac_config_files doc/kolourpaint/Makefile"
+
+- ac_config_files="$ac_config_files doc/kooka/Makefile"
++ac_config_files="$ac_config_files doc/kooka/Makefile"
+
+- ac_config_files="$ac_config_files doc/kpdf/Makefile"
++ac_config_files="$ac_config_files doc/kpdf/Makefile"
+
+- ac_config_files="$ac_config_files doc/kpovmodeler/Makefile"
++ac_config_files="$ac_config_files doc/kpovmodeler/Makefile"
+
+- ac_config_files="$ac_config_files doc/kruler/Makefile"
++ac_config_files="$ac_config_files doc/kruler/Makefile"
+
+- ac_config_files="$ac_config_files doc/ksnapshot/Makefile"
++ac_config_files="$ac_config_files doc/ksnapshot/Makefile"
+
+- ac_config_files="$ac_config_files doc/kuickshow/Makefile"
++ac_config_files="$ac_config_files doc/kuickshow/Makefile"
+
+- ac_config_files="$ac_config_files doc/kview/Makefile"
++ac_config_files="$ac_config_files doc/kview/Makefile"
+
+- ac_config_files="$ac_config_files kamera/Makefile"
++ac_config_files="$ac_config_files kamera/Makefile"
+
+- ac_config_files="$ac_config_files kamera/kcontrol/Makefile"
++ac_config_files="$ac_config_files kamera/kcontrol/Makefile"
+
+- ac_config_files="$ac_config_files kamera/kioslave/Makefile"
++ac_config_files="$ac_config_files kamera/kioslave/Makefile"
+
+- ac_config_files="$ac_config_files kamera/pics/Makefile"
++ac_config_files="$ac_config_files kamera/pics/Makefile"
+
+- ac_config_files="$ac_config_files kcoloredit/Makefile"
++ac_config_files="$ac_config_files kcoloredit/Makefile"
+
+- ac_config_files="$ac_config_files kdvi/Makefile"
++ac_config_files="$ac_config_files kdvi/Makefile"
+
+- ac_config_files="$ac_config_files kdvi/pix/Makefile"
++ac_config_files="$ac_config_files kdvi/pix/Makefile"
+
+- ac_config_files="$ac_config_files kfax/Makefile"
++ac_config_files="$ac_config_files kfax/Makefile"
+
+- ac_config_files="$ac_config_files kfaxview/Makefile"
++ac_config_files="$ac_config_files kfaxview/Makefile"
+
+- ac_config_files="$ac_config_files kfaxview/libkfaximage/Makefile"
++ac_config_files="$ac_config_files kfaxview/libkfaximage/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/bmp/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/bmp/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/dds/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/dds/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/dvi/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/dvi/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/exr/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/exr/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/gif/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/gif/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/ico/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/ico/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/jpeg/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/jpeg/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/pcx/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/pcx/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/pdf/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/pdf/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/png/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/png/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/pnm/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/pnm/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/ps/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/ps/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/raw/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/raw/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/rgb/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/rgb/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/tga/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/tga/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/tiff/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/tiff/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/xbm/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/xbm/Makefile"
+
+- ac_config_files="$ac_config_files kfile-plugins/xpm/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/xpm/Makefile"
+
+- ac_config_files="$ac_config_files kgamma/Makefile"
++ac_config_files="$ac_config_files kgamma/Makefile"
+
+- ac_config_files="$ac_config_files kgamma/kcmkgamma/Makefile"
++ac_config_files="$ac_config_files kgamma/kcmkgamma/Makefile"
+
+- ac_config_files="$ac_config_files kgamma/kcmkgamma/pics/Makefile"
++ac_config_files="$ac_config_files kgamma/kcmkgamma/pics/Makefile"
+
+- ac_config_files="$ac_config_files kgamma/xf86gammacfg/Makefile"
++ac_config_files="$ac_config_files kgamma/xf86gammacfg/Makefile"
+
+- ac_config_files="$ac_config_files kghostview/Makefile"
++ac_config_files="$ac_config_files kghostview/Makefile"
+
+- ac_config_files="$ac_config_files kghostview/data/Makefile"
++ac_config_files="$ac_config_files kghostview/data/Makefile"
+
+- ac_config_files="$ac_config_files kiconedit/Makefile"
++ac_config_files="$ac_config_files kiconedit/Makefile"
+
+- ac_config_files="$ac_config_files kiconedit/pics/Makefile"
++ac_config_files="$ac_config_files kiconedit/pics/Makefile"
+
+- ac_config_files="$ac_config_files kiconedit/pics/icons/Makefile"
++ac_config_files="$ac_config_files kiconedit/pics/icons/Makefile"
+
+- ac_config_files="$ac_config_files kiconedit/pics/toolbar/Makefile"
++ac_config_files="$ac_config_files kiconedit/pics/toolbar/Makefile"
+
+- ac_config_files="$ac_config_files kmrml/Makefile"
++ac_config_files="$ac_config_files kmrml/Makefile"
+
+- ac_config_files="$ac_config_files kmrml/kmrml/Makefile"
++ac_config_files="$ac_config_files kmrml/kmrml/Makefile"
+
+- ac_config_files="$ac_config_files kmrml/kmrml/kcontrol/Makefile"
++ac_config_files="$ac_config_files kmrml/kmrml/kcontrol/Makefile"
+
+- ac_config_files="$ac_config_files kmrml/kmrml/lib/Makefile"
++ac_config_files="$ac_config_files kmrml/kmrml/lib/Makefile"
+
+- ac_config_files="$ac_config_files kmrml/kmrml/server/Makefile"
++ac_config_files="$ac_config_files kmrml/kmrml/server/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/Makefile"
++ac_config_files="$ac_config_files kolourpaint/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/cursors/Makefile"
++ac_config_files="$ac_config_files kolourpaint/cursors/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/pics/Makefile"
++ac_config_files="$ac_config_files kolourpaint/pics/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/pics/custom/Makefile"
++ac_config_files="$ac_config_files kolourpaint/pics/custom/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/pixmapfx/Makefile"
++ac_config_files="$ac_config_files kolourpaint/pixmapfx/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/tools/Makefile"
++ac_config_files="$ac_config_files kolourpaint/tools/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/views/Makefile"
++ac_config_files="$ac_config_files kolourpaint/views/Makefile"
+
+- ac_config_files="$ac_config_files kolourpaint/widgets/Makefile"
++ac_config_files="$ac_config_files kolourpaint/widgets/Makefile"
+
+- ac_config_files="$ac_config_files kooka/Makefile"
++ac_config_files="$ac_config_files kooka/Makefile"
+
+- ac_config_files="$ac_config_files kooka/pics/Makefile"
++ac_config_files="$ac_config_files kooka/pics/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/Makefile"
++ac_config_files="$ac_config_files kpdf/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/conf/Makefile"
++ac_config_files="$ac_config_files kpdf/conf/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/core/Makefile"
++ac_config_files="$ac_config_files kpdf/core/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/core/generator_kimgio/Makefile"
++ac_config_files="$ac_config_files kpdf/core/generator_kimgio/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/core/generator_pdf/Makefile"
++ac_config_files="$ac_config_files kpdf/core/generator_pdf/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/shell/Makefile"
++ac_config_files="$ac_config_files kpdf/shell/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/ui/Makefile"
++ac_config_files="$ac_config_files kpdf/ui/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/xpdf/Makefile"
++ac_config_files="$ac_config_files kpdf/xpdf/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/xpdf/fofi/Makefile"
++ac_config_files="$ac_config_files kpdf/xpdf/fofi/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/xpdf/goo/Makefile"
++ac_config_files="$ac_config_files kpdf/xpdf/goo/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/xpdf/splash/Makefile"
++ac_config_files="$ac_config_files kpdf/xpdf/splash/Makefile"
+
+- ac_config_files="$ac_config_files kpdf/xpdf/xpdf/Makefile"
++ac_config_files="$ac_config_files kpdf/xpdf/xpdf/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/includes/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/includes/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/includes/inlined/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/includes/inlined/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/includes/original/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/includes/original/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/scenes/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/scenes/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/scenes/advanced/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/scenes/advanced/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/scenes/csg/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/scenes/csg/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/scenes/interior/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/scenes/interior/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/scenes/lights/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/scenes/lights/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/examples/scenes/objects/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/examples/scenes/objects/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/pics/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/pics/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/pics/crystalsvg/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/pics/crystalsvg/Makefile"
+
+- ac_config_files="$ac_config_files kpovmodeler/pics/locolor/Makefile"
++ac_config_files="$ac_config_files kpovmodeler/pics/locolor/Makefile"
+
+- ac_config_files="$ac_config_files kruler/Makefile"
++ac_config_files="$ac_config_files kruler/Makefile"
+
+- ac_config_files="$ac_config_files kruler/pics/Makefile"
++ac_config_files="$ac_config_files kruler/pics/Makefile"
+
+- ac_config_files="$ac_config_files ksnapshot/Makefile"
++ac_config_files="$ac_config_files ksnapshot/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/Makefile"
++ac_config_files="$ac_config_files ksvg/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/core/Makefile"
++ac_config_files="$ac_config_files ksvg/core/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/dom/Makefile"
++ac_config_files="$ac_config_files ksvg/dom/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/ecma/Makefile"
++ac_config_files="$ac_config_files ksvg/ecma/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/impl/Makefile"
++ac_config_files="$ac_config_files ksvg/impl/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/impl/libs/Makefile"
++ac_config_files="$ac_config_files ksvg/impl/libs/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/impl/libs/art_support/Makefile"
++ac_config_files="$ac_config_files ksvg/impl/libs/art_support/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/impl/libs/libtext2path/Makefile"
++ac_config_files="$ac_config_files ksvg/impl/libs/libtext2path/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/impl/libs/libtext2path/src/Makefile"
++ac_config_files="$ac_config_files ksvg/impl/libs/libtext2path/src/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/impl/libs/xrgbrender/Makefile"
++ac_config_files="$ac_config_files ksvg/impl/libs/xrgbrender/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/plugin/Makefile"
++ac_config_files="$ac_config_files ksvg/plugin/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/plugin/backends/Makefile"
++ac_config_files="$ac_config_files ksvg/plugin/backends/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/plugin/backends/agg/Makefile"
++ac_config_files="$ac_config_files ksvg/plugin/backends/agg/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/plugin/backends/libart/Makefile"
++ac_config_files="$ac_config_files ksvg/plugin/backends/libart/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/test/Makefile"
++ac_config_files="$ac_config_files ksvg/test/Makefile"
+
+- ac_config_files="$ac_config_files ksvg/test/external/Makefile"
++ac_config_files="$ac_config_files ksvg/test/external/Makefile"
+
+- ac_config_files="$ac_config_files kuickshow/Makefile"
++ac_config_files="$ac_config_files kuickshow/Makefile"
+
+- ac_config_files="$ac_config_files kuickshow/misc/Makefile"
++ac_config_files="$ac_config_files kuickshow/misc/Makefile"
+
+- ac_config_files="$ac_config_files kuickshow/pics/Makefile"
++ac_config_files="$ac_config_files kuickshow/pics/Makefile"
+
+- ac_config_files="$ac_config_files kuickshow/src/Makefile"
++ac_config_files="$ac_config_files kuickshow/src/Makefile"
+
+- ac_config_files="$ac_config_files kview/Makefile"
++ac_config_files="$ac_config_files kview/Makefile"
+
+- ac_config_files="$ac_config_files kview/config/Makefile"
++ac_config_files="$ac_config_files kview/config/Makefile"
+
+- ac_config_files="$ac_config_files kview/config/plugins/Makefile"
++ac_config_files="$ac_config_files kview/config/plugins/Makefile"
+
+- ac_config_files="$ac_config_files kview/kimageviewer/Makefile"
++ac_config_files="$ac_config_files kview/kimageviewer/Makefile"
+
+- ac_config_files="$ac_config_files kview/kviewcanvas/Makefile"
++ac_config_files="$ac_config_files kview/kviewcanvas/Makefile"
+
+- ac_config_files="$ac_config_files kview/kviewcanvas/config/Makefile"
++ac_config_files="$ac_config_files kview/kviewcanvas/config/Makefile"
+
+- ac_config_files="$ac_config_files kview/kviewcanvas/test/Makefile"
++ac_config_files="$ac_config_files kview/kviewcanvas/test/Makefile"
+
+- ac_config_files="$ac_config_files kview/kviewviewer/Makefile"
++ac_config_files="$ac_config_files kview/kviewviewer/Makefile"
+
+- ac_config_files="$ac_config_files kview/kviewviewer/config/Makefile"
++ac_config_files="$ac_config_files kview/kviewviewer/config/Makefile"
+
+- ac_config_files="$ac_config_files kview/kviewviewer/test/Makefile"
++ac_config_files="$ac_config_files kview/kviewviewer/test/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/Makefile"
++ac_config_files="$ac_config_files kview/modules/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/browser/Makefile"
++ac_config_files="$ac_config_files kview/modules/browser/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/effects/Makefile"
++ac_config_files="$ac_config_files kview/modules/effects/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/presenter/Makefile"
++ac_config_files="$ac_config_files kview/modules/presenter/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/presenter/config/Makefile"
++ac_config_files="$ac_config_files kview/modules/presenter/config/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/scale/Makefile"
++ac_config_files="$ac_config_files kview/modules/scale/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/scanner/Makefile"
++ac_config_files="$ac_config_files kview/modules/scanner/Makefile"
+
+- ac_config_files="$ac_config_files kview/modules/template/Makefile"
++ac_config_files="$ac_config_files kview/modules/template/Makefile"
+
+- ac_config_files="$ac_config_files kview/photobook/Makefile"
++ac_config_files="$ac_config_files kview/photobook/Makefile"
+
+- ac_config_files="$ac_config_files kviewshell/Makefile"
++ac_config_files="$ac_config_files kviewshell/Makefile"
+
+- ac_config_files="$ac_config_files kviewshell/pics/Makefile"
++ac_config_files="$ac_config_files kviewshell/pics/Makefile"
+
+- ac_config_files="$ac_config_files kviewshell/pics/icons/Makefile"
++ac_config_files="$ac_config_files kviewshell/pics/icons/Makefile"
+
+- ac_config_files="$ac_config_files kviewshell/plugins/Makefile"
++ac_config_files="$ac_config_files kviewshell/plugins/Makefile"
+
+- ac_config_files="$ac_config_files kviewshell/plugins/djvu/Makefile"
++ac_config_files="$ac_config_files kviewshell/plugins/djvu/Makefile"
+
+- ac_config_files="$ac_config_files kviewshell/plugins/djvu/libdjvu/Makefile"
++ac_config_files="$ac_config_files kviewshell/plugins/djvu/libdjvu/Makefile"
+
+- ac_config_files="$ac_config_files libkscan/Makefile"
++ac_config_files="$ac_config_files libkscan/Makefile"
+
+- ac_config_files="$ac_config_files libkscan/pics/Makefile"
++ac_config_files="$ac_config_files libkscan/pics/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -43940,39 +44407,58 @@
+
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ *) $as_unset $ac_var ;;
++ esac ;;
++ esac
++ done
++
+ (set) 2>&1 |
+- case `(ac_space=' '; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
++ case $as_nl`(ac_space=' '; set) 2>&1` in #(
++ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+- ;;
++ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+- esac;
+-} |
++ esac |
++ sort
++) |
+ sed '
++ /^ac_cv_env_/b end
+ t clear
+- : clear
++ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+- : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+- if test -w $cache_file; then
+- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++ :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++ if test -w "$cache_file"; then
++ test "x$cache_file" != "x/dev/null" &&
++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
+ else
+- echo "not updating unwritable cache $cache_file"
++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+ fi
+ rm -f confcache
+@@ -43981,38 +44467,31 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[ ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[ ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+- ac_i=`echo "$ac_i" |
+- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+- # 2. Add them.
+- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++ ac_i=`echo "$ac_i" | sed "$ac_script"`
++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
++ # will be set to the directory where LIBOBJS objects are built.
++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+
LTLIBOBJS=$ac_ltlibobjs
@@ -16870,83 +34379,2912 @@
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
-@@ -44899,6 +44383,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;t t
- 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
-@@ -45077,7 +44564,8 @@
- s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
- s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
- s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
--s, at gphoto_devel@,$gphoto_devel,;t t
-+s, at gphoto2_config@,$gphoto2_config,;t t
-+s, at gphoto2_port_config@,$gphoto2_port_config,;t t
- s, at GPHOTO2_INCS@,$GPHOTO2_INCS,;t t
- s, at GPHOTO2_LIBS@,$GPHOTO2_LIBS,;t t
- s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-@@ -45353,11 +44841,6 @@
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+@@ -44268,11 +44747,35 @@
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+@@ -44281,8 +44784,43 @@
+ fi
+
+
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" "" $as_nl"
++
++# Find who we are. Look in the path if we contain no directory separator.
++case $0 in
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44296,18 +44834,19 @@
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+- $as_unset $as_var
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+ done
+
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+ else
+ as_basename=false
+@@ -44315,159 +44854,120 @@
+
+
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
+-fi
++# CDPATH.
++$as_unset CDPATH
+
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+- case $0 in
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+
+- ;;
+- esac
+- # We did not find ourselves, most probably we were run as `sh COMMAND'
+- # in which case we are not to be found in the path.
+- if test "x$as_myself" = x; then
+- as_myself=$0
+- fi
+- if test ! -f "$as_myself"; then
+- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- case $CONFIG_SHELL in
+- '')
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
+- done
+-done
+-;;
+- esac
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line before each line; the second 'sed' does the real
+- # work. The second script uses 'N' to pair each line-number line
+- # with the numbered line, and appends trailing '-' during
+- # substitution so that $LINENO is not a special case at line end.
++ # line-number line after each line using $LINENO; the second 'sed'
++ # does the real work. The second script uses 'N' to pair each
++ # line-number line with the line containing $LINENO, and appends
++ # trailing '-' during substitution so that $LINENO is not a special
++ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+- sed '=' <$as_myself |
++ # scripts with optimization help from Paolo Bonzini. Blame Lee
++ # E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
+ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
+ N
+- s,$,-,
+- : loop
+- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+- s,-$,,
+- s,^['$as_cr_digits']*\n,,
++ s/-\n.*//
+ ' >$as_me.lineno &&
+- chmod +x $as_me.lineno ||
+- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++ chmod +x "$as_me.lineno" ||
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensible to this).
+- . ./$as_me.lineno
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+ }
+
+
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T=' ' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (dirname -- /) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++ case `echo 'x\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ *) ECHO_C='\c';;
++ esac;;
++*)
++ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
++else
++ rm -f conf$$.dir
++ mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+- # We could just check for DJGPP; but this test a) works b) is more generic
+- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+- if test -f conf$$.exe; then
+- # Don't use ln at all; we don't have any links
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- else
+- as_ln_s='ln -s'
+- fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+@@ -44476,7 +44976,19 @@
+ as_mkdir_p=false
+ fi
+
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works. Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ as_executable_p="test -x"
++else
++ as_executable_p=:
++fi
++rm -f conf$$.file
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -44485,31 +44997,14 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" $as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
+
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# Save the log message, to keep $[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling. Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+- echo
+- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
++# values after options handling.
++ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59. Invocation command line was
++generated by GNU Autoconf 2.59d. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -44517,30 +45012,20 @@
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
+
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_headers"; then
+- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_links"; then
+- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+
+-if test -n "$ac_config_commands"; then
+- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++_ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -44567,19 +45052,21 @@
+ $config_commands
+
+ Report bugs to <bug-autoconf at gnu.org>."
+-_ACEOF
+
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
++configured by $0, generated by GNU Autoconf 2.59d,
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
++
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
+ _ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -44590,39 +45077,24 @@
+ do
+ case $1 in
+ --*=*)
+- ac_option=`expr "x$1" : 'x\([^=]*\)='`
+- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
+- -*)
++ *)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
+ ;;
+- *) # This is not an option, so the user has probably given explicit
+- # arguments.
+- ac_option=$1
+- ac_need_defaults=false;;
esac
+ case $ac_option in
+ # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+- --version | --vers* | -V )
+- echo "$ac_cs_version"; exit 0 ;;
+- --he | --h)
+- # Conflict between --help and --header
+- { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+- { (exit 1); exit 1; }; };;
+- --help | --hel | -h )
+- echo "$ac_cs_usage"; exit 0 ;;
+- --debug | --d* | -d )
++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++ echo "$ac_cs_version"; exit ;;
++ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+@@ -44632,18 +45104,24 @@
+ $ac_shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
++ --he | --h)
++ # Conflict between --help and --header
++ { echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2
++ { (exit 1); exit 1; }; };;
++ --help | --hel | -h )
++ echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
++ -*) { echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
+
+- *) ac_config_targets="$ac_config_targets $1" ;;
++ *) ac_config_targets="$ac_config_targets $1"
++ ac_need_defaults=false ;;
+
+ esac
+ shift
+@@ -44659,182 +45137,194 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ CONFIG_SHELL=$SHELL
++ export CONFIG_SHELL
++ exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++exec 5>>config.log
++{
++ echo
++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++ echo "$ac_log"
++} >&5
+
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+-# INIT-COMMANDS section.
++# INIT-COMMANDS
+ #
+-
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+ _ACEOF
+
+-
+-
+ cat >>$CONFIG_STATUS <<\_ACEOF
++
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+- case "$ac_config_target" in
+- # Handling of arguments.
+- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+- "doc/kamera/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kamera/Makefile" ;;
+- "doc/kcoloredit/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcoloredit/Makefile" ;;
+- "doc/kdvi/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdvi/Makefile" ;;
+- "doc/kgamma/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kgamma/Makefile" ;;
+- "doc/kghostview/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kghostview/Makefile" ;;
+- "doc/kiconedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kiconedit/Makefile" ;;
+- "doc/kolourpaint/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kolourpaint/Makefile" ;;
+- "doc/kooka/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kooka/Makefile" ;;
+- "doc/kpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpdf/Makefile" ;;
+- "doc/kpovmodeler/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpovmodeler/Makefile" ;;
+- "doc/kruler/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kruler/Makefile" ;;
+- "doc/ksnapshot/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksnapshot/Makefile" ;;
+- "doc/kuickshow/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kuickshow/Makefile" ;;
+- "doc/kview/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kview/Makefile" ;;
+- "kamera/Makefile" ) CONFIG_FILES="$CONFIG_FILES kamera/Makefile" ;;
+- "kamera/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kamera/kcontrol/Makefile" ;;
+- "kamera/kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kamera/kioslave/Makefile" ;;
+- "kamera/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kamera/pics/Makefile" ;;
+- "kcoloredit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcoloredit/Makefile" ;;
+- "kdvi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdvi/Makefile" ;;
+- "kdvi/pix/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdvi/pix/Makefile" ;;
+- "kfax/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfax/Makefile" ;;
+- "kfaxview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfaxview/Makefile" ;;
+- "kfaxview/libkfaximage/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfaxview/libkfaximage/Makefile" ;;
+- "kfile-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/Makefile" ;;
+- "kfile-plugins/bmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/bmp/Makefile" ;;
+- "kfile-plugins/dds/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/dds/Makefile" ;;
+- "kfile-plugins/dvi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/dvi/Makefile" ;;
+- "kfile-plugins/exr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/exr/Makefile" ;;
+- "kfile-plugins/gif/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/gif/Makefile" ;;
+- "kfile-plugins/ico/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/ico/Makefile" ;;
+- "kfile-plugins/jpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/jpeg/Makefile" ;;
+- "kfile-plugins/pcx/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/pcx/Makefile" ;;
+- "kfile-plugins/pdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/pdf/Makefile" ;;
+- "kfile-plugins/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/png/Makefile" ;;
+- "kfile-plugins/pnm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/pnm/Makefile" ;;
+- "kfile-plugins/ps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/ps/Makefile" ;;
+- "kfile-plugins/raw/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/raw/Makefile" ;;
+- "kfile-plugins/rgb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/rgb/Makefile" ;;
+- "kfile-plugins/tga/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/tga/Makefile" ;;
+- "kfile-plugins/tiff/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/tiff/Makefile" ;;
+- "kfile-plugins/xbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/xbm/Makefile" ;;
+- "kfile-plugins/xpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/xpm/Makefile" ;;
+- "kgamma/Makefile" ) CONFIG_FILES="$CONFIG_FILES kgamma/Makefile" ;;
+- "kgamma/kcmkgamma/Makefile" ) CONFIG_FILES="$CONFIG_FILES kgamma/kcmkgamma/Makefile" ;;
+- "kgamma/kcmkgamma/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kgamma/kcmkgamma/pics/Makefile" ;;
+- "kgamma/xf86gammacfg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kgamma/xf86gammacfg/Makefile" ;;
+- "kghostview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kghostview/Makefile" ;;
+- "kghostview/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kghostview/data/Makefile" ;;
+- "kiconedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kiconedit/Makefile" ;;
+- "kiconedit/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kiconedit/pics/Makefile" ;;
+- "kiconedit/pics/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kiconedit/pics/icons/Makefile" ;;
+- "kiconedit/pics/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kiconedit/pics/toolbar/Makefile" ;;
+- "kmrml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmrml/Makefile" ;;
+- "kmrml/kmrml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/Makefile" ;;
+- "kmrml/kmrml/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/kcontrol/Makefile" ;;
+- "kmrml/kmrml/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/lib/Makefile" ;;
+- "kmrml/kmrml/server/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/server/Makefile" ;;
+- "kolourpaint/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/Makefile" ;;
+- "kolourpaint/cursors/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/cursors/Makefile" ;;
+- "kolourpaint/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/pics/Makefile" ;;
+- "kolourpaint/pics/custom/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/pics/custom/Makefile" ;;
+- "kolourpaint/pixmapfx/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/pixmapfx/Makefile" ;;
+- "kolourpaint/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/tools/Makefile" ;;
+- "kolourpaint/views/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/views/Makefile" ;;
+- "kolourpaint/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kolourpaint/widgets/Makefile" ;;
+- "kooka/Makefile" ) CONFIG_FILES="$CONFIG_FILES kooka/Makefile" ;;
+- "kooka/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kooka/pics/Makefile" ;;
+- "kpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/Makefile" ;;
+- "kpdf/conf/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/conf/Makefile" ;;
+- "kpdf/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/core/Makefile" ;;
+- "kpdf/core/generator_kimgio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/core/generator_kimgio/Makefile" ;;
+- "kpdf/core/generator_pdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/core/generator_pdf/Makefile" ;;
+- "kpdf/shell/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/shell/Makefile" ;;
+- "kpdf/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/ui/Makefile" ;;
+- "kpdf/xpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/Makefile" ;;
+- "kpdf/xpdf/fofi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/fofi/Makefile" ;;
+- "kpdf/xpdf/goo/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/goo/Makefile" ;;
+- "kpdf/xpdf/splash/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/splash/Makefile" ;;
+- "kpdf/xpdf/xpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/xpdf/Makefile" ;;
+- "kpovmodeler/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/Makefile" ;;
+- "kpovmodeler/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/Makefile" ;;
+- "kpovmodeler/examples/includes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/includes/Makefile" ;;
+- "kpovmodeler/examples/includes/inlined/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/includes/inlined/Makefile" ;;
+- "kpovmodeler/examples/includes/original/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/includes/original/Makefile" ;;
+- "kpovmodeler/examples/scenes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/Makefile" ;;
+- "kpovmodeler/examples/scenes/advanced/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/advanced/Makefile" ;;
+- "kpovmodeler/examples/scenes/csg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/csg/Makefile" ;;
+- "kpovmodeler/examples/scenes/interior/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/interior/Makefile" ;;
+- "kpovmodeler/examples/scenes/lights/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/lights/Makefile" ;;
+- "kpovmodeler/examples/scenes/objects/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/objects/Makefile" ;;
+- "kpovmodeler/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/pics/Makefile" ;;
+- "kpovmodeler/pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/pics/crystalsvg/Makefile" ;;
+- "kpovmodeler/pics/locolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpovmodeler/pics/locolor/Makefile" ;;
+- "kruler/Makefile" ) CONFIG_FILES="$CONFIG_FILES kruler/Makefile" ;;
+- "kruler/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kruler/pics/Makefile" ;;
+- "ksnapshot/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksnapshot/Makefile" ;;
+- "ksvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/Makefile" ;;
+- "ksvg/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/core/Makefile" ;;
+- "ksvg/dom/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/dom/Makefile" ;;
+- "ksvg/ecma/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/ecma/Makefile" ;;
+- "ksvg/impl/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/impl/Makefile" ;;
+- "ksvg/impl/libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/Makefile" ;;
+- "ksvg/impl/libs/art_support/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/art_support/Makefile" ;;
+- "ksvg/impl/libs/libtext2path/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/libtext2path/Makefile" ;;
+- "ksvg/impl/libs/libtext2path/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/libtext2path/src/Makefile" ;;
+- "ksvg/impl/libs/xrgbrender/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/xrgbrender/Makefile" ;;
+- "ksvg/plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/plugin/Makefile" ;;
+- "ksvg/plugin/backends/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/plugin/backends/Makefile" ;;
+- "ksvg/plugin/backends/agg/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/plugin/backends/agg/Makefile" ;;
+- "ksvg/plugin/backends/libart/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/plugin/backends/libart/Makefile" ;;
+- "ksvg/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/test/Makefile" ;;
+- "ksvg/test/external/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksvg/test/external/Makefile" ;;
+- "kuickshow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kuickshow/Makefile" ;;
+- "kuickshow/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kuickshow/misc/Makefile" ;;
+- "kuickshow/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kuickshow/pics/Makefile" ;;
+- "kuickshow/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kuickshow/src/Makefile" ;;
+- "kview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/Makefile" ;;
+- "kview/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/config/Makefile" ;;
+- "kview/config/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/config/plugins/Makefile" ;;
+- "kview/kimageviewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/kimageviewer/Makefile" ;;
+- "kview/kviewcanvas/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/kviewcanvas/Makefile" ;;
+- "kview/kviewcanvas/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/kviewcanvas/config/Makefile" ;;
+- "kview/kviewcanvas/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/kviewcanvas/test/Makefile" ;;
+- "kview/kviewviewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/kviewviewer/Makefile" ;;
+- "kview/kviewviewer/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/kviewviewer/config/Makefile" ;;
+- "kview/kviewviewer/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/kviewviewer/test/Makefile" ;;
+- "kview/modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/Makefile" ;;
+- "kview/modules/browser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/browser/Makefile" ;;
+- "kview/modules/effects/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/effects/Makefile" ;;
+- "kview/modules/presenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/presenter/Makefile" ;;
+- "kview/modules/presenter/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/presenter/config/Makefile" ;;
+- "kview/modules/scale/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/scale/Makefile" ;;
+- "kview/modules/scanner/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/scanner/Makefile" ;;
+- "kview/modules/template/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/modules/template/Makefile" ;;
+- "kview/photobook/Makefile" ) CONFIG_FILES="$CONFIG_FILES kview/photobook/Makefile" ;;
+- "kviewshell/Makefile" ) CONFIG_FILES="$CONFIG_FILES kviewshell/Makefile" ;;
+- "kviewshell/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kviewshell/pics/Makefile" ;;
+- "kviewshell/pics/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kviewshell/pics/icons/Makefile" ;;
+- "kviewshell/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kviewshell/plugins/Makefile" ;;
+- "kviewshell/plugins/djvu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kviewshell/plugins/djvu/Makefile" ;;
+- "kviewshell/plugins/djvu/libdjvu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kviewshell/plugins/djvu/libdjvu/Makefile" ;;
+- "libkscan/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkscan/Makefile" ;;
+- "libkscan/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkscan/pics/Makefile" ;;
+- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++ case $ac_config_target in
++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++ "doc/kamera/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kamera/Makefile" ;;
++ "doc/kcoloredit/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcoloredit/Makefile" ;;
++ "doc/kdvi/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdvi/Makefile" ;;
++ "doc/kgamma/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kgamma/Makefile" ;;
++ "doc/kghostview/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kghostview/Makefile" ;;
++ "doc/kiconedit/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kiconedit/Makefile" ;;
++ "doc/kolourpaint/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kolourpaint/Makefile" ;;
++ "doc/kooka/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kooka/Makefile" ;;
++ "doc/kpdf/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kpdf/Makefile" ;;
++ "doc/kpovmodeler/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kpovmodeler/Makefile" ;;
++ "doc/kruler/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kruler/Makefile" ;;
++ "doc/ksnapshot/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ksnapshot/Makefile" ;;
++ "doc/kuickshow/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kuickshow/Makefile" ;;
++ "doc/kview/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kview/Makefile" ;;
++ "kamera/Makefile") CONFIG_FILES="$CONFIG_FILES kamera/Makefile" ;;
++ "kamera/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES kamera/kcontrol/Makefile" ;;
++ "kamera/kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES kamera/kioslave/Makefile" ;;
++ "kamera/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kamera/pics/Makefile" ;;
++ "kcoloredit/Makefile") CONFIG_FILES="$CONFIG_FILES kcoloredit/Makefile" ;;
++ "kdvi/Makefile") CONFIG_FILES="$CONFIG_FILES kdvi/Makefile" ;;
++ "kdvi/pix/Makefile") CONFIG_FILES="$CONFIG_FILES kdvi/pix/Makefile" ;;
++ "kfax/Makefile") CONFIG_FILES="$CONFIG_FILES kfax/Makefile" ;;
++ "kfaxview/Makefile") CONFIG_FILES="$CONFIG_FILES kfaxview/Makefile" ;;
++ "kfaxview/libkfaximage/Makefile") CONFIG_FILES="$CONFIG_FILES kfaxview/libkfaximage/Makefile" ;;
++ "kfile-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/Makefile" ;;
++ "kfile-plugins/bmp/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/bmp/Makefile" ;;
++ "kfile-plugins/dds/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/dds/Makefile" ;;
++ "kfile-plugins/dvi/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/dvi/Makefile" ;;
++ "kfile-plugins/exr/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/exr/Makefile" ;;
++ "kfile-plugins/gif/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/gif/Makefile" ;;
++ "kfile-plugins/ico/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/ico/Makefile" ;;
++ "kfile-plugins/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/jpeg/Makefile" ;;
++ "kfile-plugins/pcx/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/pcx/Makefile" ;;
++ "kfile-plugins/pdf/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/pdf/Makefile" ;;
++ "kfile-plugins/png/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/png/Makefile" ;;
++ "kfile-plugins/pnm/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/pnm/Makefile" ;;
++ "kfile-plugins/ps/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/ps/Makefile" ;;
++ "kfile-plugins/raw/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/raw/Makefile" ;;
++ "kfile-plugins/rgb/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/rgb/Makefile" ;;
++ "kfile-plugins/tga/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/tga/Makefile" ;;
++ "kfile-plugins/tiff/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/tiff/Makefile" ;;
++ "kfile-plugins/xbm/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/xbm/Makefile" ;;
++ "kfile-plugins/xpm/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/xpm/Makefile" ;;
++ "kgamma/Makefile") CONFIG_FILES="$CONFIG_FILES kgamma/Makefile" ;;
++ "kgamma/kcmkgamma/Makefile") CONFIG_FILES="$CONFIG_FILES kgamma/kcmkgamma/Makefile" ;;
++ "kgamma/kcmkgamma/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kgamma/kcmkgamma/pics/Makefile" ;;
++ "kgamma/xf86gammacfg/Makefile") CONFIG_FILES="$CONFIG_FILES kgamma/xf86gammacfg/Makefile" ;;
++ "kghostview/Makefile") CONFIG_FILES="$CONFIG_FILES kghostview/Makefile" ;;
++ "kghostview/data/Makefile") CONFIG_FILES="$CONFIG_FILES kghostview/data/Makefile" ;;
++ "kiconedit/Makefile") CONFIG_FILES="$CONFIG_FILES kiconedit/Makefile" ;;
++ "kiconedit/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kiconedit/pics/Makefile" ;;
++ "kiconedit/pics/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kiconedit/pics/icons/Makefile" ;;
++ "kiconedit/pics/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kiconedit/pics/toolbar/Makefile" ;;
++ "kmrml/Makefile") CONFIG_FILES="$CONFIG_FILES kmrml/Makefile" ;;
++ "kmrml/kmrml/Makefile") CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/Makefile" ;;
++ "kmrml/kmrml/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/kcontrol/Makefile" ;;
++ "kmrml/kmrml/lib/Makefile") CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/lib/Makefile" ;;
++ "kmrml/kmrml/server/Makefile") CONFIG_FILES="$CONFIG_FILES kmrml/kmrml/server/Makefile" ;;
++ "kolourpaint/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/Makefile" ;;
++ "kolourpaint/cursors/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/cursors/Makefile" ;;
++ "kolourpaint/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/pics/Makefile" ;;
++ "kolourpaint/pics/custom/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/pics/custom/Makefile" ;;
++ "kolourpaint/pixmapfx/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/pixmapfx/Makefile" ;;
++ "kolourpaint/tools/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/tools/Makefile" ;;
++ "kolourpaint/views/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/views/Makefile" ;;
++ "kolourpaint/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES kolourpaint/widgets/Makefile" ;;
++ "kooka/Makefile") CONFIG_FILES="$CONFIG_FILES kooka/Makefile" ;;
++ "kooka/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kooka/pics/Makefile" ;;
++ "kpdf/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/Makefile" ;;
++ "kpdf/conf/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/conf/Makefile" ;;
++ "kpdf/core/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/core/Makefile" ;;
++ "kpdf/core/generator_kimgio/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/core/generator_kimgio/Makefile" ;;
++ "kpdf/core/generator_pdf/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/core/generator_pdf/Makefile" ;;
++ "kpdf/shell/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/shell/Makefile" ;;
++ "kpdf/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/ui/Makefile" ;;
++ "kpdf/xpdf/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/Makefile" ;;
++ "kpdf/xpdf/fofi/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/fofi/Makefile" ;;
++ "kpdf/xpdf/goo/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/goo/Makefile" ;;
++ "kpdf/xpdf/splash/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/splash/Makefile" ;;
++ "kpdf/xpdf/xpdf/Makefile") CONFIG_FILES="$CONFIG_FILES kpdf/xpdf/xpdf/Makefile" ;;
++ "kpovmodeler/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/Makefile" ;;
++ "kpovmodeler/examples/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/Makefile" ;;
++ "kpovmodeler/examples/includes/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/includes/Makefile" ;;
++ "kpovmodeler/examples/includes/inlined/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/includes/inlined/Makefile" ;;
++ "kpovmodeler/examples/includes/original/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/includes/original/Makefile" ;;
++ "kpovmodeler/examples/scenes/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/Makefile" ;;
++ "kpovmodeler/examples/scenes/advanced/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/advanced/Makefile" ;;
++ "kpovmodeler/examples/scenes/csg/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/csg/Makefile" ;;
++ "kpovmodeler/examples/scenes/interior/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/interior/Makefile" ;;
++ "kpovmodeler/examples/scenes/lights/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/lights/Makefile" ;;
++ "kpovmodeler/examples/scenes/objects/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/examples/scenes/objects/Makefile" ;;
++ "kpovmodeler/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/pics/Makefile" ;;
++ "kpovmodeler/pics/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/pics/crystalsvg/Makefile" ;;
++ "kpovmodeler/pics/locolor/Makefile") CONFIG_FILES="$CONFIG_FILES kpovmodeler/pics/locolor/Makefile" ;;
++ "kruler/Makefile") CONFIG_FILES="$CONFIG_FILES kruler/Makefile" ;;
++ "kruler/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kruler/pics/Makefile" ;;
++ "ksnapshot/Makefile") CONFIG_FILES="$CONFIG_FILES ksnapshot/Makefile" ;;
++ "ksvg/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/Makefile" ;;
++ "ksvg/core/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/core/Makefile" ;;
++ "ksvg/dom/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/dom/Makefile" ;;
++ "ksvg/ecma/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/ecma/Makefile" ;;
++ "ksvg/impl/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/impl/Makefile" ;;
++ "ksvg/impl/libs/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/Makefile" ;;
++ "ksvg/impl/libs/art_support/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/art_support/Makefile" ;;
++ "ksvg/impl/libs/libtext2path/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/libtext2path/Makefile" ;;
++ "ksvg/impl/libs/libtext2path/src/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/libtext2path/src/Makefile" ;;
++ "ksvg/impl/libs/xrgbrender/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/impl/libs/xrgbrender/Makefile" ;;
++ "ksvg/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/plugin/Makefile" ;;
++ "ksvg/plugin/backends/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/plugin/backends/Makefile" ;;
++ "ksvg/plugin/backends/agg/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/plugin/backends/agg/Makefile" ;;
++ "ksvg/plugin/backends/libart/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/plugin/backends/libart/Makefile" ;;
++ "ksvg/test/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/test/Makefile" ;;
++ "ksvg/test/external/Makefile") CONFIG_FILES="$CONFIG_FILES ksvg/test/external/Makefile" ;;
++ "kuickshow/Makefile") CONFIG_FILES="$CONFIG_FILES kuickshow/Makefile" ;;
++ "kuickshow/misc/Makefile") CONFIG_FILES="$CONFIG_FILES kuickshow/misc/Makefile" ;;
++ "kuickshow/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kuickshow/pics/Makefile" ;;
++ "kuickshow/src/Makefile") CONFIG_FILES="$CONFIG_FILES kuickshow/src/Makefile" ;;
++ "kview/Makefile") CONFIG_FILES="$CONFIG_FILES kview/Makefile" ;;
++ "kview/config/Makefile") CONFIG_FILES="$CONFIG_FILES kview/config/Makefile" ;;
++ "kview/config/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kview/config/plugins/Makefile" ;;
++ "kview/kimageviewer/Makefile") CONFIG_FILES="$CONFIG_FILES kview/kimageviewer/Makefile" ;;
++ "kview/kviewcanvas/Makefile") CONFIG_FILES="$CONFIG_FILES kview/kviewcanvas/Makefile" ;;
++ "kview/kviewcanvas/config/Makefile") CONFIG_FILES="$CONFIG_FILES kview/kviewcanvas/config/Makefile" ;;
++ "kview/kviewcanvas/test/Makefile") CONFIG_FILES="$CONFIG_FILES kview/kviewcanvas/test/Makefile" ;;
++ "kview/kviewviewer/Makefile") CONFIG_FILES="$CONFIG_FILES kview/kviewviewer/Makefile" ;;
++ "kview/kviewviewer/config/Makefile") CONFIG_FILES="$CONFIG_FILES kview/kviewviewer/config/Makefile" ;;
++ "kview/kviewviewer/test/Makefile") CONFIG_FILES="$CONFIG_FILES kview/kviewviewer/test/Makefile" ;;
++ "kview/modules/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/Makefile" ;;
++ "kview/modules/browser/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/browser/Makefile" ;;
++ "kview/modules/effects/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/effects/Makefile" ;;
++ "kview/modules/presenter/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/presenter/Makefile" ;;
++ "kview/modules/presenter/config/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/presenter/config/Makefile" ;;
++ "kview/modules/scale/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/scale/Makefile" ;;
++ "kview/modules/scanner/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/scanner/Makefile" ;;
++ "kview/modules/template/Makefile") CONFIG_FILES="$CONFIG_FILES kview/modules/template/Makefile" ;;
++ "kview/photobook/Makefile") CONFIG_FILES="$CONFIG_FILES kview/photobook/Makefile" ;;
++ "kviewshell/Makefile") CONFIG_FILES="$CONFIG_FILES kviewshell/Makefile" ;;
++ "kviewshell/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kviewshell/pics/Makefile" ;;
++ "kviewshell/pics/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kviewshell/pics/icons/Makefile" ;;
++ "kviewshell/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kviewshell/plugins/Makefile" ;;
++ "kviewshell/plugins/djvu/Makefile") CONFIG_FILES="$CONFIG_FILES kviewshell/plugins/djvu/Makefile" ;;
++ "kviewshell/plugins/djvu/libdjvu/Makefile") CONFIG_FILES="$CONFIG_FILES kviewshell/plugins/djvu/libdjvu/Makefile" ;;
++ "libkscan/Makefile") CONFIG_FILES="$CONFIG_FILES libkscan/Makefile" ;;
++ "libkscan/pics/Makefile") CONFIG_FILES="$CONFIG_FILES libkscan/pics/Makefile" ;;
++
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ done
+
++
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used. Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+@@ -44846,607 +45336,799 @@
+ fi
+
+ # Have a temporary directory for convenience. Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++ tmp=
++ trap 'exit_status=$?
++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+
+ {
+- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+ } ||
+ {
+- tmp=./confstat$$-$RANDOM
+- (umask 077 && mkdir $tmp)
++ tmp=./conf$$-$RANDOM
++ (umask 077 && mkdir "$tmp")
+ } ||
+ {
+ echo "$me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+ }
+
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-
+ #
+-# CONFIG_FILES section.
++# Set up the sed scripts for CONFIG_FILES section.
+ #
+
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+- # Protect against being on the right side of a sed subst in config.status.
+- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s, at SHELL@,$SHELL,;t t
+-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s, at exec_prefix@,$exec_prefix,;t t
+-s, at prefix@,$prefix,;t t
+-s, at program_transform_name@,$program_transform_name,;t t
+-s, at bindir@,$bindir,;t t
+-s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
+-s, at datadir@,$datadir,;t t
+-s, at sysconfdir@,$sysconfdir,;t t
+-s, at sharedstatedir@,$sharedstatedir,;t t
+-s, at localstatedir@,$localstatedir,;t t
+-s, at libdir@,$libdir,;t t
+-s, at includedir@,$includedir,;t t
+-s, at oldincludedir@,$oldincludedir,;t t
+-s, at infodir@,$infodir,;t t
+-s, at mandir@,$mandir,;t t
+-s, at build_alias@,$build_alias,;t t
+-s, at host_alias@,$host_alias,;t t
+-s, at target_alias@,$target_alias,;t t
+-s, at DEFS@,$DEFS,;t t
+-s, at ECHO_C@,$ECHO_C,;t t
+-s, at ECHO_N@,$ECHO_N,;t t
+-s, at ECHO_T@,$ECHO_T,;t t
+-s, at LIBS@,$LIBS,;t t
+-s, at build@,$build,;t t
+-s, at build_cpu@,$build_cpu,;t t
+-s, at build_vendor@,$build_vendor,;t t
+-s, at build_os@,$build_os,;t t
+-s, at host@,$host,;t t
+-s, at host_cpu@,$host_cpu,;t t
+-s, at host_vendor@,$host_vendor,;t t
+-s, at host_os@,$host_os,;t t
+-s, at target@,$target,;t t
+-s, at target_cpu@,$target_cpu,;t t
+-s, at target_vendor@,$target_vendor,;t t
+-s, at target_os@,$target_os,;t t
+-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+-s, at CYGPATH_W@,$CYGPATH_W,;t t
+-s, at PACKAGE@,$PACKAGE,;t t
+-s, at VERSION@,$VERSION,;t t
+-s, at ACLOCAL@,$ACLOCAL,;t t
+-s, at AUTOCONF@,$AUTOCONF,;t t
+-s, at AUTOMAKE@,$AUTOMAKE,;t t
+-s, at AUTOHEADER@,$AUTOHEADER,;t t
+-s, at MAKEINFO@,$MAKEINFO,;t t
+-s, at install_sh@,$install_sh,;t t
+-s, at STRIP@,$STRIP,;t t
+-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s, at mkdir_p@,$mkdir_p,;t t
+-s, at AWK@,$AWK,;t t
+-s, at SET_MAKE@,$SET_MAKE,;t t
+-s, at am__leading_dot@,$am__leading_dot,;t t
+-s, at AMTAR@,$AMTAR,;t t
+-s, at am__tar@,$am__tar,;t t
+-s, at am__untar@,$am__untar,;t t
+-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
+-s, at CONF_FILES@,$CONF_FILES,;t t
+-s, at CC@,$CC,;t t
+-s, at CFLAGS@,$CFLAGS,;t t
+-s, at LDFLAGS@,$LDFLAGS,;t t
+-s, at CPPFLAGS@,$CPPFLAGS,;t t
+-s, at ac_ct_CC@,$ac_ct_CC,;t t
+-s, at EXEEXT@,$EXEEXT,;t t
+-s, at OBJEXT@,$OBJEXT,;t t
+-s, at DEPDIR@,$DEPDIR,;t t
+-s, at am__include@,$am__include,;t t
+-s, at am__quote@,$am__quote,;t t
+-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s, at CCDEPMODE@,$CCDEPMODE,;t t
+-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s, at CPP@,$CPP,;t t
+-s, at CXX@,$CXX,;t t
+-s, at CXXFLAGS@,$CXXFLAGS,;t t
+-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
+-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
+-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+-s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
+-s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
+-s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
+-s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
+-s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
+-s, at USE_RTTI@,$USE_RTTI,;t t
+-s, at CXXCPP@,$CXXCPP,;t t
+-s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
+-s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
+-s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
+-s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
+-s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
+-s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
+-s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
+-s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
+-s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
+-s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
+-s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
+-s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
+-s, at EGREP@,$EGREP,;t t
+-s, at LN_S@,$LN_S,;t t
+-s, at ECHO@,$ECHO,;t t
+-s, at AR@,$AR,;t t
+-s, at ac_ct_AR@,$ac_ct_AR,;t t
+-s, at RANLIB@,$RANLIB,;t t
+-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s, at F77@,$F77,;t t
+-s, at FFLAGS@,$FFLAGS,;t t
+-s, at ac_ct_F77@,$ac_ct_F77,;t t
+-s, at LIBTOOL@,$LIBTOOL,;t t
+-s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
+-s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
+-s, at MSGFMT@,$MSGFMT,;t t
+-s, at GMSGFMT@,$GMSGFMT,;t t
+-s, at XGETTEXT@,$XGETTEXT,;t t
+-s, at LIBUTIL@,$LIBUTIL,;t t
+-s, at LIBCOMPAT@,$LIBCOMPAT,;t t
+-s, at LIBCRYPT@,$LIBCRYPT,;t t
+-s, at LIBRESOLV@,$LIBRESOLV,;t t
+-s, at LIB_POLL@,$LIB_POLL,;t t
+-s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
+-s, at LIBSOCKET@,$LIBSOCKET,;t t
+-s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+-s, at LIBUCB@,$LIBUCB,;t t
+-s, at LIBDL@,$LIBDL,;t t
+-s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
+-s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
+-s, at include_x11_TRUE@,$include_x11_TRUE,;t t
+-s, at include_x11_FALSE@,$include_x11_FALSE,;t t
+-s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
+-s, at LIB_X11@,$LIB_X11,;t t
+-s, at LIB_XRENDER@,$LIB_XRENDER,;t t
+-s, at LIBSM@,$LIBSM,;t t
+-s, at X_INCLUDES@,$X_INCLUDES,;t t
+-s, at X_LDFLAGS@,$X_LDFLAGS,;t t
+-s, at x_includes@,$x_includes,;t t
+-s, at x_libraries@,$x_libraries,;t t
+-s, at QTE_NORTTI@,$QTE_NORTTI,;t t
+-s, at LIB_XEXT@,$LIB_XEXT,;t t
+-s, at LIBPTHREAD@,$LIBPTHREAD,;t t
+-s, at USE_THREADS@,$USE_THREADS,;t t
+-s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
+-s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
+-s, at USER_INCLUDES@,$USER_INCLUDES,;t t
+-s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
+-s, at LIBZ@,$LIBZ,;t t
+-s, at LIBPNG@,$LIBPNG,;t t
+-s, at LIBJPEG@,$LIBJPEG,;t t
+-s, at qt_libraries@,$qt_libraries,;t t
+-s, at qt_includes@,$qt_includes,;t t
+-s, at QT_INCLUDES@,$QT_INCLUDES,;t t
+-s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
+-s, at PERL@,$PERL,;t t
+-s, at MOC@,$MOC,;t t
+-s, at UIC@,$UIC,;t t
+-s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
+-s, at LIB_QPE@,$LIB_QPE,;t t
+-s, at kde_qtver@,$kde_qtver,;t t
+-s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
+-s, at KDE_RPATH@,$KDE_RPATH,;t t
+-s, at X_RPATH@,$X_RPATH,;t t
+-s, at kde_libraries@,$kde_libraries,;t t
+-s, at kde_includes@,$kde_includes,;t t
+-s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
+-s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
+-s, at all_includes@,$all_includes,;t t
+-s, at all_libraries@,$all_libraries,;t t
+-s, at AUTODIRS@,$AUTODIRS,;t t
+-s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
+-s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
+-s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
+-s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
+-s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
+-s, at DCOPIDLNG@,$DCOPIDLNG,;t t
+-s, at DCOPIDL@,$DCOPIDL,;t t
+-s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
+-s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
+-s, at MCOPIDL@,$MCOPIDL,;t t
+-s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
+-s, at MEINPROC@,$MEINPROC,;t t
+-s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
+-s, at XMLLINT@,$XMLLINT,;t t
+-s, at kde_htmldir@,$kde_htmldir,;t t
+-s, at kde_appsdir@,$kde_appsdir,;t t
+-s, at kde_icondir@,$kde_icondir,;t t
+-s, at kde_sounddir@,$kde_sounddir,;t t
+-s, at kde_datadir@,$kde_datadir,;t t
+-s, at kde_locale@,$kde_locale,;t t
+-s, at kde_confdir@,$kde_confdir,;t t
+-s, at kde_kcfgdir@,$kde_kcfgdir,;t t
+-s, at kde_mimedir@,$kde_mimedir,;t t
+-s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
+-s, at kde_bindir@,$kde_bindir,;t t
+-s, at xdg_appsdir@,$xdg_appsdir,;t t
+-s, at xdg_menudir@,$xdg_menudir,;t t
+-s, at xdg_directorydir@,$xdg_directorydir,;t t
+-s, at kde_templatesdir@,$kde_templatesdir,;t t
+-s, at kde_servicesdir@,$kde_servicesdir,;t t
+-s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
+-s, at kde_moduledir@,$kde_moduledir,;t t
+-s, at kdeinitdir@,$kdeinitdir,;t t
+-s, at kde_styledir@,$kde_styledir,;t t
+-s, at kde_widgetdir@,$kde_widgetdir,;t t
+-s, at LIB_KDED@,$LIB_KDED,;t t
+-s, at LIB_KDECORE@,$LIB_KDECORE,;t t
+-s, at LIB_KDEUI@,$LIB_KDEUI,;t t
+-s, at LIB_KIO@,$LIB_KIO,;t t
+-s, at LIB_KJS@,$LIB_KJS,;t t
+-s, at LIB_SMB@,$LIB_SMB,;t t
+-s, at LIB_KAB@,$LIB_KAB,;t t
+-s, at LIB_KABC@,$LIB_KABC,;t t
+-s, at LIB_KHTML@,$LIB_KHTML,;t t
+-s, at LIB_KSPELL@,$LIB_KSPELL,;t t
+-s, at LIB_KPARTS@,$LIB_KPARTS,;t t
+-s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
+-s, at LIB_KUTILS@,$LIB_KUTILS,;t t
+-s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
+-s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
+-s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
+-s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
+-s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
+-s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
+-s, at LIB_KFILE@,$LIB_KFILE,;t t
+-s, at LIB_KFM@,$LIB_KFM,;t t
+-s, at QTDOCDIR@,$QTDOCDIR,;t t
+-s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
+-s, at DOXYGEN@,$DOXYGEN,;t t
+-s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
+-s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
+-s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
+-s, at gphoto2_config@,$gphoto2_config,;t t
+-s, at gphoto2_port_config@,$gphoto2_port_config,;t t
+-s, at GPHOTO2_INCS@,$GPHOTO2_INCS,;t t
+-s, at GPHOTO2_LIBS@,$GPHOTO2_LIBS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-s, at LIBFREETYPE_LIBS@,$LIBFREETYPE_LIBS,;t t
+-s, at LIBFREETYPE_CFLAGS@,$LIBFREETYPE_CFLAGS,;t t
+-s, at FREETYPE_RPATH@,$FREETYPE_RPATH,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at LIB_EXR@,$LIB_EXR,;t t
+-s, at EXR_FLAGS@,$EXR_FLAGS,;t t
+-s, at include_EXR_MODULES_TRUE@,$include_EXR_MODULES_TRUE,;t t
+-s, at include_EXR_MODULES_FALSE@,$include_EXR_MODULES_FALSE,;t t
+-s, at POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t
+-s, at POPPLER_LIBS@,$POPPLER_LIBS,;t t
+-s, at include_PDF_TRUE@,$include_PDF_TRUE,;t t
+-s, at include_PDF_FALSE@,$include_PDF_FALSE,;t t
+-s, at LIBTIFF@,$LIBTIFF,;t t
+-s, at include_TIFF_TRUE@,$include_TIFF_TRUE,;t t
+-s, at include_TIFF_FALSE@,$include_TIFF_FALSE,;t t
+-s, at LIBVM@,$LIBVM,;t t
+-s, at KADMOS_LIB@,$KADMOS_LIB,;t t
+-s, at KADMOS_INC@,$KADMOS_INC,;t t
+-s, at FREETYPE_VERSION@,$FREETYPE_VERSION,;t t
+-s, at LIBFREETYPE_RPATH@,$LIBFREETYPE_RPATH,;t t
+-s, at XFT_CFLAGS@,$XFT_CFLAGS,;t t
+-s, at XFT_LIBS@,$XFT_LIBS,;t t
+-s, at LIBPAPER_LIBS@,$LIBPAPER_LIBS,;t t
+-s, at NOREGMOVE@,$NOREGMOVE,;t t
+-s, at GLINC@,$GLINC,;t t
+-s, at GLLIB@,$GLLIB,;t t
+-s, at LIBART_LIBS@,$LIBART_LIBS,;t t
+-s, at LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
+-s, at LIBART_RPATH@,$LIBART_RPATH,;t t
+-s, at FONTCONFIG_LIBS@,$FONTCONFIG_LIBS,;t t
+-s, at FONTCONFIG_CFLAGS@,$FONTCONFIG_CFLAGS,;t t
+-s, at FONTCONFIG_RPATH@,$FONTCONFIG_RPATH,;t t
+-s, at FREETYPE_LIBS@,$FREETYPE_LIBS,;t t
+-s, at FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t
+-s, at LCMS_LIBS@,$LCMS_LIBS,;t t
+-s, at FRIBIDI_LIBS@,$FRIBIDI_LIBS,;t t
+-s, at FRIBIDI_CFLAGS@,$FRIBIDI_CFLAGS,;t t
+-s, at FRIBIDI_RPATH@,$FRIBIDI_RPATH,;t t
+-s, at GENERIC_API_VERSION@,$GENERIC_API_VERSION,;t t
+-s, at GENERIC_LIBRARY_VERSION@,$GENERIC_LIBRARY_VERSION,;t t
+-s, at GENERIC_LIBRARY_NAME@,$GENERIC_LIBRARY_NAME,;t t
+-s, at GENERIC_RELEASE@,$GENERIC_RELEASE,;t t
+-s, at GENERIC_VERSION@,$GENERIC_VERSION,;t t
+-s, at LIB_IMLIB@,$LIB_IMLIB,;t t
+-s, at IMLIB_CFLAGS@,$IMLIB_CFLAGS,;t t
+-s, at IMLIB_LIBS@,$IMLIB_LIBS,;t t
+-s, at CXXRPOFLAGS@,$CXXRPOFLAGS,;t t
+-s, at RPO_YES@,$RPO_YES,;t t
+-s, at RPO_NO@,$RPO_NO,;t t
+-s, at TIFF_LIBS@,$TIFF_LIBS,;t t
+-s, at TIFF_CFLAGS@,$TIFF_CFLAGS,;t t
+-s, at PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
+-s, at PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
+-s, at THREAD_LIBS@,$THREAD_LIBS,;t t
+-s, at THREAD_CFLAGS@,$THREAD_CFLAGS,;t t
+-s, at include_kooka_TRUE@,$include_kooka_TRUE,;t t
+-s, at include_kooka_FALSE@,$include_kooka_FALSE,;t t
+-s, at LIBSANE_LIBS@,$LIBSANE_LIBS,;t t
+-s, at LIBSANE_LDFLAGS@,$LIBSANE_LDFLAGS,;t t
+-s, at LIBSANE_INCLUDES@,$LIBSANE_INCLUDES,;t t
+-s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
+-s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
+-s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
+-s, at kamera_SUBDIR_included_TRUE@,$kamera_SUBDIR_included_TRUE,;t t
+-s, at kamera_SUBDIR_included_FALSE@,$kamera_SUBDIR_included_FALSE,;t t
+-s, at kcoloredit_SUBDIR_included_TRUE@,$kcoloredit_SUBDIR_included_TRUE,;t t
+-s, at kcoloredit_SUBDIR_included_FALSE@,$kcoloredit_SUBDIR_included_FALSE,;t t
+-s, at kfax_SUBDIR_included_TRUE@,$kfax_SUBDIR_included_TRUE,;t t
+-s, at kfax_SUBDIR_included_FALSE@,$kfax_SUBDIR_included_FALSE,;t t
+-s, at kgamma_SUBDIR_included_TRUE@,$kgamma_SUBDIR_included_TRUE,;t t
+-s, at kgamma_SUBDIR_included_FALSE@,$kgamma_SUBDIR_included_FALSE,;t t
+-s, at kghostview_SUBDIR_included_TRUE@,$kghostview_SUBDIR_included_TRUE,;t t
+-s, at kghostview_SUBDIR_included_FALSE@,$kghostview_SUBDIR_included_FALSE,;t t
+-s, at kiconedit_SUBDIR_included_TRUE@,$kiconedit_SUBDIR_included_TRUE,;t t
+-s, at kiconedit_SUBDIR_included_FALSE@,$kiconedit_SUBDIR_included_FALSE,;t t
+-s, at kmrml_SUBDIR_included_TRUE@,$kmrml_SUBDIR_included_TRUE,;t t
+-s, at kmrml_SUBDIR_included_FALSE@,$kmrml_SUBDIR_included_FALSE,;t t
+-s, at kolourpaint_SUBDIR_included_TRUE@,$kolourpaint_SUBDIR_included_TRUE,;t t
+-s, at kolourpaint_SUBDIR_included_FALSE@,$kolourpaint_SUBDIR_included_FALSE,;t t
+-s, at kpdf_SUBDIR_included_TRUE@,$kpdf_SUBDIR_included_TRUE,;t t
+-s, at kpdf_SUBDIR_included_FALSE@,$kpdf_SUBDIR_included_FALSE,;t t
+-s, at kpovmodeler_SUBDIR_included_TRUE@,$kpovmodeler_SUBDIR_included_TRUE,;t t
+-s, at kpovmodeler_SUBDIR_included_FALSE@,$kpovmodeler_SUBDIR_included_FALSE,;t t
+-s, at kruler_SUBDIR_included_TRUE@,$kruler_SUBDIR_included_TRUE,;t t
+-s, at kruler_SUBDIR_included_FALSE@,$kruler_SUBDIR_included_FALSE,;t t
+-s, at ksnapshot_SUBDIR_included_TRUE@,$ksnapshot_SUBDIR_included_TRUE,;t t
+-s, at ksnapshot_SUBDIR_included_FALSE@,$ksnapshot_SUBDIR_included_FALSE,;t t
+-s, at ksvg_SUBDIR_included_TRUE@,$ksvg_SUBDIR_included_TRUE,;t t
+-s, at ksvg_SUBDIR_included_FALSE@,$ksvg_SUBDIR_included_FALSE,;t t
+-s, at kuickshow_SUBDIR_included_TRUE@,$kuickshow_SUBDIR_included_TRUE,;t t
+-s, at kuickshow_SUBDIR_included_FALSE@,$kuickshow_SUBDIR_included_FALSE,;t t
+-s, at kview_SUBDIR_included_TRUE@,$kview_SUBDIR_included_TRUE,;t t
+-s, at kview_SUBDIR_included_FALSE@,$kview_SUBDIR_included_FALSE,;t t
+-s, at kviewshell_SUBDIR_included_TRUE@,$kviewshell_SUBDIR_included_TRUE,;t t
+-s, at kviewshell_SUBDIR_included_FALSE@,$kviewshell_SUBDIR_included_FALSE,;t t
+-s, at libkscan_SUBDIR_included_TRUE@,$libkscan_SUBDIR_included_TRUE,;t t
+-s, at libkscan_SUBDIR_included_FALSE@,$libkscan_SUBDIR_included_FALSE,;t t
+-s, at kfile_plugins_SUBDIR_included_TRUE@,$kfile_plugins_SUBDIR_included_TRUE,;t t
+-s, at kfile_plugins_SUBDIR_included_FALSE@,$kfile_plugins_SUBDIR_included_FALSE,;t t
+-s, at kfaxview_SUBDIR_included_TRUE@,$kfaxview_SUBDIR_included_TRUE,;t t
+-s, at kfaxview_SUBDIR_included_FALSE@,$kfaxview_SUBDIR_included_FALSE,;t t
+-s, at kdvi_SUBDIR_included_TRUE@,$kdvi_SUBDIR_included_TRUE,;t t
+-s, at kdvi_SUBDIR_included_FALSE@,$kdvi_SUBDIR_included_FALSE,;t t
+-s, at kooka_SUBDIR_included_TRUE@,$kooka_SUBDIR_included_TRUE,;t t
+-s, at kooka_SUBDIR_included_FALSE@,$kooka_SUBDIR_included_FALSE,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+- cat >>$CONFIG_STATUS <<\_ACEOF
+- # Split the substitutions into bite-sized pieces for seds with
+- # small command number limits, like on Digital OSF/1 and HP-UX.
+- ac_max_sed_lines=48
+- ac_sed_frag=1 # Number of current file.
+- ac_beg=1 # First line for current file.
+- ac_end=$ac_max_sed_lines # Line after last line for current file.
+- ac_more_lines=:
+- ac_sed_cmds=
+- while $ac_more_lines; do
+- if test $ac_beg -gt 1; then
+- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- else
+- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- fi
+- if test ! -s $tmp/subs.frag; then
+- ac_more_lines=false
+- else
+- # The purpose of the label and of the branching condition is to
+- # speed up the sed processing (if there are no `@' at all, there
+- # is no need to browse any of the substitutions).
+- # These are the two extra sed commands mentioned above.
+- (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+- else
+- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+- fi
+- ac_sed_frag=`expr $ac_sed_frag + 1`
+- ac_beg=$ac_end
+- ac_end=`expr $ac_end + $ac_max_sed_lines`
+- fi
+- done
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
++
++_ACEOF
++
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++target!$target$ac_delim
++target_cpu!$target_cpu$ac_delim
++target_vendor!$target_vendor$ac_delim
++target_os!$target_os$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++CYGPATH_W!$CYGPATH_W$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++ACLOCAL!$ACLOCAL$ac_delim
++AUTOCONF!$AUTOCONF$ac_delim
++AUTOMAKE!$AUTOMAKE$ac_delim
++AUTOHEADER!$AUTOHEADER$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++install_sh!$install_sh$ac_delim
++STRIP!$STRIP$ac_delim
++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
++mkdir_p!$mkdir_p$ac_delim
++AWK!$AWK$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
++KDECONFIG!$KDECONFIG$ac_delim
++kde_libs_prefix!$kde_libs_prefix$ac_delim
++kde_libs_htmldir!$kde_libs_htmldir$ac_delim
++CONF_FILES!$CONF_FILES$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DEPDIR!$DEPDIR$ac_delim
++am__include!$am__include$ac_delim
++am__quote!$am__quote$ac_delim
++AMDEP_TRUE!$AMDEP_TRUE$ac_delim
++AMDEP_FALSE!$AMDEP_FALSE$ac_delim
++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
++CCDEPMODE!$CCDEPMODE$ac_delim
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++CPP!$CPP$ac_delim
++CXX!$CXX$ac_delim
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++_ACEOF
++
++ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+-fi # test -n "$CONFIG_FILES"
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++ ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
++WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
++HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
++unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
++unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
++USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
++USE_RTTI!$USE_RTTI$ac_delim
++CXXCPP!$CXXCPP$ac_delim
++NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
++NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
++ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
++LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
++LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
++KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
++KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
++KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
++KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
++KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
++KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
++KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
++RANLIB!$RANLIB$ac_delim
++F77!$F77$ac_delim
++FFLAGS!$FFLAGS$ac_delim
++ac_ct_F77!$ac_ct_F77$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
++KDE_PLUGIN!$KDE_PLUGIN$ac_delim
++KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++LIBUTIL!$LIBUTIL$ac_delim
++LIBCOMPAT!$LIBCOMPAT$ac_delim
++LIBCRYPT!$LIBCRYPT$ac_delim
++LIBRESOLV!$LIBRESOLV$ac_delim
++LIB_POLL!$LIB_POLL$ac_delim
++FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
++LIBSOCKET!$LIBSOCKET$ac_delim
++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
++LIBUCB!$LIBUCB$ac_delim
++LIBDL!$LIBDL$ac_delim
++KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
++KDE_USE_PIE!$KDE_USE_PIE$ac_delim
++include_x11_TRUE!$include_x11_TRUE$ac_delim
++include_x11_FALSE!$include_x11_FALSE$ac_delim
++XMKMF!$XMKMF$ac_delim
++X_PRE_LIBS!$X_PRE_LIBS$ac_delim
++LIB_X11!$LIB_X11$ac_delim
++LIB_XRENDER!$LIB_XRENDER$ac_delim
++LIBSM!$LIBSM$ac_delim
++X_INCLUDES!$X_INCLUDES$ac_delim
++X_LDFLAGS!$X_LDFLAGS$ac_delim
++x_includes!$x_includes$ac_delim
++x_libraries!$x_libraries$ac_delim
++QTE_NORTTI!$QTE_NORTTI$ac_delim
++LIB_XEXT!$LIB_XEXT$ac_delim
++LIBPTHREAD!$LIBPTHREAD$ac_delim
++USE_THREADS!$USE_THREADS$ac_delim
++KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
++KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
++USER_INCLUDES!$USER_INCLUDES$ac_delim
++USER_LDFLAGS!$USER_LDFLAGS$ac_delim
++LIBZ!$LIBZ$ac_delim
++LIBPNG!$LIBPNG$ac_delim
++LIBJPEG!$LIBJPEG$ac_delim
++qt_libraries!$qt_libraries$ac_delim
++qt_includes!$qt_includes$ac_delim
++QT_INCLUDES!$QT_INCLUDES$ac_delim
++QT_LDFLAGS!$QT_LDFLAGS$ac_delim
++PERL!$PERL$ac_delim
++MOC!$MOC$ac_delim
++UIC!$UIC$ac_delim
++UIC_TR!$UIC_TR$ac_delim
++LIB_QT!$LIB_QT$ac_delim
++LIB_QPE!$LIB_QPE$ac_delim
++kde_qtver!$kde_qtver$ac_delim
++KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
++KDE_RPATH!$KDE_RPATH$ac_delim
++X_RPATH!$X_RPATH$ac_delim
++kde_libraries!$kde_libraries$ac_delim
++kde_includes!$kde_includes$ac_delim
++KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
++KDE_INCLUDES!$KDE_INCLUDES$ac_delim
++all_includes!$all_includes$ac_delim
++all_libraries!$all_libraries$ac_delim
++AUTODIRS!$AUTODIRS$ac_delim
++include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
++include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
++MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
++KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
++KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
++_ACEOF
++
++ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++ ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++DCOPIDLNG!$DCOPIDLNG$ac_delim
++DCOPIDL!$DCOPIDL$ac_delim
++DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
++DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
++MCOPIDL!$MCOPIDL$ac_delim
++ARTSCCONFIG!$ARTSCCONFIG$ac_delim
++MEINPROC!$MEINPROC$ac_delim
++KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
++XMLLINT!$XMLLINT$ac_delim
++kde_htmldir!$kde_htmldir$ac_delim
++kde_appsdir!$kde_appsdir$ac_delim
++kde_icondir!$kde_icondir$ac_delim
++kde_sounddir!$kde_sounddir$ac_delim
++kde_datadir!$kde_datadir$ac_delim
++kde_locale!$kde_locale$ac_delim
++kde_confdir!$kde_confdir$ac_delim
++kde_kcfgdir!$kde_kcfgdir$ac_delim
++kde_mimedir!$kde_mimedir$ac_delim
++kde_wallpaperdir!$kde_wallpaperdir$ac_delim
++kde_bindir!$kde_bindir$ac_delim
++xdg_appsdir!$xdg_appsdir$ac_delim
++xdg_menudir!$xdg_menudir$ac_delim
++xdg_directorydir!$xdg_directorydir$ac_delim
++kde_templatesdir!$kde_templatesdir$ac_delim
++kde_servicesdir!$kde_servicesdir$ac_delim
++kde_servicetypesdir!$kde_servicetypesdir$ac_delim
++kde_moduledir!$kde_moduledir$ac_delim
++kdeinitdir!$kdeinitdir$ac_delim
++kde_styledir!$kde_styledir$ac_delim
++kde_widgetdir!$kde_widgetdir$ac_delim
++LIB_KDED!$LIB_KDED$ac_delim
++LIB_KDECORE!$LIB_KDECORE$ac_delim
++LIB_KDEUI!$LIB_KDEUI$ac_delim
++LIB_KIO!$LIB_KIO$ac_delim
++LIB_KJS!$LIB_KJS$ac_delim
++LIB_SMB!$LIB_SMB$ac_delim
++LIB_KAB!$LIB_KAB$ac_delim
++LIB_KABC!$LIB_KABC$ac_delim
++LIB_KHTML!$LIB_KHTML$ac_delim
++LIB_KSPELL!$LIB_KSPELL$ac_delim
++LIB_KPARTS!$LIB_KPARTS$ac_delim
++LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
++LIB_KUTILS!$LIB_KUTILS$ac_delim
++LIB_KDEPIM!$LIB_KDEPIM$ac_delim
++LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
++LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
++LIB_KDNSSD!$LIB_KDNSSD$ac_delim
++LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
++LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
++LIB_KFILE!$LIB_KFILE$ac_delim
++LIB_KFM!$LIB_KFM$ac_delim
++QTDOCDIR!$QTDOCDIR$ac_delim
++KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
++DOXYGEN!$DOXYGEN$ac_delim
++DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
++DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
++KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
++gphoto2_config!$gphoto2_config$ac_delim
++gphoto2_port_config!$gphoto2_port_config$ac_delim
++GPHOTO2_INCS!$GPHOTO2_INCS$ac_delim
++GPHOTO2_LIBS!$GPHOTO2_LIBS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++LIBFREETYPE_LIBS!$LIBFREETYPE_LIBS$ac_delim
++LIBFREETYPE_CFLAGS!$LIBFREETYPE_CFLAGS$ac_delim
++FREETYPE_RPATH!$FREETYPE_RPATH$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++LIB_EXR!$LIB_EXR$ac_delim
++EXR_FLAGS!$EXR_FLAGS$ac_delim
++include_EXR_MODULES_TRUE!$include_EXR_MODULES_TRUE$ac_delim
++include_EXR_MODULES_FALSE!$include_EXR_MODULES_FALSE$ac_delim
++POPPLER_CFLAGS!$POPPLER_CFLAGS$ac_delim
++POPPLER_LIBS!$POPPLER_LIBS$ac_delim
++include_PDF_TRUE!$include_PDF_TRUE$ac_delim
++include_PDF_FALSE!$include_PDF_FALSE$ac_delim
++LIBTIFF!$LIBTIFF$ac_delim
++include_TIFF_TRUE!$include_TIFF_TRUE$ac_delim
++include_TIFF_FALSE!$include_TIFF_FALSE$ac_delim
++LIBVM!$LIBVM$ac_delim
++KADMOS_LIB!$KADMOS_LIB$ac_delim
++KADMOS_INC!$KADMOS_INC$ac_delim
++FREETYPE_VERSION!$FREETYPE_VERSION$ac_delim
++LIBFREETYPE_RPATH!$LIBFREETYPE_RPATH$ac_delim
++XFT_CFLAGS!$XFT_CFLAGS$ac_delim
++XFT_LIBS!$XFT_LIBS$ac_delim
++LIBPAPER_LIBS!$LIBPAPER_LIBS$ac_delim
++NOREGMOVE!$NOREGMOVE$ac_delim
++GLINC!$GLINC$ac_delim
++GLLIB!$GLLIB$ac_delim
++LIBART_LIBS!$LIBART_LIBS$ac_delim
++LIBART_CFLAGS!$LIBART_CFLAGS$ac_delim
++LIBART_RPATH!$LIBART_RPATH$ac_delim
++FONTCONFIG_LIBS!$FONTCONFIG_LIBS$ac_delim
++FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim
++FONTCONFIG_RPATH!$FONTCONFIG_RPATH$ac_delim
++FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
++FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
++LCMS_LIBS!$LCMS_LIBS$ac_delim
++_ACEOF
++
++ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++ ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++FRIBIDI_LIBS!$FRIBIDI_LIBS$ac_delim
++FRIBIDI_CFLAGS!$FRIBIDI_CFLAGS$ac_delim
++FRIBIDI_RPATH!$FRIBIDI_RPATH$ac_delim
++GENERIC_API_VERSION!$GENERIC_API_VERSION$ac_delim
++GENERIC_LIBRARY_VERSION!$GENERIC_LIBRARY_VERSION$ac_delim
++GENERIC_LIBRARY_NAME!$GENERIC_LIBRARY_NAME$ac_delim
++GENERIC_RELEASE!$GENERIC_RELEASE$ac_delim
++GENERIC_VERSION!$GENERIC_VERSION$ac_delim
++LIB_IMLIB!$LIB_IMLIB$ac_delim
++IMLIB_CFLAGS!$IMLIB_CFLAGS$ac_delim
++IMLIB_LIBS!$IMLIB_LIBS$ac_delim
++CXXRPOFLAGS!$CXXRPOFLAGS$ac_delim
++RPO_YES!$RPO_YES$ac_delim
++RPO_NO!$RPO_NO$ac_delim
++TIFF_LIBS!$TIFF_LIBS$ac_delim
++TIFF_CFLAGS!$TIFF_CFLAGS$ac_delim
++PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
++PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
++THREAD_LIBS!$THREAD_LIBS$ac_delim
++THREAD_CFLAGS!$THREAD_CFLAGS$ac_delim
++include_kooka_TRUE!$include_kooka_TRUE$ac_delim
++include_kooka_FALSE!$include_kooka_FALSE$ac_delim
++LIBSANE_LIBS!$LIBSANE_LIBS$ac_delim
++LIBSANE_LDFLAGS!$LIBSANE_LDFLAGS$ac_delim
++LIBSANE_INCLUDES!$LIBSANE_INCLUDES$ac_delim
++TOPSUBDIRS!$TOPSUBDIRS$ac_delim
++doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
++doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
++kamera_SUBDIR_included_TRUE!$kamera_SUBDIR_included_TRUE$ac_delim
++kamera_SUBDIR_included_FALSE!$kamera_SUBDIR_included_FALSE$ac_delim
++kcoloredit_SUBDIR_included_TRUE!$kcoloredit_SUBDIR_included_TRUE$ac_delim
++kcoloredit_SUBDIR_included_FALSE!$kcoloredit_SUBDIR_included_FALSE$ac_delim
++kfax_SUBDIR_included_TRUE!$kfax_SUBDIR_included_TRUE$ac_delim
++kfax_SUBDIR_included_FALSE!$kfax_SUBDIR_included_FALSE$ac_delim
++kgamma_SUBDIR_included_TRUE!$kgamma_SUBDIR_included_TRUE$ac_delim
++kgamma_SUBDIR_included_FALSE!$kgamma_SUBDIR_included_FALSE$ac_delim
++kghostview_SUBDIR_included_TRUE!$kghostview_SUBDIR_included_TRUE$ac_delim
++kghostview_SUBDIR_included_FALSE!$kghostview_SUBDIR_included_FALSE$ac_delim
++kiconedit_SUBDIR_included_TRUE!$kiconedit_SUBDIR_included_TRUE$ac_delim
++kiconedit_SUBDIR_included_FALSE!$kiconedit_SUBDIR_included_FALSE$ac_delim
++kmrml_SUBDIR_included_TRUE!$kmrml_SUBDIR_included_TRUE$ac_delim
++kmrml_SUBDIR_included_FALSE!$kmrml_SUBDIR_included_FALSE$ac_delim
++kolourpaint_SUBDIR_included_TRUE!$kolourpaint_SUBDIR_included_TRUE$ac_delim
++kolourpaint_SUBDIR_included_FALSE!$kolourpaint_SUBDIR_included_FALSE$ac_delim
++kpdf_SUBDIR_included_TRUE!$kpdf_SUBDIR_included_TRUE$ac_delim
++kpdf_SUBDIR_included_FALSE!$kpdf_SUBDIR_included_FALSE$ac_delim
++kpovmodeler_SUBDIR_included_TRUE!$kpovmodeler_SUBDIR_included_TRUE$ac_delim
++kpovmodeler_SUBDIR_included_FALSE!$kpovmodeler_SUBDIR_included_FALSE$ac_delim
++kruler_SUBDIR_included_TRUE!$kruler_SUBDIR_included_TRUE$ac_delim
++kruler_SUBDIR_included_FALSE!$kruler_SUBDIR_included_FALSE$ac_delim
++ksnapshot_SUBDIR_included_TRUE!$ksnapshot_SUBDIR_included_TRUE$ac_delim
++ksnapshot_SUBDIR_included_FALSE!$ksnapshot_SUBDIR_included_FALSE$ac_delim
++ksvg_SUBDIR_included_TRUE!$ksvg_SUBDIR_included_TRUE$ac_delim
++ksvg_SUBDIR_included_FALSE!$ksvg_SUBDIR_included_FALSE$ac_delim
++kuickshow_SUBDIR_included_TRUE!$kuickshow_SUBDIR_included_TRUE$ac_delim
++kuickshow_SUBDIR_included_FALSE!$kuickshow_SUBDIR_included_FALSE$ac_delim
++kview_SUBDIR_included_TRUE!$kview_SUBDIR_included_TRUE$ac_delim
++kview_SUBDIR_included_FALSE!$kview_SUBDIR_included_FALSE$ac_delim
++kviewshell_SUBDIR_included_TRUE!$kviewshell_SUBDIR_included_TRUE$ac_delim
++kviewshell_SUBDIR_included_FALSE!$kviewshell_SUBDIR_included_FALSE$ac_delim
++libkscan_SUBDIR_included_TRUE!$libkscan_SUBDIR_included_TRUE$ac_delim
++libkscan_SUBDIR_included_FALSE!$libkscan_SUBDIR_included_FALSE$ac_delim
++kfile_plugins_SUBDIR_included_TRUE!$kfile_plugins_SUBDIR_included_TRUE$ac_delim
++kfile_plugins_SUBDIR_included_FALSE!$kfile_plugins_SUBDIR_included_FALSE$ac_delim
++kfaxview_SUBDIR_included_TRUE!$kfaxview_SUBDIR_included_TRUE$ac_delim
++kfaxview_SUBDIR_included_FALSE!$kfaxview_SUBDIR_included_FALSE$ac_delim
++kdvi_SUBDIR_included_TRUE!$kdvi_SUBDIR_included_TRUE$ac_delim
++kdvi_SUBDIR_included_FALSE!$kdvi_SUBDIR_included_FALSE$ac_delim
++kooka_SUBDIR_included_TRUE!$kooka_SUBDIR_included_TRUE$ac_delim
++kooka_SUBDIR_included_FALSE!$kooka_SUBDIR_included_FALSE$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++_ACEOF
++
++ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 71; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
+
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++ ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
+ _ACEOF
++
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++ ac_vpsub='/^[ ]*VPATH[ ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[ ]*\):*/\1/
++s/:*$//
++s/^[^=]*=[ ]*$//
++}'
++fi
++
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+- case $ac_file in
+- - | *:- | *:-:* ) # input from stdin
+- cat >$tmp/stdin
+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- * ) ac_file_in=$ac_file.in ;;
++fi # test -n "$CONFIG_FILES"
++
++
++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
++do
++ case $ac_tag in
++ :[FHLC]) ac_mode=$ac_tag; continue;;
++ esac
++ case $ac_mode$ac_tag in
++ :[FHL]*:*);;
++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++ { (exit 1); exit 1; }; };;
++ :[FH]-) ac_tag=-:-;;
++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++ esac
++ ac_save_IFS=$IFS
++ IFS=:
++ set x $ac_tag
++ IFS=$ac_save_IFS
++ shift
++ ac_file=$1
++ shift
++
++ case $ac_mode in
++ :L) ac_source=$1;;
++ :[FH])
++ ac_file_inputs=
++ for ac_f
++ do
++ case $ac_f in
++ -) ac_f="$tmp/stdin";;
++ *) # Look for the file first in the build tree, then in the source tree
++ # (if the path is not absolute). The absolute path cannot be DOS-style,
++ # because $ac_f cannot contain `:'.
++ test -f "$ac_f" ||
++ case $ac_f in
++ [\\/$]*) false;;
++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++ esac ||
++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++ { (exit 1); exit 1; }; };;
++ esac
++ ac_file_inputs="$ac_file_inputs $ac_f"
++ done
++
++ # 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. */
++ configure_input="Generated from "`IFS=:
++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
++ if test x"$ac_file" != x-; then
++ configure_input="$ac_file. $configure_input"
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ fi
++
++ case $ac_tag in
++ *:-:* | *:-) cat >"$tmp/stdin";;
++ esac
++ ;;
+ esac
+
+- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++ ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+- X"$ac_file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$ac_file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ { as_dir="$ac_dir"
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ test -d "$as_dir" && break
+ done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+-
+ ac_builddir=.
+
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+
+ case $srcdir in
+- .) # No --srcdir option. We are building in place.
++ .) # We are building in place.
+ ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
+
++ case $ac_mode in
++ :F)
++ #
++ # CONFIG_FILE
++ #
+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
++_ACEOF
+
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -45396,6 +44879,12 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
+- # 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. */
+- if test x"$ac_file" = x-; then
+- configure_input=
+- else
+- configure_input="$ac_file. "
+- fi
+- configure_input=$configure_input"Generated from `echo $ac_file_in |
+- sed 's,.*/,,'` by configure."
+-
+- # First look for the input files in the build tree, otherwise in the
+- # src tree.
+- ac_file_inputs=`IFS=:
+- for f in $ac_file_in; do
+- case $f in
+- -) echo $tmp/stdin ;;
+- [\\/$]*)
+- # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- echo "$f";;
+- *) # Relative
+- if test -f "$f"; then
+- # Build tree
+- echo "$f"
+- elif test -f "$srcdir/$f"; then
+- # Source tree
+- echo "$srcdir/$f"
+- else
+- # /dev/null tree
+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- fi;;
+- esac
+- done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=
+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
++case `sed -n '/datarootdir/ {
++ p
++ q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p
++' $ac_file_inputs` in
++*datarootdir*) ;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++ ac_datarootdir_hack='
++ s&@datadir@&$datadir&g
++ s&@docdir@&$docdir&g
++ s&@infodir@&$infodir&g
++ s&@localedir@&$localedir&g
++ s&@mandir@&$mandir&g
++ s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
_ACEOF
++
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
+ $extrasub
+@@ -45454,248 +46136,122 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s, at configure_input@,$configure_input,;t t
+-s, at srcdir@,$ac_srcdir,;t t
+-s, at abs_srcdir@,$ac_abs_srcdir,;t t
+-s, at top_srcdir@,$ac_top_srcdir,;t t
+-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s, at builddir@,$ac_builddir,;t t
+-s, at abs_builddir@,$ac_abs_builddir,;t t
+-s, at top_builddir@,$ac_top_builddir,;t t
+-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s, at INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+- rm -f $tmp/stdin
+- if test x"$ac_file" != x-; then
+- mv $tmp/out $ac_file
+- else
+- cat $tmp/out
+- rm -f $tmp/out
+- fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+-ac_dB='[ ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
++s&@configure_input@&$configure_input&;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++$ac_datarootdir_hack
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
+
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++ rm -f "$tmp/stdin"
+ case $ac_file in
+- - | *:- | *:-:* ) # input from stdin
+- cat >$tmp/stdin
+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- * ) ac_file_in=$ac_file.in ;;
++ -) cat "$tmp/out"; rm -f "$tmp/out";;
++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
+-
+- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+- # First look for the input files in the build tree, otherwise in the
+- # src tree.
+- ac_file_inputs=`IFS=:
+- for f in $ac_file_in; do
+- case $f in
+- -) echo $tmp/stdin ;;
+- [\\/$]*)
+- # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- # Do quote $f, to prevent DOS paths from being IFS'd.
+- echo "$f";;
+- *) # Relative
+- if test -f "$f"; then
+- # Build tree
+- echo "$f"
+- elif test -f "$srcdir/$f"; then
+- # Source tree
+- echo "$srcdir/$f"
+- else
+- # /dev/null tree
+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- fi;;
+- esac
+- done` || { (exit 1); exit 1; }
+- # Remove the trailing spaces.
+- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+-
++ ;;
++ :H)
++ #
++ # CONFIG_HEADER
++ #
+ _ACEOF
+
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h. The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status. Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless. Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status. If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless. But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
++ac_dB='\\)[ (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
+
+-# This sed command replaces #undef with comments. This is necessary, for
++uniq confdefs.h |
++ sed -n '
++ t rset
++ :rset
++ s/^[ ]*#[ ]*define[ ][ ]*//
++ t ok
++ d
++ :ok
++ s/[\\&,]/\\&/g
++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++ ' >>conftest.defines
++
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments. This is necessary, for
+ # example, in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[ #]*u.*,/* & */,' >>conftest.defines
++
++# Break up conftest.defines:
++ac_max_sed_lines=50
++
++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
++
++while :
++do
++ # Write a here document:
++ cat >>$CONFIG_STATUS <<_ACEOF
++ # First, check the format of the line:
++ cat >"\$tmp/defines.sed" <<\\CEOF
++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
++b
++:def
+ _ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo ' :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+- # Write a limited-size here document to $tmp/defines.sed.
+- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+- # Speed up: don't consider the non `#define' lines.
+- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+- # Work around the forget-to-reset-the-flag bug.
+- echo 't clr' >>$CONFIG_STATUS
+- echo ': clr' >>$CONFIG_STATUS
+- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ echo 'CEOF
+- sed -f $tmp/defines.sed $tmp/in >$tmp/out
+- rm -f $tmp/in
+- mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++ grep . conftest.tail >/dev/null || break
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
+ done
+-rm -f conftest.defines
+-echo ' fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+- # Write a limited-size here document to $tmp/undefs.sed.
+- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+- # Speed up: don't consider the non `#undef'
+- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+- # Work around the forget-to-reset-the-flag bug.
+- echo 't clr' >>$CONFIG_STATUS
+- echo ': clr' >>$CONFIG_STATUS
+- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+- echo 'CEOF
+- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+- rm -f $tmp/in
+- mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+- rm -f conftest.undefs
+- mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
++rm -f conftest.defines conftest.tail
+
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
+ cat >>$CONFIG_STATUS <<\_ACEOF
+- # 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. */
+- if test x"$ac_file" = x-; then
+- echo "/* Generated by configure. */" >$tmp/config.h
+- else
+- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
+- fi
+- cat $tmp/in >>$tmp/config.h
+- rm -f $tmp/in
+ if test x"$ac_file" != x-; then
+- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++ echo "/* $configure_input */" >"$tmp/config.h"
++ cat "$ac_result" >>"$tmp/config.h"
++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$ac_file" : 'X\(//\)[^/]' \| \
+- X"$ac_file" : 'X\(//\)$' \| \
+- X"$ac_file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+- { (exit 1); exit 1; }; }; }
+-
+ rm -f $ac_file
+- mv $tmp/config.h $ac_file
++ mv "$tmp/config.h" $ac_file
+ fi
+ else
+- cat $tmp/config.h
+- rm -f $tmp/config.h
++ echo "/* $configure_input */"
++ cat "$ac_result"
+ fi
++ rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+@@ -45706,135 +46262,39 @@
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+ $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+- X$ac_file : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+ echo X$ac_file |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$ac_dest" : 'X\(//\)[^/]' \| \
+- X"$ac_dest" : 'X\(//\)$' \| \
+- X"$ac_dest" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+- { (exit 1); exit 1; }; }; }
+-
+- ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+- .) # No --srcdir option. We are building in place.
+- ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
+- ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++ esac
+
+
+- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+- case $ac_dest in
+- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++ case $ac_file$ac_mode in
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+@@ -45844,18 +46304,29 @@
+ # each Makefile.in and add a new line on top of each file to say so.
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+- dirpart=`(dirname "$mf") 2>/dev/null ||
++ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+- X"$mf" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$mf" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ else
+ continue
+ fi
+@@ -45877,53 +46348,79 @@
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+- fdir=`(dirname "$file") 2>/dev/null ||
++ fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+- X"$file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p $dirpart/$fdir
+- else
+- as_dir=$dirpart/$fdir
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ { as_dir=$dirpart/$fdir
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ test -d "$as_dir" && break
+ done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+-
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+ ;;
++
+ esac
+-done
+-_ACEOF
++done # for ac_tag
+
+-cat >>$CONFIG_STATUS <<\_ACEOF
+
+ { (exit 0); exit 0; }
+ _ACEOF
--- configure.in
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdegraphics, "3.5.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdegraphics, "3.5.3") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -117,12 +119,13 @@
-
- AC_MSG_CHECKING(for gPhoto2)
- # the pkg-config way first, if user did not use --with-
--AC_CHECK_PROG(gphoto_devel,gphoto2-config,gphoto2-config,no)
--if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto_devel" = "gphoto2-config"
-+AC_CHECK_PROG(gphoto2_config,gphoto2-config,gphoto2-config,no)
-+AC_CHECK_PROG(gphoto2_port_config,gphoto2-port-config,gphoto2-port-config,no)
-+if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto2_config" != "no" -a "$gphoto2_port_config" != "no"
- then
- with_kamera="yes"
-- GPHOTO2_INCS="`$gphoto_devel --cflags`"
-- GPHOTO2_LIBS="`$gphoto_devel --libs`"
-+ GPHOTO2_INCS="`$gphoto2_config --cflags` `$gphoto2_port_config --cflags`"
-+ GPHOTO2_LIBS="`$gphoto2_config --libs` `$gphoto2_port_config --libs`"
- else
- #
- # Search for gphoto2 include files.
--- doc/kamera/Makefile.in
+++ doc/kamera/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16956,17 +37294,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16975,7 +37359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16989,7 +37373,15 @@
mostlyclean-libtool:
--- doc/kcoloredit/Makefile.in
+++ doc/kcoloredit/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16999,17 +37391,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17018,7 +37456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17032,7 +37470,15 @@
mostlyclean-libtool:
--- doc/kdvi/Makefile.in
+++ doc/kdvi/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17042,17 +37488,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17061,7 +37553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17073,7 +37565,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -595,10 +599,10 @@
+@@ -596,10 +605,10 @@
.NOEXPORT:
#>+ 2
@@ -17082,23 +37574,23 @@
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty
@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
-@@ -625,20 +629,20 @@
+@@ -626,20 +635,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi
- @for base in kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png ; do \
-+ @for base in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
++ @for base in optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
done
uninstall-nls:
- for base in kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png ; do \
-+ for base in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
++ for base in optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
done
@@ -17106,13 +37598,21 @@
#>+ 5
distdir-nls:
- for file in kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png ; do \
-+ for file in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
++ for file in optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kgamma/Makefile.in
+++ doc/kgamma/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17122,17 +37622,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17141,7 +37687,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17155,7 +37701,15 @@
mostlyclean-libtool:
--- doc/kghostview/Makefile.in
+++ doc/kghostview/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17165,17 +37719,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17184,7 +37784,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17198,7 +37798,15 @@
mostlyclean-libtool:
--- doc/kiconedit/Makefile.in
+++ doc/kiconedit/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17208,17 +37816,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17227,7 +37881,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17239,42 +37893,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -598,7 +602,7 @@
- KDE_DIST=Makefile.in kiconedit-configuration.png index.docbook Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kiconedit-configuration.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kiconedit-configuration.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
-@@ -625,20 +629,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit
-- @for base in index.docbook kiconedit-configuration.png ; do \
-+ @for base in kiconedit-configuration.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook kiconedit-configuration.png ; do \
-+ for base in kiconedit-configuration.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook kiconedit-configuration.png ; do \
-+ for file in kiconedit-configuration.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
--- doc/kolourpaint/Makefile.in
+++ doc/kolourpaint/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17284,17 +37913,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17303,7 +37978,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17315,32 +37990,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -595,10 +599,10 @@
+@@ -596,10 +605,10 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png fcc_std_text.png selections_opaque_transparent.png image_skew.png kolourpaint-main.png tool_rectangles.png brush_shapes.png spraycan_patterns.png lines_30_deg.png tool_free_form_selection.png image_reduce_colors.png line_width.png lines_45_deg.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png color_box.png image_resize_scale.png tool_rect_selection.png tool_elliptical_selection.png fill_style.png tool_polyline.png tool_ellipse.png text_zoom_grid.png image_rotate.png tool_line.png Makefile.in tool_selections.png tool_brush.png tool_polystar.png fcc_trans_text.png fill_color_similarity.png tool_text.png image_flip.png tool_rectangle.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png view_thumbnails.png tool_spraycan.png tool_flood_fill.png tool_eraser.png Makefile.am lines_30_45_deg.png index.cache.bz2
-+KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png fcc_std_text.png selections_opaque_transparent.png image_skew.png kolourpaint-main.png tool_rectangles.png brush_shapes.png spraycan_patterns.png tool_free_form_selection.png lines_30_deg.png image_reduce_colors.png lines_45_deg.png line_width.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png image_resize_scale.png color_box.png tool_rect_selection.png tool_elliptical_selection.png fill_style.png tool_polyline.png image_rotate.png tool_ellipse.png tool_line.png text_zoom_grid.png Makefile.in tool_selections.png tool_brush.png fcc_trans_text.png tool_polystar.png fill_color_similarity.png image_flip.png tool_rectangle.png tool_text.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png view_thumbnails.png tool_flood_fill.png tool_eraser.png tool_spraycan.png Makefile.am lines_30_45_deg.png index.cache.bz2
++KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png selections_opaque_transparent.png fcc_std_text.png image_skew.png kolourpaint-main.png tool_rectangles.png brush_shapes.png spraycan_patterns.png lines_30_deg.png tool_free_form_selection.png image_reduce_colors.png line_width.png lines_45_deg.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png tool_rect_selection.png color_box.png image_resize_scale.png tool_elliptical_selection.png tool_polyline.png fill_style.png text_zoom_grid.png image_rotate.png tool_line.png tool_ellipse.png Makefile.in tool_brush.png tool_selections.png fcc_trans_text.png tool_polystar.png fill_color_similarity.png image_flip.png tool_text.png tool_rectangle.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png tool_spraycan.png tool_eraser.png tool_flood_fill.png view_thumbnails.png Makefile.am lines_30_45_deg.png index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -625,20 +629,20 @@
+@@ -626,20 +635,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint
- @for base in text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png ; do \
-+ @for base in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
++ @for base in tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
done
uninstall-nls:
- for base in text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png ; do \
-+ for base in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
++ for base in tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
done
@@ -17348,13 +38023,21 @@
#>+ 5
distdir-nls:
- for file in text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png ; do \
-+ for file in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
++ for file in tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kooka/Makefile.in
+++ doc/kooka/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17364,17 +38047,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17383,7 +38112,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17395,32 +38124,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -595,10 +599,10 @@
+@@ -596,10 +605,10 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png shortcut0.png ocr-select.png Makefile.in toolbar1.png toolbar.png Makefile.am index.cache.bz2
-+KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png ocr-select.png shortcut0.png Makefile.in toolbar1.png toolbar.png Makefile.am index.cache.bz2
++KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png ocr-select.png shortcut0.png Makefile.in toolbar.png toolbar1.png Makefile.am index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -625,20 +629,20 @@
+@@ -626,20 +635,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka
- @for base in kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png ; do \
-+ @for base in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
++ @for base in toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
done
uninstall-nls:
- for base in kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png ; do \
-+ for base in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
++ for base in toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
done
@@ -17428,13 +38157,21 @@
#>+ 5
distdir-nls:
- for file in kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png ; do \
-+ for file in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
++ for file in toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kpdf/Makefile.in
+++ doc/kpdf/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17444,17 +38181,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17463,7 +38246,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17475,42 +38258,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -598,7 +602,7 @@
- KDE_DIST=index.docbook configure.png Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook configure.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configure.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
-@@ -625,20 +629,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf
-- @for base in index.docbook configure.png ; do \
-+ @for base in configure.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook configure.png ; do \
-+ for base in configure.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook configure.png ; do \
-+ for file in configure.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
--- doc/kpovmodeler/Makefile.in
+++ doc/kpovmodeler/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17520,17 +38278,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17539,7 +38343,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17551,32 +38355,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -595,10 +599,10 @@
+@@ -596,10 +605,10 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=tutorial01-sphere-render-nocolor.png cr22-action-pmfinish.png cr22-action-pmrender.png texturepreview.png defaultviewlayout.png tutorial01-plane-tree-translate.png cr22-action-pminterior.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png controlpoints.png tutorial01-light-dialog.png dockwidget.png tutorial01-camera-dialog.png rendermodesize.png tutorial01-ground-wrong-colors-render.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-2.png index.docbook tutorial01-light-graphic.png cr22-action-pmlight.png objectpropertiesview.png cameraview.png tutorial01-ground-render.png cr22-action-pmsphere.png tutorial01-sphere-dialog.png rendermodesselection.png renderwindow.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png objecttree.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmcolorlist.png Makefile.in rendersettingsicon.png tutorial01-ground-pigment.png dockwidgettab.png insertaspopup.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png rendermodequality.png topview.png rendericon.png rendermodeoutput.png tutorial01-plane-dialog.png Makefile.am tutorial01-ground-solid-color-1.png tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
-+KDE_DIST=tutorial01-sphere-render-nocolor.png cr22-action-pmfinish.png cr22-action-pmrender.png texturepreview.png defaultviewlayout.png cr22-action-pminterior.png tutorial01-plane-tree-translate.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png controlpoints.png tutorial01-light-dialog.png dockwidget.png tutorial01-camera-dialog.png rendermodesize.png tutorial01-ground-wrong-colors-render.png index.docbook tutorial01-ground-solid-color-2.png cr22-action-pmsolidcolor.png tutorial01-light-graphic.png cr22-action-pmlight.png objectpropertiesview.png cameraview.png cr22-action-pmsphere.png tutorial01-ground-render.png tutorial01-sphere-dialog.png rendermodesselection.png renderwindow.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png objecttree.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmcolorlist.png Makefile.in rendersettingsicon.png tutorial01-ground-pigment.png dockwidgettab.png insertaspopup.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png topview.png rendermodequality.png rendermodeoutput.png rendericon.png tutorial01-plane-dialog.png Makefile.am tutorial01-ground-solid-color-1.png tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
++KDE_DIST=cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-render-nocolor.png texturepreview.png defaultviewlayout.png tutorial01-plane-tree-translate.png cr22-action-pminterior.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png controlpoints.png dockwidget.png tutorial01-camera-dialog.png rendermodesize.png tutorial01-ground-wrong-colors-render.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-2.png index.docbook cr22-action-pmlight.png tutorial01-light-graphic.png objectpropertiesview.png cameraview.png cr22-action-pmsphere.png tutorial01-ground-render.png tutorial01-sphere-dialog.png renderwindow.png rendermodesselection.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png cr22-action-pmpigment.png objecttree.png cr22-action-pmcolorlist.png cr22-action-pmplane.png Makefile.in tutorial01-ground-pigment.png rendersettingsicon.png dockwidgettab.png insertaspopup.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png rendermodequality.png topview.png rendermodeoutput.png rendericon.png tutorial01-plane-dialog.png Makefile.am tutorial01-ground-solid-color-1.png tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -625,20 +629,20 @@
+@@ -626,20 +635,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler
- @for base in index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png ; do \
-+ @for base in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
++ @for base in tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
done
uninstall-nls:
- for base in index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png ; do \
-+ for base in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
++ for base in tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
done
@@ -17584,13 +38388,21 @@
#>+ 5
distdir-nls:
- for file in index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png ; do \
-+ for file in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
++ for file in tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kruler/Makefile.in
+++ doc/kruler/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17600,17 +38412,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17619,7 +38477,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17633,7 +38491,15 @@
mostlyclean-libtool:
--- doc/ksnapshot/Makefile.in
+++ doc/ksnapshot/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17643,17 +38509,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17662,7 +38574,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17674,28 +38586,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -598,7 +602,7 @@
+@@ -599,7 +608,7 @@
KDE_DIST=preview.png index.docbook window.png Makefile.in Makefile.am index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook preview.png window.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preview.png window.png index.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) window.png index.docbook preview.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -625,20 +629,20 @@
+@@ -626,20 +635,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot
- @for base in index.docbook preview.png window.png ; do \
-+ @for base in preview.png window.png index.docbook ; do \
++ @for base in window.png index.docbook preview.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
done
uninstall-nls:
- for base in index.docbook preview.png window.png ; do \
-+ for base in preview.png window.png index.docbook ; do \
++ for base in window.png index.docbook preview.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
done
@@ -17703,13 +38615,21 @@
#>+ 5
distdir-nls:
- for file in index.docbook preview.png window.png ; do \
-+ for file in preview.png window.png index.docbook ; do \
++ for file in window.png index.docbook preview.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kuickshow/Makefile.in
+++ doc/kuickshow/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17719,17 +38639,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17738,7 +38704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17750,9 +38716,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -599,7 +608,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -626,20 +635,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow
+- @for base in screenshot.png index.docbook ; do \
++ @for base in index.docbook screenshot.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in screenshot.png index.docbook ; do \
++ for base in index.docbook screenshot.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in screenshot.png index.docbook ; do \
++ for file in index.docbook screenshot.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kview/Makefile.in
+++ doc/kview/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17762,17 +38769,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17781,7 +38834,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17793,28 +38846,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -598,7 +602,7 @@
+@@ -599,7 +608,7 @@
KDE_DIST=kview-application-configuration.png index.docbook Makefile.in kview-viewer-configuration.png Makefile.am index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kview-application-configuration.png kview-viewer-configuration.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kview-application-configuration.png kview-viewer-configuration.png index.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kview-viewer-configuration.png kview-application-configuration.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -625,20 +629,20 @@
+@@ -626,20 +635,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview
- @for base in index.docbook kview-application-configuration.png kview-viewer-configuration.png ; do \
-+ @for base in kview-application-configuration.png kview-viewer-configuration.png index.docbook ; do \
++ @for base in index.docbook kview-viewer-configuration.png kview-application-configuration.png ; 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 index.docbook kview-application-configuration.png kview-viewer-configuration.png ; do \
-+ for base in kview-application-configuration.png kview-viewer-configuration.png index.docbook ; do \
++ for base in index.docbook kview-viewer-configuration.png kview-application-configuration.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
done
@@ -17822,13 +38875,21 @@
#>+ 5
distdir-nls:
- for file in index.docbook kview-application-configuration.png kview-viewer-configuration.png ; do \
-+ for file in kview-application-configuration.png kview-viewer-configuration.png index.docbook ; do \
++ for file in index.docbook kview-viewer-configuration.png kview-application-configuration.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17838,22 +38899,68 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -423,13 +427,13 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -424,13 +433,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
-SUBDIRS =. kcoloredit kamera kooka kpdf kruler kview kolourpaint kpovmodeler kuickshow kiconedit kghostview ksnapshot kdvi kgamma
-+SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
++SUBDIRS =. ksnapshot kpdf kpovmodeler kamera kuickshow kview kgamma kghostview kooka kolourpaint kiconedit kruler kcoloredit kdvi
#>- all: all-recursive
#>+ 1
all: docs-am all-recursive
@@ -17864,7 +38971,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +471,9 @@
+@@ -468,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17878,7 +38985,15 @@
mostlyclean-libtool:
--- kamera/kcontrol/Makefile.in
+++ kamera/kcontrol/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -167,6 +167,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -261,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17888,17 +39003,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -344,7 +347,8 @@
+@@ -311,18 +315,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -341,8 +343,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -351,6 +356,7 @@
host_cpu = @host_cpu@
-@@ -469,7 +473,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -433,12 +439,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -470,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17907,7 +39068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +511,9 @@
+@@ -508,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17921,7 +39082,15 @@
@$(NORMAL_INSTALL)
--- kamera/kioslave/Makefile.in
+++ kamera/kioslave/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -164,6 +164,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -258,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17931,17 +39100,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,8 @@
+@@ -308,18 +312,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +340,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -348,6 +353,7 @@
host_cpu = @host_cpu@
-@@ -467,7 +471,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -430,12 +436,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -468,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17950,7 +39165,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +509,9 @@
+@@ -506,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17964,7 +39179,15 @@
@$(NORMAL_INSTALL)
--- kamera/Makefile.in
+++ kamera/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -132,6 +132,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -226,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17974,17 +39197,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,7 +312,8 @@
+@@ -276,18 +280,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -306,8 +308,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -316,6 +321,7 @@
host_cpu = @host_cpu@
-@@ -426,7 +430,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17993,7 +39262,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +468,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18007,7 +39276,15 @@
mostlyclean-libtool:
--- kamera/pics/Makefile.in
+++ kamera/pics/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18017,17 +39294,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -409,7 +413,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18036,7 +39359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +451,9 @@
+@@ -448,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18048,54 +39371,59 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,29 +603,29 @@
+@@ -600,29 +609,29 @@
#>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems
+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
-+ $(INSTALL_DATA) $(srcdir)/cr22-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
- $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
+- $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
- $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems
$(INSTALL_DATA) $(srcdir)/cr22-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/camera.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
-- $(INSTALL_DATA) $(srcdir)/cr22-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
++ $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
++ $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
+ $(INSTALL_DATA) $(srcdir)/cr22-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems
- $(INSTALL_DATA) $(srcdir)/cr32-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
-+ $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/camera.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
#>+ 15
force-reedit:
--- kcoloredit/Makefile.in
+++ kcoloredit/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -187,6 +187,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18105,17 +39433,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -364,7 +367,8 @@
+@@ -331,18 +335,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,8 +363,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -371,6 +376,7 @@
host_cpu = @host_cpu@
-@@ -505,7 +509,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -453,12 +459,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -506,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18124,7 +39498,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -543,9 +547,9 @@
+@@ -544,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18136,7 +39510,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -858,18 +862,18 @@
+@@ -859,18 +868,18 @@
.NOEXPORT:
#>+ 3
@@ -18161,7 +39535,7 @@
#>+ 3
kcoloreditdoc.moc: $(srcdir)/kcoloreditdoc.h
-@@ -943,7 +947,7 @@
+@@ -944,7 +953,7 @@
#>+ 3
clean-metasources:
@@ -18170,9 +39544,29 @@
#>+ 2
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
-@@ -1006,7 +1010,7 @@
+@@ -956,17 +965,17 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcolorchooser.png
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcoloredit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcolorchooser.png
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcolorchooser.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcoloredit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcolorchooser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
+ #>+ 15
+ force-reedit:
+@@ -1007,7 +1016,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
@@ -18181,7 +39575,15 @@
echo "#define KDE_USE_FINAL 1" >> kcoloredit.all_cpp.final; \
--- kdvi/Makefile.in
+++ kdvi/Makefile.in
-@@ -320,6 +320,9 @@
+@@ -226,6 +226,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -320,6 +321,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18191,17 +39593,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,8 @@
+@@ -370,18 +374,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,8 +402,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -410,6 +415,7 @@
host_cpu = @host_cpu@
-@@ -580,7 +584,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -492,12 +498,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -18210,7 +39658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +622,9 @@
+@@ -619,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18222,7 +39670,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1198,13 +1202,6 @@
+@@ -1199,13 +1208,6 @@
mocs: dviPageCache.moc
#>+ 3
@@ -18236,7 +39684,7 @@
psgs.moc: $(srcdir)/psgs.h
$(MOC) $(srcdir)/psgs.h -o psgs.moc
-@@ -1212,11 +1209,11 @@
+@@ -1213,11 +1215,11 @@
mocs: psgs.moc
#>+ 3
@@ -18251,80 +39699,44 @@
#>+ 3
fontprogress.moc: $(srcdir)/fontprogress.h
-@@ -1226,18 +1223,18 @@
+@@ -1227,6 +1229,13 @@
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
--mocs: fontpool.moc
++
++#>+ 2
+mocs: infodialog.moc
++
++#>+ 3
+ fontpool.moc: $(srcdir)/fontpool.h
+ $(MOC) $(srcdir)/fontpool.h -o fontpool.moc
- #>+ 3
--kdvi_multipage.moc: $(srcdir)/kdvi_multipage.h
-- $(MOC) $(srcdir)/kdvi_multipage.h -o kdvi_multipage.moc
-+fontpool.moc: $(srcdir)/fontpool.h
-+ $(MOC) $(srcdir)/fontpool.h -o fontpool.moc
+@@ -1270,10 +1279,10 @@
- #>+ 2
--mocs: kdvi_multipage.moc
-+mocs: fontpool.moc
-
#>+ 3
- optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
-@@ -1247,18 +1244,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: renderedDviPagePixmap.moc
-+mocs: kdvi_multipage.moc
-
- #>+ 3
--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
-@@ -1268,11 +1265,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 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
++ -rm -f dviPageCache.moc psgs.moc dviWidget.moc fontprogress.moc infodialog.moc fontpool.moc kdvi_multipage.moc optionDialogSpecialWidget.moc renderedDviPagePixmap.moc optionDialogFontsWidget.moc dviRenderer.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 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
++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 fontpool.h dvisourcesplitter.h Makefile.am kdvi_part.rc
#>+ 5
clean-ui:
--- kdvi/pix/Makefile.in
+++ kdvi/pix/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18334,17 +39746,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -409,7 +413,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18353,7 +39811,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +451,9 @@
+@@ -448,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18365,42 +39823,47 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,23 +603,23 @@
+@@ -600,23 +609,23 @@
#>+ 19
install-kde-icons:
-- $(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/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/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/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/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/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
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/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/16x16/apps/kdvi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/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
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
#>+ 15
force-reedit:
--- kfax/Makefile.in
+++ kfax/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -172,6 +172,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -266,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18410,17 +39873,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -349,7 +352,8 @@
+@@ -316,18 +320,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,8 +348,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -356,6 +361,7 @@
host_cpu = @host_cpu@
-@@ -483,7 +487,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -438,12 +444,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -484,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18429,7 +39938,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +525,9 @@
+@@ -522,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18441,39 +39950,47 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -875,23 +879,23 @@
+@@ -876,23 +885,23 @@
#>+ 19
install-kde-icons:
+- $(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/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/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
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
+ -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/16x16/apps/kfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
#>+ 15
force-reedit:
--- kfaxview/libkfaximage/Makefile.in
+++ kfaxview/libkfaximage/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18483,17 +40000,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -465,7 +469,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -466,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18502,7 +40065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +507,9 @@
+@@ -504,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18516,7 +40079,15 @@
@$(NORMAL_INSTALL)
--- kfaxview/Makefile.in
+++ kfaxview/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -190,6 +190,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18526,17 +40097,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,8 @@
+@@ -334,18 +338,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -364,8 +366,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -374,6 +379,7 @@
host_cpu = @host_cpu@
-@@ -509,7 +513,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -456,12 +462,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -510,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18545,7 +40162,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -547,9 +551,9 @@
+@@ -548,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18557,39 +40174,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1144,23 +1148,23 @@
+@@ -1145,23 +1154,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/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/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/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
++ $(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/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
+- $(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/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/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/22x22/apps/kfaxview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/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
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
#>+ 15
force-reedit:
--- kfile-plugins/bmp/Makefile.in
+++ kfile-plugins/bmp/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18599,17 +40227,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18618,7 +40292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18632,7 +40306,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/dds/Makefile.in
+++ kfile-plugins/dds/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18642,17 +40324,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18661,7 +40389,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18675,7 +40403,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/dvi/Makefile.in
+++ kfile-plugins/dvi/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18685,17 +40421,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18704,7 +40486,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18718,7 +40500,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/exr/Makefile.in
+++ kfile-plugins/exr/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -162,6 +162,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -256,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18728,17 +40518,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,8 @@
+@@ -306,18 +310,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
-@@ -473,7 +477,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -474,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18747,7 +40583,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +515,9 @@
+@@ -512,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18761,7 +40597,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/gif/Makefile.in
+++ kfile-plugins/gif/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18771,17 +40615,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -471,7 +475,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -472,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18790,7 +40680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +513,9 @@
+@@ -510,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18804,7 +40694,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/ico/Makefile.in
+++ kfile-plugins/ico/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18814,17 +40712,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18833,7 +40777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18847,7 +40791,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/jpeg/Makefile.in
+++ kfile-plugins/jpeg/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -164,6 +164,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -258,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18857,17 +40809,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,8 @@
+@@ -308,18 +312,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +340,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -348,6 +353,7 @@
host_cpu = @host_cpu@
-@@ -474,7 +478,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -430,12 +436,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -475,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18876,7 +40874,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +516,9 @@
+@@ -513,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18890,7 +40888,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/Makefile.in
+++ kfile-plugins/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -132,6 +132,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -226,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18900,17 +40906,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,7 +312,8 @@
+@@ -276,18 +280,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -306,8 +308,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -316,6 +321,7 @@
host_cpu = @host_cpu@
-@@ -431,7 +435,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -432,7 +441,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18919,7 +40971,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +473,9 @@
+@@ -470,9 +479,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18933,7 +40985,15 @@
mostlyclean-libtool:
--- kfile-plugins/pcx/Makefile.in
+++ kfile-plugins/pcx/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -162,6 +162,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -256,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18943,17 +41003,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,8 @@
+@@ -306,18 +310,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
-@@ -469,7 +473,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -470,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18962,7 +41068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +511,9 @@
+@@ -508,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18976,7 +41082,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/pdf/Makefile.in
+++ kfile-plugins/pdf/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -162,6 +162,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -256,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18986,17 +41100,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,8 @@
+@@ -306,18 +310,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
-@@ -471,7 +475,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -472,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19005,7 +41165,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +513,9 @@
+@@ -510,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19019,7 +41179,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/png/Makefile.in
+++ kfile-plugins/png/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19029,17 +41197,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19048,7 +41262,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19062,7 +41276,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/pnm/Makefile.in
+++ kfile-plugins/pnm/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19072,17 +41294,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19091,7 +41359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19105,7 +41373,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/ps/Makefile.in
+++ kfile-plugins/ps/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -168,6 +168,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -262,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19115,17 +41391,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -345,7 +348,8 @@
+@@ -312,18 +316,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -342,8 +344,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -352,6 +357,7 @@
host_cpu = @host_cpu@
-@@ -480,7 +484,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -434,12 +440,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -481,7 +490,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19134,7 +41456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +522,9 @@
+@@ -519,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19148,7 +41470,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/raw/Makefile.in
+++ kfile-plugins/raw/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -172,6 +172,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -266,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19158,17 +41488,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -349,7 +352,8 @@
+@@ -316,18 +320,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,8 +348,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -356,6 +361,7 @@
host_cpu = @host_cpu@
-@@ -481,7 +485,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -438,12 +444,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -19177,7 +41553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +523,9 @@
+@@ -520,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19191,7 +41567,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/rgb/Makefile.in
+++ kfile-plugins/rgb/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19201,17 +41585,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19220,7 +41650,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19234,7 +41664,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/tga/Makefile.in
+++ kfile-plugins/tga/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19244,17 +41682,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19263,7 +41747,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19277,7 +41761,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/tiff/Makefile.in
+++ kfile-plugins/tiff/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -162,6 +162,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -256,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19287,17 +41779,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,8 @@
+@@ -306,18 +310,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
-@@ -469,7 +473,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -470,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19306,7 +41844,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +511,9 @@
+@@ -508,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19320,7 +41858,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/xbm/Makefile.in
+++ kfile-plugins/xbm/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19330,17 +41876,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19349,7 +41941,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19363,7 +41955,15 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/xpm/Makefile.in
+++ kfile-plugins/xpm/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19373,17 +41973,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -468,7 +472,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -469,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19392,7 +42038,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +510,9 @@
+@@ -507,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19406,7 +42052,15 @@
@$(NORMAL_INSTALL)
--- kgamma/kcmkgamma/Makefile.in
+++ kgamma/kcmkgamma/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -176,6 +176,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -270,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19416,17 +42070,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -353,7 +356,8 @@
+@@ -320,18 +324,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,8 +352,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -360,6 +365,7 @@
host_cpu = @host_cpu@
-@@ -481,7 +485,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -442,12 +448,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19435,7 +42135,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +523,9 @@
+@@ -520,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19447,39 +42147,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -925,22 +929,22 @@
- mocs: displaynumber.moc
-
- #>+ 3
--gammactrl.moc: $(srcdir)/gammactrl.h
-- $(MOC) $(srcdir)/gammactrl.h -o gammactrl.moc
-+kgamma.moc: $(srcdir)/kgamma.h
-+ $(MOC) $(srcdir)/kgamma.h -o kgamma.moc
-
- #>+ 2
--mocs: gammactrl.moc
-+mocs: kgamma.moc
-
- #>+ 3
--kgamma.moc: $(srcdir)/kgamma.h
-- $(MOC) $(srcdir)/kgamma.h -o kgamma.moc
-+gammactrl.moc: $(srcdir)/gammactrl.h
-+ $(MOC) $(srcdir)/gammactrl.h -o gammactrl.moc
-
- #>+ 2
--mocs: kgamma.moc
-+mocs: gammactrl.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f displaynumber.moc gammactrl.moc kgamma.moc
-+ -rm -f displaynumber.moc kgamma.moc gammactrl.moc
-
- #>+ 2
- 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
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19489,17 +42167,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -423,7 +427,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -424,7 +433,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19508,7 +42232,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +465,9 @@
+@@ -462,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19520,9 +42244,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -627,23 +636,23 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=rgbscale.png hi48-app-kgamma.png greyscale.png cmyscale.png background.png hi16-app-kgamma.png midgrey.png Makefile.in lightgrey.png darkgrey.png hi32-app-kgamma.png Makefile.am
++KDE_DIST=rgbscale.png hi48-app-kgamma.png greyscale.png background.png cmyscale.png hi16-app-kgamma.png midgrey.png Makefile.in lightgrey.png darkgrey.png hi32-app-kgamma.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgamma.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgamma.png
+
+ #>+ 15
--- kgamma/Makefile.in
+++ kgamma/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -132,6 +132,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -226,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19532,17 +42292,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,7 +312,8 @@
+@@ -276,18 +280,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -306,8 +308,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -316,6 +321,7 @@
host_cpu = @host_cpu@
-@@ -426,7 +430,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19551,7 +42357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +468,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19565,7 +42371,15 @@
mostlyclean-libtool:
--- kgamma/xf86gammacfg/Makefile.in
+++ kgamma/xf86gammacfg/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -151,6 +151,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19575,17 +42389,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -328,7 +331,8 @@
+@@ -295,18 +299,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,8 +327,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -335,6 +340,7 @@
host_cpu = @host_cpu@
-@@ -451,7 +455,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -417,12 +423,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -452,7 +461,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19594,7 +42454,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +493,9 @@
+@@ -490,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19608,7 +42468,15 @@
@$(NORMAL_INSTALL)
--- kghostview/data/Makefile.in
+++ kghostview/data/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19618,17 +42486,69 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -420,7 +424,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = ${kde_datadir}/kghostview
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -415,13 +424,12 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ ps_DATA = pdf_sec.ps
+-psdir = ${kde_datadir}/kghostview
+ #>- all: all-am
+ #>+ 1
all: docs-am all-am
.SUFFIXES:
@@ -19637,7 +42557,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +462,9 @@
+@@ -459,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19651,7 +42571,15 @@
mostlyclean-libtool:
--- kghostview/Makefile.in
+++ kghostview/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -235,6 +235,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -329,6 +330,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19661,17 +42589,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,8 @@
+@@ -379,18 +383,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -419,6 +424,7 @@
host_cpu = @host_cpu@
-@@ -580,7 +584,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -501,12 +507,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -19680,7 +42654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +622,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19692,7 +42666,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1299,18 +1303,18 @@
+@@ -1324,18 +1333,18 @@
mocs: kgvmainwidget.moc
#>+ 3
@@ -19717,7 +42691,7 @@
#>+ 3
viewcontrol.moc: $(srcdir)/viewcontrol.h
-@@ -1344,10 +1348,10 @@
+@@ -1369,10 +1378,10 @@
#>+ 3
clean-metasources:
@@ -19725,48 +42699,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 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
+-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 kghostview_part.desktop 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 kghostview_part.desktop version.h generalsettingswidget.ui.h kgv.h Makefile.am hi128-app-kghostview.png
#>+ 5
clean-ui:
-@@ -1369,26 +1373,26 @@
+@@ -1394,26 +1403,26 @@
#>+ 22
install-kde-icons:
-+ $(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/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/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/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/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/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)/hicolor/48x48/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/22x22/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/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/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:
-@@ -1441,7 +1445,7 @@
+@@ -1466,7 +1475,7 @@
rm -f libdscparse_la.all_cpp.final libdscparse_la.all_cpp.files
#>+ 11
@@ -19777,7 +42751,15 @@
echo "#define KDE_USE_FINAL 1" >> libkghostviewlib_la.all_cpp.final; \
--- kiconedit/Makefile.in
+++ kiconedit/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -185,6 +185,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19787,17 +42769,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,8 @@
+@@ -329,18 +333,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -359,8 +361,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -369,6 +374,7 @@
host_cpu = @host_cpu@
-@@ -495,7 +499,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -451,12 +457,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -496,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19806,7 +42834,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -533,9 +537,9 @@
+@@ -534,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19818,71 +42846,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -971,18 +975,18 @@
- mocs: kicon.moc
+@@ -951,11 +960,11 @@
+ mocs: knew.moc
#>+ 3
--kiconconfig.moc: $(srcdir)/kiconconfig.h
-- $(MOC) $(srcdir)/kiconconfig.h -o kiconconfig.moc
-+kcolorgrid.moc: $(srcdir)/kcolorgrid.h
-+ $(MOC) $(srcdir)/kcolorgrid.h -o kcolorgrid.moc
+-kicongrid.moc: $(srcdir)/kicongrid.h
+- $(MOC) $(srcdir)/kicongrid.h -o kicongrid.moc
++kicon.moc: $(srcdir)/kicon.h
++ $(MOC) $(srcdir)/kicon.h -o kicon.moc
#>+ 2
--mocs: kiconconfig.moc
-+mocs: kcolorgrid.moc
+-mocs: kicongrid.moc
++mocs: kicon.moc
#>+ 3
--kcolorgrid.moc: $(srcdir)/kcolorgrid.h
-- $(MOC) $(srcdir)/kcolorgrid.h -o kcolorgrid.moc
-+kiconconfig.moc: $(srcdir)/kiconconfig.h
-+ $(MOC) $(srcdir)/kiconconfig.h -o kiconconfig.moc
+ kiconedit.moc: $(srcdir)/kiconedit.h
+@@ -965,11 +974,11 @@
+ mocs: kiconedit.moc
- #>+ 2
--mocs: kcolorgrid.moc
-+mocs: kiconconfig.moc
-
#>+ 3
- kiconcolors.moc: $(srcdir)/kiconcolors.h
-@@ -992,22 +996,22 @@
- mocs: kiconcolors.moc
+-kicon.moc: $(srcdir)/kicon.h
+- $(MOC) $(srcdir)/kicon.h -o kicon.moc
++kicongrid.moc: $(srcdir)/kicongrid.h
++ $(MOC) $(srcdir)/kicongrid.h -o kicongrid.moc
- #>+ 3
--kresize.moc: $(srcdir)/kresize.h
-- $(MOC) $(srcdir)/kresize.h -o kresize.moc
-+palettetoolbar.moc: $(srcdir)/palettetoolbar.h
-+ $(MOC) $(srcdir)/palettetoolbar.h -o palettetoolbar.moc
-
#>+ 2
--mocs: kresize.moc
-+mocs: palettetoolbar.moc
+-mocs: kicon.moc
++mocs: kicongrid.moc
#>+ 3
--palettetoolbar.moc: $(srcdir)/palettetoolbar.h
-- $(MOC) $(srcdir)/palettetoolbar.h -o palettetoolbar.moc
-+kresize.moc: $(srcdir)/kresize.h
-+ $(MOC) $(srcdir)/kresize.h -o kresize.moc
+ kiconconfig.moc: $(srcdir)/kiconconfig.h
+@@ -1008,7 +1017,7 @@
- #>+ 2
--mocs: palettetoolbar.moc
-+mocs: kresize.moc
-
#>+ 3
clean-metasources:
- -rm -f knew.moc kicongrid.moc kiconedit.moc kicon.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
-+ -rm -f knew.moc kicongrid.moc kiconedit.moc kicon.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc palettetoolbar.moc kresize.moc
++ -rm -f knew.moc kicon.moc kiconedit.moc kicongrid.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
#>+ 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
-@@ -1054,7 +1058,7 @@
+@@ -1055,7 +1064,7 @@
#>+ 11
-kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicon.moc kiconedit.moc kicongrid.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
-+kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicon.moc kiconedit.moc kicongrid.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc palettetoolbar.moc kresize.moc
++kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicongrid.moc kiconedit.moc kicon.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
@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; \
-@@ -1097,8 +1101,8 @@
+@@ -1098,8 +1107,8 @@
knew.lo: knew.moc
kiconconfig.o: kiconconfig.moc
kiconcolors.o: kiconcolors.moc
@@ -19894,7 +42906,15 @@
nmcheck:
--- kiconedit/pics/icons/Makefile.in
+++ kiconedit/pics/icons/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19904,17 +42924,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -423,7 +427,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -424,7 +433,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19923,7 +42989,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +465,9 @@
+@@ -462,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19937,7 +43003,15 @@
mostlyclean-libtool:
--- kiconedit/pics/Makefile.in
+++ kiconedit/pics/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19947,17 +43021,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -426,7 +430,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19966,7 +43086,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +468,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19978,30 +43098,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -766,17 +770,17 @@
+@@ -765,20 +774,20 @@
+
+ #>+ 16
install-kde-icons:
- $(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/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/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/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/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
uninstall-kde-icons:
- -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/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/32x32/apps/kiconedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
#>+ 15
+ force-reedit:
--- kiconedit/pics/toolbar/Makefile.in
+++ kiconedit/pics/toolbar/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20011,17 +43145,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -444,7 +448,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20030,7 +43210,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +486,9 @@
+@@ -483,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20042,18 +43222,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +647,7 @@
+@@ -644,7 +653,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
-+KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
++KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
#>+ 2
docs-am:
--- kmrml/kmrml/kcontrol/Makefile.in
+++ kmrml/kmrml/kcontrol/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -168,6 +168,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -262,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20063,17 +43251,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -345,7 +348,8 @@
+@@ -312,18 +316,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -342,8 +344,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -352,6 +357,7 @@
host_cpu = @host_cpu@
-@@ -475,7 +479,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -434,12 +440,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -476,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20082,7 +43316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -513,9 +517,9 @@
+@@ -514,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20096,7 +43330,15 @@
@$(NORMAL_INSTALL)
--- kmrml/kmrml/lib/Makefile.in
+++ kmrml/kmrml/lib/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -154,6 +154,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -248,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20106,17 +43348,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -331,7 +334,8 @@
+@@ -298,18 +302,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -328,8 +330,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -338,6 +343,7 @@
host_cpu = @host_cpu@
-@@ -459,7 +463,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -420,12 +426,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -460,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20125,7 +43413,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +501,9 @@
+@@ -498,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20139,7 +43427,15 @@
clean-noinstLTLIBRARIES:
--- kmrml/kmrml/Makefile.in
+++ kmrml/kmrml/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -218,6 +218,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -312,6 +313,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20149,17 +43445,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -395,7 +398,8 @@
+@@ -362,18 +366,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,8 +394,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -402,6 +407,7 @@
host_cpu = @host_cpu@
-@@ -543,7 +547,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -484,12 +490,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20168,7 +43510,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +585,9 @@
+@@ -582,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20180,52 +43522,109 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1166,18 +1170,18 @@
- mocs: browser.moc
+@@ -1146,46 +1155,46 @@
+ mrmlsearch_DEPENDENCIES = libkdeinit_mrmlsearch.la
#>+ 3
+-mrml_part.moc: $(srcdir)/mrml_part.h
+- $(MOC) $(srcdir)/mrml_part.h -o mrml_part.moc
++browser.moc: $(srcdir)/browser.h
++ $(MOC) $(srcdir)/browser.h -o browser.moc
+
+ #>+ 2
+-mocs: mrml_part.moc
++mocs: browser.moc
+
+ #>+ 3
+-collectioncombo.moc: $(srcdir)/collectioncombo.h
+- $(MOC) $(srcdir)/collectioncombo.h -o collectioncombo.moc
++algorithmdialog.moc: $(srcdir)/algorithmdialog.h
++ $(MOC) $(srcdir)/algorithmdialog.h -o algorithmdialog.moc
+
+ #>+ 2
+-mocs: collectioncombo.moc
++mocs: algorithmdialog.moc
+
+ #>+ 3
+-browser.moc: $(srcdir)/browser.h
+- $(MOC) $(srcdir)/browser.h -o browser.moc
++algorithmcombo.moc: $(srcdir)/algorithmcombo.h
++ $(MOC) $(srcdir)/algorithmcombo.h -o algorithmcombo.moc
+
+ #>+ 2
+-mocs: browser.moc
++mocs: algorithmcombo.moc
+
+ #>+ 3
-algorithmdialog.moc: $(srcdir)/algorithmdialog.h
- $(MOC) $(srcdir)/algorithmdialog.h -o algorithmdialog.moc
-+loader.moc: $(srcdir)/loader.h
-+ $(MOC) $(srcdir)/loader.h -o loader.moc
++mrml_part.moc: $(srcdir)/mrml_part.h
++ $(MOC) $(srcdir)/mrml_part.h -o mrml_part.moc
#>+ 2
-mocs: algorithmdialog.moc
-+mocs: loader.moc
++mocs: mrml_part.moc
#>+ 3
-loader.moc: $(srcdir)/loader.h
- $(MOC) $(srcdir)/loader.h -o loader.moc
-+algorithmdialog.moc: $(srcdir)/algorithmdialog.h
-+ $(MOC) $(srcdir)/algorithmdialog.h -o algorithmdialog.moc
++collectioncombo.moc: $(srcdir)/collectioncombo.h
++ $(MOC) $(srcdir)/collectioncombo.h -o collectioncombo.moc
#>+ 2
-mocs: loader.moc
-+mocs: algorithmdialog.moc
++mocs: collectioncombo.moc
#>+ 3
- algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-@@ -1220,7 +1224,7 @@
+-algorithmcombo.moc: $(srcdir)/algorithmcombo.h
+- $(MOC) $(srcdir)/algorithmcombo.h -o algorithmcombo.moc
++loader.moc: $(srcdir)/loader.h
++ $(MOC) $(srcdir)/loader.h -o loader.moc
+ #>+ 2
+-mocs: algorithmcombo.moc
++mocs: loader.moc
+
#>+ 3
+ mrml_view.moc: $(srcdir)/mrml_view.h
+@@ -1221,7 +1230,7 @@
+
+ #>+ 3
clean-metasources:
- -rm -f mrml_part.moc collectioncombo.moc browser.moc algorithmdialog.moc loader.moc algorithmcombo.moc mrml_view.moc propertywidgets.moc
-+ -rm -f mrml_part.moc collectioncombo.moc browser.moc loader.moc algorithmdialog.moc algorithmcombo.moc mrml_view.moc propertywidgets.moc
++ -rm -f browser.moc algorithmdialog.moc algorithmcombo.moc mrml_part.moc collectioncombo.moc loader.moc mrml_view.moc propertywidgets.moc
#>+ 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
-@@ -1271,7 +1275,7 @@
-
-
- #>+ 11
--libkmrmlpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mrml_part.cpp $(srcdir)/mrml_view.cpp $(srcdir)/loader.cpp $(srcdir)/mrml_elements.cpp $(srcdir)/mrml_creator.cpp $(srcdir)/browser.cpp $(srcdir)/algorithmdialog.cpp $(srcdir)/collectioncombo.cpp $(srcdir)/algorithmcombo.cpp $(srcdir)/propertysheet.cpp mrml_part.moc collectioncombo.moc browser.moc loader.moc algorithmdialog.moc mrml_view.moc algorithmcombo.moc
-+libkmrmlpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mrml_part.cpp $(srcdir)/mrml_view.cpp $(srcdir)/loader.cpp $(srcdir)/mrml_elements.cpp $(srcdir)/mrml_creator.cpp $(srcdir)/browser.cpp $(srcdir)/algorithmdialog.cpp $(srcdir)/collectioncombo.cpp $(srcdir)/algorithmcombo.cpp $(srcdir)/propertysheet.cpp mrml_part.moc collectioncombo.moc browser.moc algorithmdialog.moc loader.moc mrml_view.moc algorithmcombo.moc
- @echo 'creating libkmrmlpart_la.all_cpp.cpp ...'; \
- rm -f libkmrmlpart_la.all_cpp.files libkmrmlpart_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkmrmlpart_la.all_cpp.final; \
+@@ -1316,8 +1325,8 @@
+ #>+ 26
+ collectioncombo.lo: collectioncombo.moc
+ propertywidgets.o: propertywidgets.moc
+-algorithmdialog.o: algorithmdialog.moc
+ collectioncombo.o: collectioncombo.moc
++algorithmdialog.o: algorithmdialog.moc
+ mrmlsearch$(EXEEXT): $(mrmlsearch_OBJECTS) $(mrmlsearch_DEPENDENCIES)
+ @rm -f mrmlsearch$(EXEEXT)
+ $(CXXLINK) $(mrmlsearch_LDFLAGS) $(mrmlsearch_OBJECTS) $(mrmlsearch_LDADD) $(LIBS)
+@@ -1336,6 +1345,6 @@
+ nmcheck-am: nmcheck
+ propertywidgets.lo: propertywidgets.moc
+ browser.lo: browser.moc
+-browser.o: browser.moc
+ algorithmcombo.o: algorithmcombo.moc
++browser.o: browser.moc
+ mrml_part.lo: mrml_part.moc
--- kmrml/kmrml/server/Makefile.in
+++ kmrml/kmrml/server/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -162,6 +162,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -256,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20235,17 +43634,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,8 @@
+@@ -306,18 +310,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
-@@ -467,7 +471,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -468,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20254,7 +43699,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +509,9 @@
+@@ -506,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20268,7 +43713,15 @@
@$(NORMAL_INSTALL)
--- kmrml/Makefile.in
+++ kmrml/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -132,6 +132,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -226,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20278,17 +43731,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,7 +312,8 @@
+@@ -276,18 +280,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -306,8 +308,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -316,6 +321,7 @@
host_cpu = @host_cpu@
-@@ -426,7 +430,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20297,7 +43796,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +468,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20311,7 +43810,15 @@
mostlyclean-libtool:
--- kolourpaint/cursors/Makefile.in
+++ kolourpaint/cursors/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -151,6 +151,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20321,17 +43828,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -328,7 +331,8 @@
+@@ -295,18 +299,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,8 +327,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -335,6 +340,7 @@
host_cpu = @host_cpu@
-@@ -454,7 +458,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -417,12 +423,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -455,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20340,7 +43893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -492,9 +496,9 @@
+@@ -493,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20354,7 +43907,15 @@
clean-noinstLTLIBRARIES:
--- kolourpaint/Makefile.in
+++ kolourpaint/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -210,6 +210,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -304,6 +305,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20364,17 +43925,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -387,7 +390,8 @@
+@@ -354,18 +358,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,8 +386,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -394,6 +399,7 @@
host_cpu = @host_cpu@
-@@ -546,7 +550,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -476,12 +482,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20383,7 +43990,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +588,9 @@
+@@ -585,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20395,59 +44002,94 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1089,13 +1093,6 @@
+@@ -1041,18 +1050,18 @@
+ mocs: kptool.moc
+
+ #>+ 3
+-kpthumbnail.moc: $(srcdir)/kpthumbnail.h
+- $(MOC) $(srcdir)/kpthumbnail.h -o kpthumbnail.moc
++kpmainwindow.moc: $(srcdir)/kpmainwindow.h
++ $(MOC) $(srcdir)/kpmainwindow.h -o kpmainwindow.moc
+
+ #>+ 2
+-mocs: kpthumbnail.moc
++mocs: kpmainwindow.moc
+
+ #>+ 3
+-kpmainwindow.moc: $(srcdir)/kpmainwindow.h
+- $(MOC) $(srcdir)/kpmainwindow.h -o kpmainwindow.moc
++kpthumbnail.moc: $(srcdir)/kpthumbnail.h
++ $(MOC) $(srcdir)/kpthumbnail.h -o kpthumbnail.moc
+
+ #>+ 2
+-mocs: kpmainwindow.moc
++mocs: kpthumbnail.moc
+
+ #>+ 3
+ kpviewmanager.moc: $(srcdir)/kpviewmanager.h
+@@ -1090,11 +1099,11 @@
mocs: kpdocument.moc
#>+ 3
-kpview.moc: $(srcdir)/kpview.h
- $(MOC) $(srcdir)/kpview.h -o kpview.moc
--
--#>+ 2
++kpselection.moc: $(srcdir)/kpselection.h
++ $(MOC) $(srcdir)/kpselection.h -o kpselection.moc
+
+ #>+ 2
-mocs: kpview.moc
--
--#>+ 3
++mocs: kpselection.moc
+
+ #>+ 3
kpcommandhistory.moc: $(srcdir)/kpcommandhistory.h
- $(MOC) $(srcdir)/kpcommandhistory.h -o kpcommandhistory.moc
+@@ -1104,11 +1113,11 @@
+ mocs: kpcommandhistory.moc
-@@ -1110,6 +1107,13 @@
- mocs: kpselection.moc
-
#>+ 3
+-kpselection.moc: $(srcdir)/kpselection.h
+- $(MOC) $(srcdir)/kpselection.h -o kpselection.moc
+kpview.moc: $(srcdir)/kpview.h
+ $(MOC) $(srcdir)/kpview.h -o kpview.moc
-+
-+#>+ 2
+
+ #>+ 2
+-mocs: kpselection.moc
+mocs: kpview.moc
-+
-+#>+ 3
+
+ #>+ 3
kpsinglekeytriggersaction.moc: $(srcdir)/kpsinglekeytriggersaction.h
- $(MOC) $(srcdir)/kpsinglekeytriggersaction.h -o kpsinglekeytriggersaction.moc
+@@ -1119,10 +1128,10 @@
-@@ -1118,10 +1122,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
++ -rm -f kptool.moc kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpselection.moc kpcommandhistory.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 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
++KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpselectiontransparency.h kpviewscrollablecontainer.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpmainwindow.h kpsinglekeytriggersaction.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:
-@@ -1165,7 +1169,7 @@
+@@ -1166,7 +1175,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
++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 kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpcommandhistory.moc kpselection.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
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20457,17 +44099,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -427,7 +431,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20476,7 +44164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +469,9 @@
+@@ -466,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20490,7 +44178,15 @@
mostlyclean-libtool:
--- kolourpaint/pics/Makefile.in
+++ kolourpaint/pics/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20500,17 +44196,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -428,7 +432,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20519,7 +44261,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +470,9 @@
+@@ -467,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20531,37 +44273,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -765,230 +769,230 @@
+@@ -766,230 +775,230 @@
.NOEXPORT:
#>+ 2
-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
++KDE_DIST=cr22-action-tool_curve.png hi48-app-kolourpaint.png cr32-action-tool_rectangle.png hi32-app-kolourpaint.png cr32-action-tool_line.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 cr32-action-tool_rounded_rectangle.png cr48-action-tool_line.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 cr22-action-tool_color_picker.png cr16-action-tool_polyline.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 cr22-action-tool_eraser.png cr32-action-tool_elliptical_selection.png cr22-action-tool_polyline.png cr16-action-tool_text.png cr16-action-tool_elliptical_selection.png cr22-action-tool_polygon.png cr48-action-tool_eraser.png cr48-action-tool_text.png crsc-action-tool_color_washer.svgz hi16-app-kolourpaint.png cr48-action-tool_color_picker.png cr32-action-tool_pen.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 crsc-action-tool_curve.svgz cr22-action-tool_rounded_rectangle.png cr48-action-tool_rounded_rectangle.png crsc-action-tool_polyline.svgz cr16-action-tool_pen.png cr16-action-tool_rounded_rectangle.png cr48-action-tool_rectangle.png cr32-action-tool_polyline.png cr48-action-tool_elliptical_selection.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
#>+ 2
docs-am:
#>+ 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/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/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/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
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.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/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.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
@@ -20574,35 +44322,20 @@
- $(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
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.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)/crsc-action-tool_color_picker.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
+- $(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)/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)/cr32-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.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)/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
@@ -20611,11 +44344,14 @@
- $(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)/cr32-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.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)/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
@@ -20625,142 +44361,144 @@
- $(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)/cr32-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.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_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
+ $(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)/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)/cr16-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polyline.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.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)/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)/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)/cr22-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_brush.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
+ $(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
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/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)/cr48-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/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)/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_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_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.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
+- $(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)/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)/cr32-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_pen.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
++ $(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_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rect_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_text.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
++ $(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_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.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
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polygon.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.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_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)/crsc-action-tool_flood_fill.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_line.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
+ $(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_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.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_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
++ $(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_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.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_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.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)/cr32-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rounded_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
++ $(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_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_elliptical_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.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)/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)/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)/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
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.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/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/22x22/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)/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)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.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
@@ -20773,27 +44511,20 @@
- -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_pen.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.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/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/32x32/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.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/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
@@ -20802,11 +44533,14 @@
- -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/32x32/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.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/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
@@ -20815,131 +44549,138 @@
- -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/32x32/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
+ -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/scalable/actions/tool_curve.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.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/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/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/22x22/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
+ -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)/hicolor/48x48/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/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/48x48/actions/tool_polyline.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_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_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_elliptical_selection.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)/crystalsvg/48x48/actions/tool_flood_fill.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.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/32x32/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.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)/hicolor/16x16/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.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/scalable/actions/tool_flood_fill.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
+ -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_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.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_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.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/32x32/actions/tool_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.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/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)/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)/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
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
+- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
#>+ 15
force-reedit:
--- kolourpaint/pixmapfx/Makefile.in
+++ kolourpaint/pixmapfx/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -155,6 +155,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20949,17 +44690,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -332,7 +335,8 @@
+@@ -299,18 +303,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -329,8 +331,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -339,6 +344,7 @@
host_cpu = @host_cpu@
-@@ -468,7 +472,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -421,12 +427,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -469,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20968,7 +44755,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +510,9 @@
+@@ -507,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20980,17 +44767,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -753,6 +757,20 @@
+@@ -754,6 +763,13 @@
mocs: kpeffectflatten.moc
#>+ 3
-+kpeffectsdialog.moc: $(srcdir)/kpeffectsdialog.h
-+ $(MOC) $(srcdir)/kpeffectsdialog.h -o kpeffectsdialog.moc
-+
-+#>+ 2
-+mocs: kpeffectsdialog.moc
-+
-+#>+ 3
+kpeffectbalance.moc: $(srcdir)/kpeffectbalance.h
+ $(MOC) $(srcdir)/kpeffectbalance.h -o kpeffectbalance.moc
+
@@ -21001,7 +44781,21 @@
kpeffectinvert.moc: $(srcdir)/kpeffectinvert.h
$(MOC) $(srcdir)/kpeffectinvert.h -o kpeffectinvert.moc
-@@ -774,36 +792,22 @@
+@@ -761,6 +777,13 @@
+ mocs: kpeffectinvert.moc
+
+ #>+ 3
++kpeffectsdialog.moc: $(srcdir)/kpeffectsdialog.h
++ $(MOC) $(srcdir)/kpeffectsdialog.h -o kpeffectsdialog.moc
++
++#>+ 2
++mocs: kpeffectsdialog.moc
++
++#>+ 3
+ kpeffectblursharpen.moc: $(srcdir)/kpeffectblursharpen.h
+ $(MOC) $(srcdir)/kpeffectblursharpen.h -o kpeffectblursharpen.moc
+
+@@ -775,36 +798,22 @@
mocs: kpeffectemboss.moc
#>+ 3
@@ -21041,20 +44835,20 @@
#>+ 3
clean-metasources:
- -rm -f kpeffectflatten.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpeffectreducecolors.moc kpeffectsdialog.moc kpeffectbalance.moc kpcoloreffect.moc
-+ -rm -f kpeffectflatten.moc kpeffectsdialog.moc kpeffectbalance.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpcoloreffect.moc kpeffectreducecolors.moc
++ -rm -f kpeffectflatten.moc kpeffectbalance.moc kpeffectinvert.moc kpeffectsdialog.moc kpeffectblursharpen.moc kpeffectemboss.moc kpcoloreffect.moc kpeffectreducecolors.moc
#>+ 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
-@@ -850,7 +854,7 @@
+@@ -851,7 +860,7 @@
#>+ 11
-libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpeffectreducecolors.moc kpeffectsdialog.moc kpeffectbalance.moc kpcoloreffect.moc
-+libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectinvert.moc kpeffectbalance.moc kpeffectsdialog.moc kpeffectblursharpen.moc kpcoloreffect.moc kpeffectemboss.moc kpeffectreducecolors.moc
++libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectsdialog.moc kpeffectinvert.moc kpeffectbalance.moc kpeffectblursharpen.moc kpcoloreffect.moc kpeffectemboss.moc kpeffectreducecolors.moc
@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; \
-@@ -888,8 +892,8 @@
+@@ -889,8 +898,8 @@
#>+ 19
kpeffectemboss.lo: kpeffectemboss.moc
kpeffectsdialog.o: kpeffectsdialog.moc
@@ -21064,7 +44858,7 @@
kpeffectflatten.o: kpeffectflatten.moc
nmcheck:
kpeffectbalance.lo: kpeffectbalance.moc
-@@ -900,7 +904,7 @@
+@@ -901,7 +910,7 @@
kpeffectreducecolors.o: kpeffectreducecolors.moc
kpeffectflatten.lo: kpeffectflatten.moc
kpeffectinvert.o: kpeffectinvert.moc
@@ -21075,7 +44869,15 @@
kpeffectsdialog.lo: kpeffectsdialog.moc
--- kolourpaint/tools/Makefile.in
+++ kolourpaint/tools/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -170,6 +170,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -264,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21085,17 +44887,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,8 @@
+@@ -314,18 +318,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,8 +346,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -354,6 +359,7 @@
host_cpu = @host_cpu@
-@@ -517,7 +521,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -436,12 +442,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21104,7 +44952,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +559,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21116,18 +44964,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -972,7 +976,7 @@
+@@ -973,7 +982,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 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
++KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolrectangle.h kptoolflip.h kptoolselection.h kptoolpolygon.h kptoolcurve.h kptoolautocrop.h kptooltext.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolrectselection.h kptoolskew.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
-@@ -246,6 +246,9 @@
+@@ -152,6 +152,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -246,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21137,17 +44993,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,7 +332,8 @@
+@@ -296,18 +300,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -326,8 +328,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -336,6 +341,7 @@
host_cpu = @host_cpu@
-@@ -459,7 +463,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -418,12 +424,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -460,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21156,7 +45058,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +501,9 @@
+@@ -498,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21168,50 +45070,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -731,18 +735,18 @@
+@@ -732,11 +741,11 @@
.NOEXPORT:
#>+ 3
-kpunzoomedthumbnailview.moc: $(srcdir)/kpunzoomedthumbnailview.h
- $(MOC) $(srcdir)/kpunzoomedthumbnailview.h -o kpunzoomedthumbnailview.moc
-+kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
-+ $(MOC) $(srcdir)/kpthumbnailview.h -o kpthumbnailview.moc
++kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
++ $(MOC) $(srcdir)/kpzoomedthumbnailview.h -o kpzoomedthumbnailview.moc
#>+ 2
-mocs: kpunzoomedthumbnailview.moc
-+mocs: kpthumbnailview.moc
++mocs: kpzoomedthumbnailview.moc
#>+ 3
--kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
-- $(MOC) $(srcdir)/kpthumbnailview.h -o kpthumbnailview.moc
+ kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
+@@ -746,11 +755,11 @@
+ mocs: kpthumbnailview.moc
+
+ #>+ 3
+-kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
+- $(MOC) $(srcdir)/kpzoomedthumbnailview.h -o kpzoomedthumbnailview.moc
+kpunzoomedthumbnailview.moc: $(srcdir)/kpunzoomedthumbnailview.h
+ $(MOC) $(srcdir)/kpunzoomedthumbnailview.h -o kpunzoomedthumbnailview.moc
#>+ 2
--mocs: kpthumbnailview.moc
+-mocs: kpzoomedthumbnailview.moc
+mocs: kpunzoomedthumbnailview.moc
#>+ 3
- kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-@@ -760,7 +764,7 @@
+ kpzoomedview.moc: $(srcdir)/kpzoomedview.h
+@@ -761,7 +770,7 @@
#>+ 3
clean-metasources:
- -rm -f kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
-+ -rm -f kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
++ -rm -f kpzoomedthumbnailview.moc kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedview.moc
#>+ 2
KDE_DIST=kpunzoomedthumbnailview.h kpzoomedthumbnailview.h kpzoomedview.h Makefile.in Makefile.am kpthumbnailview.h
-@@ -807,7 +811,7 @@
+@@ -808,7 +817,7 @@
#>+ 11
-libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpzoomedthumbnailview.moc kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedview.moc
-+libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpzoomedthumbnailview.moc kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedview.moc
++libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
@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; \
-@@ -844,8 +848,8 @@
+@@ -845,8 +854,8 @@
#>+ 11
nmcheck:
@@ -21223,7 +45130,15 @@
nmcheck-am: nmcheck
--- kolourpaint/widgets/Makefile.in
+++ kolourpaint/widgets/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21233,17 +45148,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -475,7 +479,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -476,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21252,7 +45213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -513,9 +517,9 @@
+@@ -514,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21264,7 +45225,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -798,18 +802,18 @@
+@@ -799,18 +808,18 @@
mocs: kpresizesignallinglabel.moc
#>+ 3
@@ -21289,7 +45250,7 @@
#>+ 3
kptoolwidgetfillstyle.moc: $(srcdir)/kptoolwidgetfillstyle.h
-@@ -841,10 +845,10 @@
+@@ -842,7 +851,7 @@
#>+ 3
clean-metasources:
@@ -21297,21 +45258,17 @@
+ -rm -f kptoolwidgetbrush.moc kpcolortoolbar.moc kptooltoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kpcolorsimilaritydialog.moc kptoolwidgetlinewidth.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
#>+ 2
--KDE_DIST=kpcolorsimilaritycube.h kptoolwidgetbase.h kptoolwidgetfillstyle.h kptooltoolbar.h kptoolwidgeterasersize.h kptoolwidgetopaqueortransparent.h kptoolwidgetspraycansize.h kpresizesignallinglabel.h kpcolortoolbar.h Makefile.in kptoolwidgetlinewidth.h kpsqueezedtextlabel.h kpcolorsimilaritydialog.h kptoolwidgetbrush.h Makefile.am
-+KDE_DIST=kpcolorsimilaritycube.h kptoolwidgetbase.h kptoolwidgetfillstyle.h kptooltoolbar.h kptoolwidgeterasersize.h kptoolwidgetspraycansize.h kptoolwidgetopaqueortransparent.h kpresizesignallinglabel.h kpcolortoolbar.h Makefile.in kptoolwidgetlinewidth.h kpsqueezedtextlabel.h kpcolorsimilaritydialog.h kptoolwidgetbrush.h Makefile.am
+ KDE_DIST=kpcolorsimilaritycube.h kptoolwidgetbase.h kptoolwidgetfillstyle.h kptooltoolbar.h kptoolwidgeterasersize.h kptoolwidgetopaqueortransparent.h kptoolwidgetspraycansize.h kpresizesignallinglabel.h kpcolortoolbar.h Makefile.in kptoolwidgetlinewidth.h kpsqueezedtextlabel.h kpcolorsimilaritydialog.h kptoolwidgetbrush.h Makefile.am
+@@ -889,7 +898,7 @@
- #>+ 2
- docs-am:
-@@ -888,7 +892,7 @@
-
#>+ 11
-libkolourpaintwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcolorsimilaritycube.cpp $(srcdir)/kpcolorsimilaritydialog.cpp $(srcdir)/kpcolortoolbar.cpp $(srcdir)/kpresizesignallinglabel.cpp $(srcdir)/kpsqueezedtextlabel.cpp $(srcdir)/kptooltoolbar.cpp $(srcdir)/kptoolwidgetbase.cpp $(srcdir)/kptoolwidgetbrush.cpp $(srcdir)/kptoolwidgeterasersize.cpp $(srcdir)/kptoolwidgetfillstyle.cpp $(srcdir)/kptoolwidgetlinewidth.cpp $(srcdir)/kptoolwidgetopaqueortransparent.cpp $(srcdir)/kptoolwidgetspraycansize.cpp kptoolwidgetbrush.moc kptooltoolbar.moc kpcolortoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kpcolorsimilaritydialog.moc kptoolwidgetlinewidth.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
+libkolourpaintwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcolorsimilaritycube.cpp $(srcdir)/kpcolorsimilaritydialog.cpp $(srcdir)/kpcolortoolbar.cpp $(srcdir)/kpresizesignallinglabel.cpp $(srcdir)/kpsqueezedtextlabel.cpp $(srcdir)/kptooltoolbar.cpp $(srcdir)/kptoolwidgetbase.cpp $(srcdir)/kptoolwidgetbrush.cpp $(srcdir)/kptoolwidgeterasersize.cpp $(srcdir)/kptoolwidgetfillstyle.cpp $(srcdir)/kptoolwidgetlinewidth.cpp $(srcdir)/kptoolwidgetopaqueortransparent.cpp $(srcdir)/kptoolwidgetspraycansize.cpp kptoolwidgetbrush.moc kptooltoolbar.moc kpcolortoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kptoolwidgetlinewidth.moc kpcolorsimilaritydialog.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
@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; \
-@@ -933,8 +937,8 @@
+@@ -934,8 +943,8 @@
kpresizesignallinglabel.o: kpresizesignallinglabel.moc
kptoolwidgetfillstyle.o: kptoolwidgetfillstyle.moc
kpcolorsimilaritydialog.o: kpcolorsimilaritydialog.moc
@@ -21323,7 +45280,15 @@
kptoolwidgeterasersize.lo: kptoolwidgeterasersize.moc
--- kooka/Makefile.in
+++ kooka/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -201,6 +201,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21333,17 +45298,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -378,7 +381,8 @@
+@@ -345,18 +349,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,8 +377,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -385,6 +390,7 @@
host_cpu = @host_cpu@
-@@ -528,7 +532,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -467,12 +473,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -529,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21352,7 +45363,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +570,9 @@
+@@ -567,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21364,190 +45375,123 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1004,81 +1008,67 @@
- .NOEXPORT:
+@@ -1019,13 +1028,6 @@
+ mocs: imgprintdialog.moc
#>+ 3
--img_saver.moc: $(srcdir)/img_saver.h
-- $(MOC) $(srcdir)/img_saver.h -o img_saver.moc
+-ksaneocr.moc: $(srcdir)/ksaneocr.h
+- $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
-
-#>+ 2
--mocs: img_saver.moc
+-mocs: ksaneocr.moc
-
-#>+ 3
--imgprintdialog.moc: $(srcdir)/imgprintdialog.h
-- $(MOC) $(srcdir)/imgprintdialog.h -o imgprintdialog.moc
--
--#>+ 2
--mocs: imgprintdialog.moc
--
--#>+ 3
--ksaneocr.moc: $(srcdir)/ksaneocr.h
-- $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
-+ocrresedit.moc: $(srcdir)/ocrresedit.h
-+ $(MOC) $(srcdir)/ocrresedit.h -o ocrresedit.moc
+ kocrkadmos.moc: $(srcdir)/kocrkadmos.h
+ $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
- #>+ 2
--mocs: ksaneocr.moc
-+mocs: ocrresedit.moc
+@@ -1040,6 +1042,13 @@
+ mocs: dwmenuaction.moc
#>+ 3
--kocrkadmos.moc: $(srcdir)/kocrkadmos.h
-- $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
-+imgnamecombo.moc: $(srcdir)/imgnamecombo.h
-+ $(MOC) $(srcdir)/imgnamecombo.h -o imgnamecombo.moc
++ksaneocr.moc: $(srcdir)/ksaneocr.h
++ $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
++
++#>+ 2
++mocs: ksaneocr.moc
++
++#>+ 3
+ thumbview.moc: $(srcdir)/thumbview.h
+ $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
- #>+ 2
--mocs: kocrkadmos.moc
-+mocs: imgnamecombo.moc
+@@ -1082,18 +1091,18 @@
+ mocs: kadmosocr.moc
#>+ 3
--dwmenuaction.moc: $(srcdir)/dwmenuaction.h
-- $(MOC) $(srcdir)/dwmenuaction.h -o dwmenuaction.moc
-+kookapref.moc: $(srcdir)/kookapref.h
-+ $(MOC) $(srcdir)/kookapref.h -o kookapref.moc
+-imageselectline.moc: $(srcdir)/imageselectline.h
+- $(MOC) $(srcdir)/imageselectline.h -o imageselectline.moc
++kocrgocr.moc: $(srcdir)/kocrgocr.h
++ $(MOC) $(srcdir)/kocrgocr.h -o kocrgocr.moc
#>+ 2
--mocs: dwmenuaction.moc
-+mocs: kookapref.moc
+-mocs: imageselectline.moc
++mocs: kocrgocr.moc
#>+ 3
--thumbview.moc: $(srcdir)/thumbview.h
-- $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
-+img_saver.moc: $(srcdir)/img_saver.h
-+ $(MOC) $(srcdir)/img_saver.h -o img_saver.moc
+-kocrgocr.moc: $(srcdir)/kocrgocr.h
+- $(MOC) $(srcdir)/kocrgocr.h -o kocrgocr.moc
++imageselectline.moc: $(srcdir)/imageselectline.h
++ $(MOC) $(srcdir)/imageselectline.h -o imageselectline.moc
#>+ 2
--mocs: thumbview.moc
-+mocs: img_saver.moc
+-mocs: kocrgocr.moc
++mocs: imageselectline.moc
#>+ 3
--kocrocrad.moc: $(srcdir)/kocrocrad.h
-- $(MOC) $(srcdir)/kocrocrad.h -o kocrocrad.moc
-+imgprintdialog.moc: $(srcdir)/imgprintdialog.h
-+ $(MOC) $(srcdir)/imgprintdialog.h -o imgprintdialog.moc
-
- #>+ 2
--mocs: kocrocrad.moc
-+mocs: imgprintdialog.moc
-
- #>+ 3
--ocrresedit.moc: $(srcdir)/ocrresedit.h
-- $(MOC) $(srcdir)/ocrresedit.h -o ocrresedit.moc
-+kadmosocr.moc: $(srcdir)/kadmosocr.h
-+ $(MOC) $(srcdir)/kadmosocr.h -o kadmosocr.moc
-
- #>+ 2
--mocs: ocrresedit.moc
-+mocs: kadmosocr.moc
-
- #>+ 3
--imgnamecombo.moc: $(srcdir)/imgnamecombo.h
-- $(MOC) $(srcdir)/imgnamecombo.h -o imgnamecombo.moc
-+kocrkadmos.moc: $(srcdir)/kocrkadmos.h
-+ $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
-
- #>+ 2
--mocs: imgnamecombo.moc
-+mocs: kocrkadmos.moc
-
- #>+ 3
--kookapref.moc: $(srcdir)/kookapref.h
-- $(MOC) $(srcdir)/kookapref.h -o kookapref.moc
-+dwmenuaction.moc: $(srcdir)/dwmenuaction.h
-+ $(MOC) $(srcdir)/dwmenuaction.h -o dwmenuaction.moc
-
- #>+ 2
--mocs: kookapref.moc
-+mocs: dwmenuaction.moc
-
- #>+ 3
--kadmosocr.moc: $(srcdir)/kadmosocr.h
-- $(MOC) $(srcdir)/kadmosocr.h -o kadmosocr.moc
-+ksaneocr.moc: $(srcdir)/ksaneocr.h
-+ $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
-
- #>+ 2
--mocs: kadmosocr.moc
-+mocs: ksaneocr.moc
-
- #>+ 3
- imageselectline.moc: $(srcdir)/imageselectline.h
-@@ -1102,6 +1092,20 @@
+ scanpackager.moc: $(srcdir)/scanpackager.h
+@@ -1103,18 +1112,18 @@
mocs: scanpackager.moc
#>+ 3
+-kookaview.moc: $(srcdir)/kookaview.h
+- $(MOC) $(srcdir)/kookaview.h -o kookaview.moc
+kookaprint.moc: $(srcdir)/kookaprint.h
+ $(MOC) $(srcdir)/kookaprint.h -o kookaprint.moc
-+
-+#>+ 2
+
+ #>+ 2
+-mocs: kookaview.moc
+mocs: kookaprint.moc
-+
-+#>+ 3
-+thumbview.moc: $(srcdir)/thumbview.h
-+ $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
-+
-+#>+ 2
-+mocs: thumbview.moc
-+
-+#>+ 3
- kookaview.moc: $(srcdir)/kookaview.h
- $(MOC) $(srcdir)/kookaview.h -o kookaview.moc
-@@ -1109,11 +1113,11 @@
- mocs: kookaview.moc
-
#>+ 3
-kookaprint.moc: $(srcdir)/kookaprint.h
- $(MOC) $(srcdir)/kookaprint.h -o kookaprint.moc
-+kocrocrad.moc: $(srcdir)/kocrocrad.h
-+ $(MOC) $(srcdir)/kocrocrad.h -o kocrocrad.moc
++kookaview.moc: $(srcdir)/kookaview.h
++ $(MOC) $(srcdir)/kookaview.h -o kookaview.moc
#>+ 2
-mocs: kookaprint.moc
-+mocs: kocrocrad.moc
++mocs: kookaview.moc
#>+ 3
kooka.moc: $(srcdir)/kooka.h
-@@ -1131,7 +1135,7 @@
+@@ -1132,7 +1141,7 @@
#>+ 3
clean-metasources:
- -rm -f img_saver.moc imgprintdialog.moc ksaneocr.moc kocrkadmos.moc dwmenuaction.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc imageselectline.moc kocrgocr.moc scanpackager.moc kookaview.moc kookaprint.moc kooka.moc kocrbase.moc
-+ -rm -f ocrresedit.moc imgnamecombo.moc kookapref.moc img_saver.moc imgprintdialog.moc kadmosocr.moc kocrkadmos.moc dwmenuaction.moc ksaneocr.moc imageselectline.moc kocrgocr.moc scanpackager.moc kookaprint.moc thumbview.moc kookaview.moc kocrocrad.moc kooka.moc kocrbase.moc
++ -rm -f img_saver.moc imgprintdialog.moc kocrkadmos.moc dwmenuaction.moc ksaneocr.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaprint.moc kookaview.moc kooka.moc kocrbase.moc
#>+ 2
KDE_DIST=README.KADMOS kookaui.rc WARNING kooka.desktop CREDITS kookarc CHANGES configure.in.in Makefile.in dwmenuaction.h version.h Makefile.am
-@@ -1178,7 +1182,7 @@
+@@ -1179,7 +1188,7 @@
#>+ 11
-kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp img_saver.moc imgprintdialog.moc dwmenuaction.moc kocrkadmos.moc ksaneocr.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc imageselectline.moc kocrgocr.moc scanpackager.moc kookaview.moc kookaprint.moc kooka.moc kocrbase.moc
-+kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp ocrresedit.moc imgnamecombo.moc kookapref.moc img_saver.moc imgprintdialog.moc kadmosocr.moc ksaneocr.moc dwmenuaction.moc kocrkadmos.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaview.moc thumbview.moc kookaprint.moc kocrocrad.moc kooka.moc kocrbase.moc
++kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp img_saver.moc imgprintdialog.moc ksaneocr.moc dwmenuaction.moc kocrkadmos.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaprint.moc kookaview.moc kooka.moc kocrbase.moc
@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; \
-@@ -1219,14 +1223,14 @@
- kocrbase.lo: kocrbase.moc
+@@ -1221,8 +1230,8 @@
imgnamecombo.o: imgnamecombo.moc
img_saver.o: img_saver.moc
--kadmosocr.lo: kadmosocr.moc
+ kadmosocr.lo: kadmosocr.moc
-kocrkadmos.o: kocrkadmos.moc
ksaneocr.lo: ksaneocr.moc
+kocrkadmos.o: kocrkadmos.moc
-+kadmosocr.lo: kadmosocr.moc
kookaview.o: kookaview.moc
kooka.lo: kooka.moc
kookaprint.o: kookaprint.moc
--kookaview.lo: kookaview.moc
- kocrocrad.o: kocrocrad.moc
-+kookaview.lo: kookaview.moc
- kookapref.lo: kookapref.moc
- nmcheck-am: nmcheck
- imgprintdialog.lo: imgprintdialog.moc
--- kooka/pics/Makefile.in
+++ kooka/pics/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21557,17 +45501,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -427,7 +431,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21576,7 +45566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +469,9 @@
+@@ -466,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21588,7 +45578,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -626,7 +630,7 @@
+@@ -627,7 +636,7 @@
.NOEXPORT:
#>+ 2
@@ -21599,7 +45589,15 @@
docs-am:
--- kpdf/conf/Makefile.in
+++ kpdf/conf/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -158,6 +158,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -252,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21609,17 +45607,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,8 @@
+@@ -302,18 +306,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +334,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
-@@ -464,7 +468,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -424,12 +430,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -465,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21628,7 +45672,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +506,9 @@
+@@ -503,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21642,7 +45686,15 @@
clean-noinstLTLIBRARIES:
--- kpdf/core/generator_kimgio/Makefile.in
+++ kpdf/core/generator_kimgio/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -145,6 +145,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -239,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21652,17 +45704,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,8 @@
+@@ -289,18 +293,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -319,8 +321,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -329,6 +334,7 @@
host_cpu = @host_cpu@
-@@ -443,7 +447,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -411,12 +417,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21671,7 +45769,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +485,9 @@
+@@ -482,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21685,7 +45783,15 @@
clean-noinstLTLIBRARIES:
--- kpdf/core/generator_pdf/Makefile.in
+++ kpdf/core/generator_pdf/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -145,6 +145,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -239,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21695,17 +45801,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,8 @@
+@@ -289,18 +293,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -319,8 +321,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -329,6 +334,7 @@
host_cpu = @host_cpu@
-@@ -444,7 +448,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -411,12 +417,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21714,7 +45866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +486,9 @@
+@@ -483,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21728,7 +45880,15 @@
clean-noinstLTLIBRARIES:
--- kpdf/core/Makefile.in
+++ kpdf/core/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -165,6 +165,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21738,17 +45898,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -342,7 +345,8 @@
+@@ -309,18 +313,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -339,8 +341,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -349,6 +354,7 @@
host_cpu = @host_cpu@
-@@ -465,7 +469,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -431,12 +437,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -466,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21757,7 +45963,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +507,9 @@
+@@ -504,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21771,7 +45977,15 @@
clean-noinstLTLIBRARIES:
--- kpdf/Makefile.in
+++ kpdf/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -180,6 +180,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -274,6 +275,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21781,17 +45995,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,8 @@
+@@ -324,18 +328,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,8 +356,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -364,6 +369,7 @@
host_cpu = @host_cpu@
-@@ -495,7 +499,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -446,12 +452,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -496,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21800,7 +46060,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -533,9 +537,9 @@
+@@ -534,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21812,7 +46072,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -974,7 +978,7 @@
+@@ -975,7 +984,7 @@
-rm -f part.moc
#>+ 2
@@ -21821,54 +46081,59 @@
#>+ 4
clean-idl:
-@@ -990,29 +994,29 @@
+@@ -991,29 +1000,29 @@
#>+ 25
install-kde-icons:
- $(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/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/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/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
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
uninstall-kde-icons:
- -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/32x32/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/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
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
#>+ 15
force-reedit:
--- kpdf/shell/Makefile.in
+++ kpdf/shell/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -163,6 +163,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -257,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21878,17 +46143,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,8 @@
+@@ -307,18 +311,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +339,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -347,6 +352,7 @@
host_cpu = @host_cpu@
-@@ -466,7 +470,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -429,12 +435,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -467,7 +476,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21897,7 +46208,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +508,9 @@
+@@ -505,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21911,7 +46222,15 @@
@$(NORMAL_INSTALL)
--- kpdf/ui/Makefile.in
+++ kpdf/ui/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -152,6 +152,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -246,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21921,17 +46240,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,7 +332,8 @@
+@@ -296,18 +300,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -326,8 +328,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -336,6 +341,7 @@
host_cpu = @host_cpu@
-@@ -453,7 +457,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -418,12 +424,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -454,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21940,7 +46305,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +495,9 @@
+@@ -492,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21952,7 +46317,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -772,25 +776,25 @@
+@@ -773,25 +782,25 @@
mocs: searchwidget.moc
#>+ 3
@@ -21986,7 +46351,7 @@
#>+ 2
docs-am:
-@@ -834,7 +838,7 @@
+@@ -835,7 +844,7 @@
#>+ 11
@@ -21997,7 +46362,15 @@
echo "#define KDE_USE_FINAL 1" >> libkpdfui_la.all_cpp.final; \
--- kpdf/xpdf/fofi/Makefile.in
+++ kpdf/xpdf/fofi/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -150,6 +150,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -244,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22007,17 +46380,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,8 @@
+@@ -294,18 +298,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -324,8 +326,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -334,6 +339,7 @@
host_cpu = @host_cpu@
-@@ -451,7 +455,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -416,12 +422,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -452,7 +461,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22026,7 +46445,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +493,9 @@
+@@ -490,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22040,7 +46459,15 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/goo/Makefile.in
+++ kpdf/xpdf/goo/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -158,6 +158,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -252,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22050,17 +46477,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,8 @@
+@@ -302,18 +306,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +334,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
-@@ -455,7 +459,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -424,12 +430,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -456,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -22069,7 +46542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +497,9 @@
+@@ -494,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22083,7 +46556,15 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/Makefile.in
+++ kpdf/xpdf/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22093,17 +46574,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22112,7 +46639,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22126,7 +46653,15 @@
mostlyclean-libtool:
--- kpdf/xpdf/splash/Makefile.in
+++ kpdf/xpdf/splash/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -160,6 +160,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -254,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22136,17 +46671,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -337,7 +340,8 @@
+@@ -304,18 +308,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +336,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -344,6 +349,7 @@
host_cpu = @host_cpu@
-@@ -461,7 +465,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -426,12 +432,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -462,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22155,7 +46736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +503,9 @@
+@@ -500,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22169,7 +46750,15 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/xpdf/Makefile.in
+++ kpdf/xpdf/xpdf/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -170,6 +170,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -264,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22179,26 +46768,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,7 +350,8 @@
+@@ -314,18 +318,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,8 +346,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -354,6 +359,7 @@
host_cpu = @host_cpu@
-@@ -458,7 +462,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
-+INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(all_includes)
- libxpdf_la_LDFLAGS = $(all_libraries)
- libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
- libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
-@@ -482,7 +486,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -436,12 +442,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -483,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22207,7 +46833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +524,9 @@
+@@ -521,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22219,18 +46845,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -789,7 +793,7 @@
+@@ -790,7 +799,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 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
++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 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 FontEncodingTables.h UnicodeMapTables.h UGString.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h FlateStream.cc Parser.h JArithmeticDecoder.h GfxFont.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
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22240,17 +46874,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -423,7 +427,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -424,7 +433,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22259,7 +46939,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +465,9 @@
+@@ -462,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22273,7 +46953,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/includes/Makefile.in
+++ kpovmodeler/examples/includes/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22283,17 +46971,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22302,7 +47036,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22316,7 +47050,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/includes/original/Makefile.in
+++ kpovmodeler/examples/includes/original/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22326,17 +47068,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -423,7 +427,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -424,7 +433,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22345,7 +47133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +465,9 @@
+@@ -462,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22359,7 +47147,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/Makefile.in
+++ kpovmodeler/examples/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22369,17 +47165,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22388,7 +47230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22402,7 +47244,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/advanced/Makefile.in
+++ kpovmodeler/examples/scenes/advanced/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22412,17 +47262,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -420,7 +424,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22431,7 +47327,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +462,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22445,7 +47341,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/csg/Makefile.in
+++ kpovmodeler/examples/scenes/csg/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22455,17 +47359,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -420,7 +424,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22474,7 +47424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +462,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22488,7 +47438,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/interior/Makefile.in
+++ kpovmodeler/examples/scenes/interior/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22498,17 +47456,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -420,7 +424,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22517,7 +47521,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +462,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22531,7 +47535,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/lights/Makefile.in
+++ kpovmodeler/examples/scenes/lights/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22541,17 +47553,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -420,7 +424,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22560,7 +47618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +462,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22574,7 +47632,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/Makefile.in
+++ kpovmodeler/examples/scenes/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22584,17 +47650,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22603,7 +47715,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22617,7 +47729,15 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/objects/Makefile.in
+++ kpovmodeler/examples/scenes/objects/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22627,17 +47747,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -422,7 +426,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -423,7 +432,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22646,7 +47812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +464,9 @@
+@@ -461,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22660,7 +47826,15 @@
mostlyclean-libtool:
--- kpovmodeler/Makefile.in
+++ kpovmodeler/Makefile.in
-@@ -451,6 +451,9 @@
+@@ -357,6 +357,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -451,6 +452,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22670,17 +47844,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,8 @@
+@@ -501,18 +505,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -531,8 +533,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -541,6 +546,7 @@
host_cpu = @host_cpu@
-@@ -979,7 +983,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -623,12 +629,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -980,7 +989,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22689,7 +47909,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1017,9 +1021,9 @@
+@@ -1018,9 +1027,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22701,32 +47921,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1793,18 +1797,18 @@
- mocs: pmcylinderedit.moc
+@@ -1780,18 +1789,18 @@
+ mocs: pmblobcylinderedit.moc
#>+ 3
--pmtorusedit.moc: $(srcdir)/pmtorusedit.h
-- $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
-+pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
-+ $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
+-pmlineedits.moc: $(srcdir)/pmlineedits.h
+- $(MOC) $(srcdir)/pmlineedits.h -o pmlineedits.moc
++pmcylinderedit.moc: $(srcdir)/pmcylinderedit.h
++ $(MOC) $(srcdir)/pmcylinderedit.h -o pmcylinderedit.moc
#>+ 2
--mocs: pmtorusedit.moc
-+mocs: pminteriortextureedit.moc
+-mocs: pmlineedits.moc
++mocs: pmcylinderedit.moc
#>+ 3
--pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
-- $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
-+pmtorusedit.moc: $(srcdir)/pmtorusedit.h
-+ $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
+-pmcylinderedit.moc: $(srcdir)/pmcylinderedit.h
+- $(MOC) $(srcdir)/pmcylinderedit.h -o pmcylinderedit.moc
++pmlineedits.moc: $(srcdir)/pmlineedits.h
++ $(MOC) $(srcdir)/pmlineedits.h -o pmlineedits.moc
#>+ 2
--mocs: pminteriortextureedit.moc
-+mocs: pmtorusedit.moc
+-mocs: pmcylinderedit.moc
++mocs: pmlineedits.moc
#>+ 3
- pmblobedit.moc: $(srcdir)/pmblobedit.h
-@@ -1842,18 +1846,18 @@
+ pmtorusedit.moc: $(srcdir)/pmtorusedit.h
+@@ -1843,18 +1852,18 @@
mocs: pmobjectselect.moc
#>+ 3
@@ -22751,125 +47971,85 @@
#>+ 3
pmcameraedit.moc: $(srcdir)/pmcameraedit.h
-@@ -1863,18 +1867,18 @@
- mocs: pmcameraedit.moc
+@@ -1913,13 +1922,6 @@
+ mocs: pmimagemapedit.moc
#>+ 3
--pmboxedit.moc: $(srcdir)/pmboxedit.h
-- $(MOC) $(srcdir)/pmboxedit.h -o pmboxedit.moc
-+pmblobsphereedit.moc: $(srcdir)/pmblobsphereedit.h
-+ $(MOC) $(srcdir)/pmblobsphereedit.h -o pmblobsphereedit.moc
-
- #>+ 2
--mocs: pmboxedit.moc
-+mocs: pmblobsphereedit.moc
-
- #>+ 3
--pmblobsphereedit.moc: $(srcdir)/pmblobsphereedit.h
-- $(MOC) $(srcdir)/pmblobsphereedit.h -o pmblobsphereedit.moc
-+pmboxedit.moc: $(srcdir)/pmboxedit.h
-+ $(MOC) $(srcdir)/pmboxedit.h -o pmboxedit.moc
-
- #>+ 2
--mocs: pmblobsphereedit.moc
-+mocs: pmboxedit.moc
-
- #>+ 3
- pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-@@ -1898,25 +1902,25 @@
- mocs: pmdockwidget_private.moc
-
- #>+ 3
--pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
-- $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
-+pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
-+ $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
-
- #>+ 2
--mocs: pmlibraryiconview.moc
-+mocs: pmimagemapedit.moc
-
- #>+ 3
--pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
-- $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
-+pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
-+ $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
-
- #>+ 2
--mocs: pmimagemapedit.moc
-+mocs: pmlibraryiconview.moc
-
- #>+ 3
-pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
- $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
-+pmdragwidget.moc: $(srcdir)/pmdragwidget.h
-+ $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
-
- #>+ 2
+-
+-#>+ 2
-mocs: pmradiosityedit.moc
-+mocs: pmdragwidget.moc
-
- #>+ 3
+-
+-#>+ 3
pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
-@@ -1926,11 +1930,11 @@
- mocs: pmlightgroupedit.moc
+ $(MOC) $(srcdir)/pmlightgroupedit.h -o pmlightgroupedit.moc
+@@ -1934,18 +1936,18 @@
+ mocs: pmdragwidget.moc
+
#>+ 3
--pmdragwidget.moc: $(srcdir)/pmdragwidget.h
-- $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
+-pmactions.moc: $(srcdir)/pmactions.h
+- $(MOC) $(srcdir)/pmactions.h -o pmactions.moc
+pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
+ $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
#>+ 2
--mocs: pmdragwidget.moc
+-mocs: pmactions.moc
+mocs: pmradiosityedit.moc
#>+ 3
- pmactions.moc: $(srcdir)/pmactions.h
-@@ -1954,13 +1958,6 @@
+-pmdiscedit.moc: $(srcdir)/pmdiscedit.h
+- $(MOC) $(srcdir)/pmdiscedit.h -o pmdiscedit.moc
++pmactions.moc: $(srcdir)/pmactions.h
++ $(MOC) $(srcdir)/pmactions.h -o pmactions.moc
+
+ #>+ 2
+-mocs: pmdiscedit.moc
++mocs: pmactions.moc
+
+ #>+ 3
+ pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
+@@ -1955,6 +1957,13 @@
mocs: pmlibrarybrowser.moc
#>+ 3
--pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
-- $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
--
--#>+ 2
--mocs: pmpalettevalueedit.moc
--
--#>+ 3
- pmlightedit.moc: $(srcdir)/pmlightedit.h
- $(MOC) $(srcdir)/pmlightedit.h -o pmlightedit.moc
++pmdiscedit.moc: $(srcdir)/pmdiscedit.h
++ $(MOC) $(srcdir)/pmdiscedit.h -o pmdiscedit.moc
++
++#>+ 2
++mocs: pmdiscedit.moc
++
++#>+ 3
+ pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
+ $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
-@@ -1968,11 +1965,11 @@
+@@ -1969,18 +1978,18 @@
mocs: pmlightedit.moc
#>+ 3
-pmview.moc: $(srcdir)/pmview.h
- $(MOC) $(srcdir)/pmview.h -o pmview.moc
-+pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
-+ $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
++pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
++ $(MOC) $(srcdir)/pmobjectlibrarysettings.h -o pmobjectlibrarysettings.moc
#>+ 2
-mocs: pmview.moc
-+mocs: pmpalettevalueedit.moc
++mocs: pmobjectlibrarysettings.moc
#>+ 3
- pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-@@ -1982,6 +1979,13 @@
- mocs: pmobjectlibrarysettings.moc
-
- #>+ 3
+-pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
+- $(MOC) $(srcdir)/pmobjectlibrarysettings.h -o pmobjectlibrarysettings.moc
+pmview.moc: $(srcdir)/pmview.h
+ $(MOC) $(srcdir)/pmview.h -o pmview.moc
-+
-+#>+ 2
+
+ #>+ 2
+-mocs: pmobjectlibrarysettings.moc
+mocs: pmview.moc
-+
-+#>+ 3
+
+ #>+ 3
pmfactory.moc: $(srcdir)/pmfactory.h
- $(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
-
-@@ -2010,18 +2014,18 @@
+@@ -2011,18 +2020,18 @@
mocs: pmlatheedit.moc
#>+ 3
@@ -22894,194 +48074,265 @@
#>+ 3
pmclippedbyedit.moc: $(srcdir)/pmclippedbyedit.h
-@@ -2059,18 +2063,18 @@
- mocs: pmdialogeditbase.moc
+@@ -2123,11 +2132,11 @@
+ mocs: pmplaneedit.moc
#>+ 3
--pmfiledialog.moc: $(srcdir)/pmfiledialog.h
-- $(MOC) $(srcdir)/pmfiledialog.h -o pmfiledialog.moc
-+pmslopeedit.moc: $(srcdir)/pmslopeedit.h
-+ $(MOC) $(srcdir)/pmslopeedit.h -o pmslopeedit.moc
+-pmpigmentedit.moc: $(srcdir)/pmpigmentedit.h
+- $(MOC) $(srcdir)/pmpigmentedit.h -o pmpigmentedit.moc
++pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
++ $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
#>+ 2
--mocs: pmfiledialog.moc
-+mocs: pmslopeedit.moc
+-mocs: pmpigmentedit.moc
++mocs: pmglobalphotonsedit.moc
#>+ 3
--pmslopeedit.moc: $(srcdir)/pmslopeedit.h
-- $(MOC) $(srcdir)/pmslopeedit.h -o pmslopeedit.moc
-+pmfiledialog.moc: $(srcdir)/pmfiledialog.h
-+ $(MOC) $(srcdir)/pmfiledialog.h -o pmfiledialog.moc
+ pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
+@@ -2137,11 +2146,11 @@
+ mocs: pmglobalsettingsedit.moc
+ #>+ 3
+-pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
+- $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
++pmpigmentedit.moc: $(srcdir)/pmpigmentedit.h
++ $(MOC) $(srcdir)/pmpigmentedit.h -o pmpigmentedit.moc
+
#>+ 2
--mocs: pmslopeedit.moc
-+mocs: pmfiledialog.moc
+-mocs: pmglobalphotonsedit.moc
++mocs: pmpigmentedit.moc
#>+ 3
- pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-@@ -2199,6 +2203,13 @@
+ pmerrordialog.moc: $(srcdir)/pmerrordialog.h
+@@ -2186,13 +2195,6 @@
+ mocs: pmconeedit.moc
+
+ #>+ 3
+-pmpatternedit.moc: $(srcdir)/pmpatternedit.h
+- $(MOC) $(srcdir)/pmpatternedit.h -o pmpatternedit.moc
+-
+-#>+ 2
+-mocs: pmpatternedit.moc
+-
+-#>+ 3
+ pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
+ $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
+
+@@ -2200,18 +2202,18 @@
mocs: pmphotonsedit.moc
#>+ 3
+-pmsoredit.moc: $(srcdir)/pmsoredit.h
+- $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
++pmpatternedit.moc: $(srcdir)/pmpatternedit.h
++ $(MOC) $(srcdir)/pmpatternedit.h -o pmpatternedit.moc
+
+ #>+ 2
+-mocs: pmsoredit.moc
++mocs: pmpatternedit.moc
+
+ #>+ 3
+-pmquickcoloredit.moc: $(srcdir)/pmquickcoloredit.h
+- $(MOC) $(srcdir)/pmquickcoloredit.h -o pmquickcoloredit.moc
+pmrainbowedit.moc: $(srcdir)/pmrainbowedit.h
+ $(MOC) $(srcdir)/pmrainbowedit.h -o pmrainbowedit.moc
-+
-+#>+ 2
+
+ #>+ 2
+-mocs: pmquickcoloredit.moc
+mocs: pmrainbowedit.moc
-+
-+#>+ 3
- pmsoredit.moc: $(srcdir)/pmsoredit.h
- $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-@@ -2220,11 +2231,11 @@
+ #>+ 3
+ pmdeclareedit.moc: $(srcdir)/pmdeclareedit.h
+@@ -2221,18 +2223,18 @@
mocs: pmdeclareedit.moc
#>+ 3
-pmrainbowedit.moc: $(srcdir)/pmrainbowedit.h
- $(MOC) $(srcdir)/pmrainbowedit.h -o pmrainbowedit.moc
-+pmdialogview.moc: $(srcdir)/pmdialogview.h
-+ $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
++pmsoredit.moc: $(srcdir)/pmsoredit.h
++ $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
#>+ 2
-mocs: pmrainbowedit.moc
-+mocs: pmdialogview.moc
++mocs: pmsoredit.moc
#>+ 3
- pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-@@ -2234,25 +2245,25 @@
- mocs: pmsqeedit.moc
+-pmsqeedit.moc: $(srcdir)/pmsqeedit.h
+- $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
++pmquickcoloredit.moc: $(srcdir)/pmquickcoloredit.h
++ $(MOC) $(srcdir)/pmquickcoloredit.h -o pmquickcoloredit.moc
- #>+ 3
--pmdialogview.moc: $(srcdir)/pmdialogview.h
-- $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
-+pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
-+ $(MOC) $(srcdir)/pmbicubicpatchedit.h -o pmbicubicpatchedit.moc
-
#>+ 2
--mocs: pmdialogview.moc
-+mocs: pmbicubicpatchedit.moc
+-mocs: pmsqeedit.moc
++mocs: pmquickcoloredit.moc
#>+ 3
+ pmdialogview.moc: $(srcdir)/pmdialogview.h
+@@ -2242,18 +2244,18 @@
+ mocs: pmdialogview.moc
+
+ #>+ 3
-pmcoloredit.moc: $(srcdir)/pmcoloredit.h
- $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
-+pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
-+ $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
++pmsqeedit.moc: $(srcdir)/pmsqeedit.h
++ $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
#>+ 2
-mocs: pmcoloredit.moc
-+mocs: pmobjectlinkedit.moc
++mocs: pmsqeedit.moc
#>+ 3
-pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
- $(MOC) $(srcdir)/pmbicubicpatchedit.h -o pmbicubicpatchedit.moc
-+pmcoloredit.moc: $(srcdir)/pmcoloredit.h
-+ $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
++pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
++ $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
#>+ 2
-mocs: pmbicubicpatchedit.moc
-+mocs: pmcoloredit.moc
++mocs: pmobjectlinkedit.moc
#>+ 3
pmglview.moc: $(srcdir)/pmglview.h
-@@ -2262,13 +2273,6 @@
+@@ -2263,11 +2265,18 @@
mocs: pmglview.moc
#>+ 3
-pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
- $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
--
--#>+ 2
++pmcoloredit.moc: $(srcdir)/pmcoloredit.h
++ $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
+
+ #>+ 2
-mocs: pmobjectlinkedit.moc
--
--#>+ 3
++mocs: pmcoloredit.moc
++
++#>+ 3
++pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
++ $(MOC) $(srcdir)/pmbicubicpatchedit.h -o pmbicubicpatchedit.moc
++
++#>+ 2
++mocs: pmbicubicpatchedit.moc
+
+ #>+ 3
pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
- $(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
+@@ -2340,18 +2349,18 @@
+ mocs: pmnormaledit.moc
-@@ -2381,18 +2385,18 @@
- mocs: pmpovrayrenderwidget.moc
-
#>+ 3
--pmdockwidget.moc: $(srcdir)/pmdockwidget.h
-- $(MOC) $(srcdir)/pmdockwidget.h -o pmdockwidget.moc
-+pmviewbase.moc: $(srcdir)/pmviewbase.h
-+ $(MOC) $(srcdir)/pmviewbase.h -o pmviewbase.moc
+-pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
+- $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
++pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
++ $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
#>+ 2
--mocs: pmdockwidget.moc
-+mocs: pmviewbase.moc
+-mocs: pmlibraryobjectsearch.moc
++mocs: pmgraphicalobjectedit.moc
#>+ 3
--pmviewbase.moc: $(srcdir)/pmviewbase.h
-- $(MOC) $(srcdir)/pmviewbase.h -o pmviewbase.moc
-+pmdockwidget.moc: $(srcdir)/pmdockwidget.h
-+ $(MOC) $(srcdir)/pmdockwidget.h -o pmdockwidget.moc
+-pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
+- $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
++pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
++ $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
#>+ 2
--mocs: pmviewbase.moc
-+mocs: pmdockwidget.moc
+-mocs: pmgraphicalobjectedit.moc
++mocs: pmlibraryobjectsearch.moc
#>+ 3
- pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-@@ -2416,18 +2420,18 @@
- mocs: pmrendermanager.moc
+ pmprismedit.moc: $(srcdir)/pmprismedit.h
+@@ -2396,18 +2405,18 @@
+ mocs: pmviewbase.moc
#>+ 3
--pmpart.moc: $(srcdir)/pmpart.h
-- $(MOC) $(srcdir)/pmpart.h -o pmpart.moc
-+pmsolidcoloredit.moc: $(srcdir)/pmsolidcoloredit.h
-+ $(MOC) $(srcdir)/pmsolidcoloredit.h -o pmsolidcoloredit.moc
+-pmgridsettings.moc: $(srcdir)/pmgridsettings.h
+- $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
++pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
++ $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
#>+ 2
--mocs: pmpart.moc
-+mocs: pmsolidcoloredit.moc
+-mocs: pmgridsettings.moc
++mocs: pmdetailobjectedit.moc
#>+ 3
--pmsolidcoloredit.moc: $(srcdir)/pmsolidcoloredit.h
-- $(MOC) $(srcdir)/pmsolidcoloredit.h -o pmsolidcoloredit.moc
-+pmpart.moc: $(srcdir)/pmpart.h
-+ $(MOC) $(srcdir)/pmpart.h -o pmpart.moc
+-pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
+- $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
++pmgridsettings.moc: $(srcdir)/pmgridsettings.h
++ $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
#>+ 2
--mocs: pmsolidcoloredit.moc
-+mocs: pmpart.moc
+-mocs: pmdetailobjectedit.moc
++mocs: pmgridsettings.moc
#>+ 3
- pmheightfieldedit.moc: $(srcdir)/pmheightfieldedit.h
-@@ -2451,18 +2455,18 @@
- mocs: pmvectoredit.moc
+ pmrendermanager.moc: $(srcdir)/pmrendermanager.h
+@@ -2445,11 +2454,11 @@
+ mocs: pmmaterialmapedit.moc
#>+ 3
--pmtextureedit.moc: $(srcdir)/pmtextureedit.h
-- $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
+-pmvectoredit.moc: $(srcdir)/pmvectoredit.h
+- $(MOC) $(srcdir)/pmvectoredit.h -o pmvectoredit.moc
+pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
+ $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
#>+ 2
--mocs: pmtextureedit.moc
+-mocs: pmvectoredit.moc
+mocs: pmpovraywidget.moc
#>+ 3
+ pmtextureedit.moc: $(srcdir)/pmtextureedit.h
+@@ -2459,11 +2468,11 @@
+ mocs: pmtextureedit.moc
+
+ #>+ 3
-pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
- $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
-+pmtextureedit.moc: $(srcdir)/pmtextureedit.h
-+ $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
++pmvectoredit.moc: $(srcdir)/pmvectoredit.h
++ $(MOC) $(srcdir)/pmvectoredit.h -o pmvectoredit.moc
#>+ 2
-mocs: pmpovraywidget.moc
-+mocs: pmtextureedit.moc
++mocs: pmvectoredit.moc
#>+ 3
pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2580,7 +2584,7 @@
+@@ -2494,13 +2503,6 @@
+ mocs: pmvectorlistedit.moc
#>+ 3
+-pmsolidobjectedit.moc: $(srcdir)/pmsolidobjectedit.h
+- $(MOC) $(srcdir)/pmsolidobjectedit.h -o pmsolidobjectedit.moc
+-
+-#>+ 2
+-mocs: pmsolidobjectedit.moc
+-
+-#>+ 3
+ pmfogedit.moc: $(srcdir)/pmfogedit.h
+ $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
+
+@@ -2515,6 +2517,13 @@
+ mocs: pmshell.moc
+
+ #>+ 3
++pmsolidobjectedit.moc: $(srcdir)/pmsolidobjectedit.h
++ $(MOC) $(srcdir)/pmsolidobjectedit.h -o pmsolidobjectedit.moc
++
++#>+ 2
++mocs: pmsolidobjectedit.moc
++
++#>+ 3
+ pmsettingsdialog.moc: $(srcdir)/pmsettingsdialog.h
+ $(MOC) $(srcdir)/pmsettingsdialog.h -o pmsettingsdialog.moc
+
+@@ -2581,7 +2590,7 @@
+
+ #>+ 3
clean-metasources:
- -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pmtorusedit.moc pminteriortextureedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmlibraryentrypreview.moc pmviewlayoutmanager.moc pmcameraedit.moc pmboxedit.moc pmblobsphereedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmlibraryiconview.moc pmimagemapedit.moc pmradiosityedit.moc pmlightgroupedit.moc pmdragwidget.moc pmactions.moc pmdiscedit.moc pmlibrarybrowser.moc pmpalettevalueedit.moc pmlightedit.moc pmview.moc pmobjectlibrarysettings.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pminterioredit.moc pmlibraryhandleedit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmfiledialog.moc pmslopeedit.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 pmsoredit.moc pmquickcoloredit.moc pmdeclareedit.moc pmrainbowedit.moc pmsqeedit.moc pmdialogview.moc pmcoloredit.moc pmbicubicpatchedit.moc pmglview.moc pmobjectlinkedit.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 pmdockwidget.moc pmviewbase.moc pmgridsettings.moc pmdetailobjectedit.moc pmrendermanager.moc pmpart.moc pmsolidcoloredit.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmtextureedit.moc pmpovraywidget.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
-+ -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
++ -rm -f pmblobcylinderedit.moc pmcylinderedit.moc pmlineedits.moc pmtorusedit.moc pminteriortextureedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmboxedit.moc pmblobsphereedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmlibraryiconview.moc pmimagemapedit.moc pmlightgroupedit.moc pmdragwidget.moc pmradiosityedit.moc pmactions.moc pmlibrarybrowser.moc pmdiscedit.moc pmpalettevalueedit.moc pmlightedit.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 pmfiledialog.moc pmslopeedit.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmglobalphotonsedit.moc pmglobalsettingsedit.moc pmpigmentedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmphotonsedit.moc pmpatternedit.moc pmrainbowedit.moc pmdeclareedit.moc pmsoredit.moc pmquickcoloredit.moc pmdialogview.moc pmsqeedit.moc pmobjectlinkedit.moc pmglview.moc pmcoloredit.moc pmbicubicpatchedit.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmgraphicalobjectedit.moc pmlibraryobjectsearch.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmdockwidget.moc pmviewbase.moc pmdetailobjectedit.moc pmgridsettings.moc pmrendermanager.moc pmpart.moc pmsolidcoloredit.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmpovraywidget.moc pmtextureedit.moc pmvectoredit.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmfogedit.moc pmshell.moc pmsolidobjectedit.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
#>+ 2
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
-@@ -2599,29 +2603,29 @@
+@@ -2600,29 +2609,29 @@
#>+ 25
install-kde-icons:
@@ -23089,43 +48340,54 @@
- $(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/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)/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)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.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)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/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)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/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/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)/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/16x16/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.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)/hicolor/16x16/apps/kpovmodeler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.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
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23135,17 +48397,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23154,7 +48462,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23166,21 +48474,20 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -593,7 +597,7 @@
+@@ -594,473 +603,473 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr16-action-pmcolorlist.png cr22-action-pmblobsphere.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr16-action-pmsqe.png cr22-action-pmslope.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmlight.png cr16-action-pmaddsubprism.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtexturemapdeclare.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr22-action-pmmaterialmap.png cr16-action-pmrenderpreview.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmisosurface.png cr16-action-pmbox.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr16-action-pmrainbowdeclare.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmdialogview.png cr16-action-pmradiosity.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmconfiguregraphicalview.png cr22-action-pmdrag.png cr16-action-pmcamera.png cr16-action-pmboundedby.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr22-action-pmlistpattern.png cr16-action-pmfogdeclare.png Makefile.am cr16-action-pmdensitymap.png cr22-action-pmslopemapdeclare.png cr22-action-pmfinish.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pmmatrix.png cr22-action-pminteriortexture.png cr16-action-pmunion.png cr16-action-pmmediadeclare.png cr22-action-pmnormallist.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr22-action-pmradiosity.png cr16-action-pmsor.png cr16-action-pminsertlastchild.png cr22-action-pmobjectdeclare.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr16-action-pmbumpmap.png cr22-action-pmskysphere.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pmtexturemapdeclare.png cr16-action-pminteriortexture.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr22-action-pmtriangle.png cr16-action-pmremovepoint.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr16-action-pmpigmentmap.png cr22-action-pmprism.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr16-action-pmnormal.png cr22-action-pmcamera.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmconfigureviewlayout.png cr22-action-pmglobalphotons.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr22-action-pmlight.png cr16-action-pmblobsphere.png cr22-action-pmdisc.png cr22-action-pminteriordeclare.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr16-action-pmslopemapdeclare.png cr22-action-pmmaterial.png cr22-action-pmcone.png
-+KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr22-action-pmblobsphere.png cr16-action-pmcolorlist.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr22-action-pmslope.png cr16-action-pmsqe.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmlight.png cr16-action-pmaddsubprism.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtexturemapdeclare.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr16-action-pmrenderpreview.png cr22-action-pmmaterialmap.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmbox.png cr16-action-pmisosurface.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr16-action-pmrainbowdeclare.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmdialogview.png cr16-action-pmradiosity.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmdrag.png cr22-action-pmconfiguregraphicalview.png cr16-action-pmboundedby.png cr16-action-pmcamera.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr16-action-pmfogdeclare.png cr22-action-pmlistpattern.png Makefile.am cr22-action-pmfinish.png cr22-action-pmslopemapdeclare.png cr16-action-pmdensitymap.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pminteriortexture.png cr22-action-pmmatrix.png cr16-action-pmunion.png cr22-action-pmnormallist.png cr16-action-pmmediadeclare.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr22-action-pmradiosity.png cr16-action-pmsor.png cr22-action-pmobjectdeclare.png cr16-action-pminsertlastchild.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr22-action-pmskysphere.png cr16-action-pmbumpmap.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pminteriortexture.png cr16-action-pmtexturemapdeclare.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr16-action-pmremovepoint.png cr22-action-pmtriangle.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr22-action-pmprism.png cr16-action-pmpigmentmap.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr16-action-pmnormal.png cr22-action-pmcamera.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmconfigureviewlayout.png cr22-action-pmglobalphotons.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr22-action-pmlight.png cr16-action-pmblobsphere.png cr22-action-pmdisc.png cr22-action-pminteriordeclare.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr16-action-pmslopemapdeclare.png cr22-action-pmmaterial.png cr22-action-pmcone.png
++KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr16-action-pmcolorlist.png cr22-action-pmblobsphere.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr22-action-pmslope.png cr16-action-pmsqe.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmaddsubprism.png cr16-action-pmlight.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtexturemapdeclare.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr16-action-pmrenderpreview.png cr22-action-pmmaterialmap.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmisosurface.png cr16-action-pmbox.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr16-action-pmrainbowdeclare.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmradiosity.png cr16-action-pmdialogview.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmconfiguregraphicalview.png cr22-action-pmdrag.png cr16-action-pmcamera.png cr16-action-pmboundedby.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr16-action-pmfogdeclare.png cr22-action-pmlistpattern.png Makefile.am cr22-action-pmslopemapdeclare.png cr16-action-pmdensitymap.png cr22-action-pmfinish.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pmmatrix.png cr22-action-pminteriortexture.png cr16-action-pmunion.png cr16-action-pmmediadeclare.png cr22-action-pmnormallist.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr16-action-pmsor.png cr22-action-pmradiosity.png cr22-action-pmobjectdeclare.png cr16-action-pminsertlastchild.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr22-action-pmskysphere.png cr16-action-pmbumpmap.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pminteriortexture.png cr16-action-pmtexturemapdeclare.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr22-action-pmtriangle.png cr16-action-pmremovepoint.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr22-action-pmprism.png cr16-action-pmpigmentmap.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr22-action-pmcamera.png cr16-action-pmnormal.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmglobalphotons.png cr22-action-pmconfigureviewlayout.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr16-action-pmblobsphere.png cr22-action-pmlight.png cr22-action-pmdisc.png cr22-action-pminteriordeclare.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr22-action-pmmaterial.png cr16-action-pmslopemapdeclare.png cr22-action-pmcone.png
#>+ 2
docs-am:
-@@ -601,465 +605,465 @@
+
#>+ 462
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
+- $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
$(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
@@ -23199,26 +48506,17 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
@@ -23226,12 +48524,7 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
@@ -23243,41 +48536,28 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
++ $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
@@ -23285,9 +48565,7 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
@@ -23297,50 +48575,78 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
$(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguretexturepreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureopengl.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjects.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
@@ -23351,18 +48657,15 @@
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
@@ -23379,181 +48682,177 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguredialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregraphicalview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjects.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguredialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregraphicalview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregraphicalview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtreeview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureopengl.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjects.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtreeview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
@@ -23565,17 +48864,33 @@
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
- $(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-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.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
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
@@ -23594,19 +48909,18 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-+ $(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
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
@@ -23627,27 +48941,17 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
@@ -23655,12 +48959,7 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
@@ -23672,41 +48971,27 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
@@ -23714,9 +48999,7 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
@@ -23726,17 +49009,22 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
@@ -23747,34 +49035,23 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
@@ -23782,16 +49059,15 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
@@ -23805,184 +49081,213 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
@@ -23994,17 +49299,33 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
- -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/pmprojectedthrough.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
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
@@ -24023,25 +49344,32 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-+ -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
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
#>+ 15
force-reedit:
--- kpovmodeler/pics/locolor/Makefile.in
+++ kpovmodeler/pics/locolor/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24051,17 +49379,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24070,7 +49444,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24082,7 +49456,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -601,156 +605,156 @@
+@@ -602,156 +611,156 @@
#>+ 153
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions
@@ -24092,89 +49466,110 @@
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsqr.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
$(INSTALL_DATA) $(srcdir)/lo16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
@@ -24183,43 +49578,21 @@
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsqr.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
$(INSTALL_DATA) $(srcdir)/lo16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
@@ -24228,89 +49601,110 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
-rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
@@ -24319,49 +49713,35 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
#>+ 15
force-reedit:
--- kpovmodeler/pics/Makefile.in
+++ kpovmodeler/pics/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24371,17 +49751,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24390,7 +49816,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24404,7 +49830,15 @@
mostlyclean-libtool:
--- kruler/Makefile.in
+++ kruler/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -178,6 +178,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -272,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24414,17 +49848,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -355,7 +358,8 @@
+@@ -322,18 +326,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,8 +354,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -362,6 +367,7 @@
host_cpu = @host_cpu@
-@@ -483,7 +487,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -444,12 +450,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -484,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24433,7 +49913,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +525,9 @@
+@@ -522,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24447,7 +49927,15 @@
@$(NORMAL_INSTALL)
--- kruler/pics/Makefile.in
+++ kruler/pics/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24457,17 +49945,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -421,7 +425,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24476,7 +50010,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +463,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24488,31 +50022,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,18 +637,18 @@
+@@ -632,19 +641,19 @@
+
+ #>+ 16
install-kde-icons:
- $(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/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/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/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/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)/hicolor/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/22x22/apps/kruler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/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
-@@ -257,6 +257,9 @@
+@@ -163,6 +163,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -257,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24522,17 +50068,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,8 @@
+@@ -307,18 +311,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +339,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -347,6 +352,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -429,12 +435,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24541,7 +50133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24553,42 +50145,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -838,23 +842,23 @@
-
- #>+ 19
+@@ -841,21 +850,21 @@
install-kde-icons:
-- $(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/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/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/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/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/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/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
+ -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/22x22/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/22x22/apps/ksnapshot.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
#>+ 15
force-reedit:
--- ksvg/core/Makefile.in
+++ ksvg/core/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -164,6 +164,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -258,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24598,17 +50196,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,8 @@
+@@ -308,18 +312,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +340,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -348,6 +353,7 @@
host_cpu = @host_cpu@
-@@ -468,7 +472,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -430,12 +436,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -469,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -24617,7 +50261,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +510,9 @@
+@@ -507,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24629,39 +50273,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -812,22 +816,22 @@
- mocs: KSVGReader.moc
-
- #>+ 3
--KSVGCanvas.moc: $(srcdir)/KSVGCanvas.h
-- $(MOC) $(srcdir)/KSVGCanvas.h -o KSVGCanvas.moc
-+KSVGLoader.moc: $(srcdir)/KSVGLoader.h
-+ $(MOC) $(srcdir)/KSVGLoader.h -o KSVGLoader.moc
-
- #>+ 2
--mocs: KSVGCanvas.moc
-+mocs: KSVGLoader.moc
-
- #>+ 3
--KSVGLoader.moc: $(srcdir)/KSVGLoader.h
-- $(MOC) $(srcdir)/KSVGLoader.h -o KSVGLoader.moc
-+KSVGCanvas.moc: $(srcdir)/KSVGCanvas.h
-+ $(MOC) $(srcdir)/KSVGCanvas.h -o KSVGCanvas.moc
-
- #>+ 2
--mocs: KSVGLoader.moc
-+mocs: KSVGCanvas.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f KSVGReader.moc KSVGCanvas.moc KSVGLoader.moc
-+ -rm -f KSVGReader.moc KSVGLoader.moc KSVGCanvas.moc
-
- #>+ 2
- KDE_DIST=KSVGHelper.h KSVGReader.h KSVGLoader.h Makefile.am KSVGTextChunk.h Makefile.in ksvgrenderer.desktop
--- ksvg/dom/Makefile.in
+++ ksvg/dom/Makefile.in
-@@ -373,6 +373,9 @@
+@@ -279,6 +279,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -373,6 +374,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24671,17 +50293,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,8 @@
+@@ -423,18 +427,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -453,8 +455,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -463,6 +468,7 @@
host_cpu = @host_cpu@
-@@ -629,7 +633,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -545,12 +551,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -630,7 +639,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24690,7 +50358,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +671,9 @@
+@@ -668,9 +677,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24704,7 +50372,15 @@
clean-noinstLTLIBRARIES:
--- ksvg/ecma/Makefile.in
+++ ksvg/ecma/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -150,6 +150,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -244,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24714,17 +50390,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,8 @@
+@@ -294,18 +298,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -324,8 +326,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -334,6 +339,7 @@
host_cpu = @host_cpu@
-@@ -449,7 +453,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -416,12 +422,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -450,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24733,7 +50455,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +491,9 @@
+@@ -488,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24747,7 +50469,15 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/libs/art_support/Makefile.in
+++ ksvg/impl/libs/art_support/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -140,6 +140,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -234,6 +235,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24757,17 +50487,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -317,7 +320,8 @@
+@@ -284,18 +288,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -314,8 +316,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -324,6 +329,7 @@
host_cpu = @host_cpu@
-@@ -437,7 +441,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -406,12 +412,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -438,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -24776,7 +50552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +479,9 @@
+@@ -476,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24790,7 +50566,15 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/libs/libtext2path/Makefile.in
+++ ksvg/impl/libs/libtext2path/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24800,17 +50584,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -426,7 +430,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24819,7 +50649,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +468,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24833,7 +50663,15 @@
mostlyclean-libtool:
--- ksvg/impl/libs/libtext2path/src/Makefile.in
+++ ksvg/impl/libs/libtext2path/src/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -163,6 +163,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -257,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24843,17 +50681,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,8 @@
+@@ -307,18 +311,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +339,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -347,6 +352,7 @@
host_cpu = @host_cpu@
-@@ -464,7 +468,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -429,12 +435,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -465,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24862,7 +50746,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +506,9 @@
+@@ -503,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24876,7 +50760,15 @@
@$(NORMAL_INSTALL)
--- ksvg/impl/libs/Makefile.in
+++ ksvg/impl/libs/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24886,17 +50778,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24905,7 +50843,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24919,7 +50857,15 @@
mostlyclean-libtool:
--- ksvg/impl/libs/xrgbrender/Makefile.in
+++ ksvg/impl/libs/xrgbrender/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -140,6 +140,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -234,6 +235,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24929,17 +50875,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -317,7 +320,8 @@
+@@ -284,18 +288,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -314,8 +316,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -324,6 +329,7 @@
host_cpu = @host_cpu@
-@@ -437,7 +441,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -406,12 +412,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -438,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -24948,7 +50940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +479,9 @@
+@@ -476,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24962,7 +50954,15 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/Makefile.in
+++ ksvg/impl/Makefile.in
-@@ -409,6 +409,9 @@
+@@ -315,6 +315,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -409,6 +410,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24972,17 +50972,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,8 @@
+@@ -459,18 +463,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -489,8 +491,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -499,6 +504,7 @@
host_cpu = @host_cpu@
-@@ -722,7 +726,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -581,12 +587,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -723,7 +732,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -24991,7 +51037,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -760,9 +764,9 @@
+@@ -761,9 +770,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25003,18 +51049,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -1304,7 +1308,7 @@
+@@ -1305,7 +1314,7 @@
-rm -f SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
#>+ 2
-KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAElementImpl.h SVGAltGlyphDefElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGDefsElementImpl.h SVGMPathElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
-+KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
++KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedPathDataImpl.h SVGAnimatedEnumerationImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGZoomEventImpl.h SVGVKernElementImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGLangSpaceImpl.h SVGFEBlendElementImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
#>+ 2
docs-am:
--- ksvg/Makefile.in
+++ ksvg/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -175,6 +175,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -269,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25024,17 +51078,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -352,7 +355,8 @@
+@@ -319,18 +323,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -349,8 +351,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -359,6 +364,7 @@
host_cpu = @host_cpu@
-@@ -481,7 +485,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -441,12 +447,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25043,7 +51143,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +523,9 @@
+@@ -520,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25057,7 +51157,15 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/agg/Makefile.in
+++ ksvg/plugin/backends/agg/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -164,6 +164,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -258,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25067,17 +51175,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,8 @@
+@@ -308,18 +312,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +340,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -348,6 +353,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -430,12 +436,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25086,7 +51240,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25100,7 +51254,15 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/libart/Makefile.in
+++ ksvg/plugin/backends/libart/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -165,6 +165,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25110,17 +51272,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -342,7 +345,8 @@
+@@ -309,18 +313,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -339,8 +341,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -349,6 +354,7 @@
host_cpu = @host_cpu@
-@@ -467,7 +471,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -431,12 +437,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -468,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25129,7 +51337,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +509,9 @@
+@@ -506,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25143,7 +51351,15 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/Makefile.in
+++ ksvg/plugin/backends/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25153,17 +51369,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25172,7 +51434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25186,7 +51448,15 @@
mostlyclean-libtool:
--- ksvg/plugin/Makefile.in
+++ ksvg/plugin/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -188,6 +188,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25196,17 +51466,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -365,7 +368,8 @@
+@@ -332,18 +336,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,8 +364,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -372,6 +377,7 @@
host_cpu = @host_cpu@
-@@ -500,7 +504,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -454,12 +460,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -501,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25215,7 +51531,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +542,9 @@
+@@ -539,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25227,52 +51543,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1014,18 +1018,18 @@
- mocs: svgcreator.moc
-
- #>+ 3
--ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
-- $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
-+ksvg_factory.moc: $(srcdir)/ksvg_factory.h
-+ $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
-
- #>+ 2
--mocs: ksvg_plugin.moc
-+mocs: ksvg_factory.moc
-
- #>+ 3
--ksvg_factory.moc: $(srcdir)/ksvg_factory.h
-- $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
-+ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
-+ $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
-
- #>+ 2
--mocs: ksvg_factory.moc
-+mocs: ksvg_plugin.moc
-
- #>+ 8
- svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
-@@ -1038,7 +1042,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
-+ -rm -f ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
-
- #>+ 2
- KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
-@@ -1089,7 +1093,7 @@
-
-
- #>+ 11
--libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
-+libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
- @echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
- rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
--- ksvg/test/external/Makefile.in
+++ ksvg/test/external/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -157,6 +157,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -251,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25282,17 +51563,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -334,7 +337,8 @@
+@@ -301,18 +305,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -331,8 +333,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
-@@ -460,7 +464,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -423,12 +429,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -461,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -25301,7 +51628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +502,9 @@
+@@ -499,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25315,7 +51642,15 @@
@$(NORMAL_INSTALL)
--- ksvg/test/Makefile.in
+++ ksvg/test/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25325,17 +51660,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25344,7 +51725,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25358,7 +51739,15 @@
mostlyclean-libtool:
--- kuickshow/Makefile.in
+++ kuickshow/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -132,6 +132,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -226,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25368,17 +51757,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,7 +312,8 @@
+@@ -276,18 +280,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -306,8 +308,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -316,6 +321,7 @@
host_cpu = @host_cpu@
-@@ -426,7 +430,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25387,7 +51822,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +468,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25401,7 +51836,15 @@
mostlyclean-libtool:
--- kuickshow/misc/Makefile.in
+++ kuickshow/misc/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25411,17 +51854,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -420,7 +424,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25430,7 +51919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +462,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25444,7 +51933,15 @@
mostlyclean-libtool:
--- kuickshow/pics/Makefile.in
+++ kuickshow/pics/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -125,6 +125,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -219,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25454,17 +51951,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,7 +305,8 @@
+@@ -269,18 +273,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +301,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -309,6 +314,7 @@
host_cpu = @host_cpu@
-@@ -427,7 +431,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25473,7 +52016,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +469,9 @@
+@@ -466,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25487,7 +52030,15 @@
mostlyclean-libtool:
--- kuickshow/src/Makefile.in
+++ kuickshow/src/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -179,6 +179,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -273,6 +274,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25497,17 +52048,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -356,7 +359,8 @@
+@@ -323,18 +327,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -353,8 +355,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -363,6 +368,7 @@
host_cpu = @host_cpu@
-@@ -498,7 +502,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -445,12 +451,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -500,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25516,7 +52113,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +540,9 @@
+@@ -538,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25528,9 +52125,115 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -945,18 +954,18 @@
+ mocs: aboutwidget.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
+-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
+ imagewindow.moc: $(srcdir)/imagewindow.h
+@@ -980,18 +989,18 @@
+ mocs: generalwidget.moc
+
+ #>+ 3
+-mainwidget.moc: $(srcdir)/mainwidget.h
+- $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
++kurlwidget.moc: $(srcdir)/kurlwidget.h
++ $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc
+
+ #>+ 2
+-mocs: mainwidget.moc
++mocs: kurlwidget.moc
+
+ #>+ 3
+-kurlwidget.moc: $(srcdir)/kurlwidget.h
+- $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc
++mainwidget.moc: $(srcdir)/mainwidget.h
++ $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
+
+ #>+ 2
+-mocs: kurlwidget.moc
++mocs: mainwidget.moc
+
+ #>+ 3
+ kuickimage.moc: $(srcdir)/kuickimage.h
+@@ -1037,7 +1046,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f filewidget.moc aboutwidget.moc printing.moc filefinder.moc imagewindow.moc slideshowwidget.moc generalwidget.moc mainwidget.moc kurlwidget.moc kuickimage.moc defaultswidget.moc kuickfile.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
++ -rm -f filewidget.moc aboutwidget.moc filefinder.moc printing.moc imagewindow.moc slideshowwidget.moc generalwidget.moc kurlwidget.moc mainwidget.moc kuickimage.moc defaultswidget.moc kuickfile.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
+
+ #>+ 2
+ KDE_DIST=aboutwidget.h imagewindow.h kuickconfigdlg.h filecache.h mainwidget.cpp kuickdata.h generalwidget.h defaultswidget.h imdata.h hi32-app-kuickshow.png kuickshow.desktop kuickglobals.h filewidget.h kuick.h Makefile.am kuickfile.h imlibwidget.h Makefile.in mainwidget.h kuickimage.h printing.h hi22-app-kuickshow.png filefinder.h hi16-app-kuickshow.png slideshowwidget.h kuickshow.h kurlwidget.h version.h
+@@ -1047,17 +1056,17 @@
+
+ #>+ 13
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kuickshow.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuickshow.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kuickshow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuickshow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
+
+ #>+ 15
+ force-reedit:
+@@ -1098,7 +1107,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)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.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)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc printing.moc filefinder.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.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; \
+@@ -1110,7 +1119,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)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.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)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc printing.moc filefinder.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.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
-@@ -272,6 +272,9 @@
+@@ -178,6 +178,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -272,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25540,17 +52243,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -355,7 +358,8 @@
+@@ -322,18 +326,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,8 +354,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -362,6 +367,7 @@
host_cpu = @host_cpu@
-@@ -484,7 +488,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -444,12 +450,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -485,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25559,7 +52308,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +526,9 @@
+@@ -523,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25573,7 +52322,15 @@
@$(NORMAL_INSTALL)
--- kview/config/plugins/Makefile.in
+++ kview/config/plugins/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -162,6 +162,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -256,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25583,17 +52340,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,8 @@
+@@ -306,18 +310,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
-@@ -465,7 +469,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -466,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25602,7 +52405,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +507,9 @@
+@@ -504,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25616,7 +52419,15 @@
@$(NORMAL_INSTALL)
--- kview/kimageviewer/Makefile.in
+++ kview/kimageviewer/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -166,6 +166,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -260,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25626,17 +52437,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -343,7 +346,8 @@
+@@ -310,18 +314,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -340,8 +342,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -350,6 +355,7 @@
host_cpu = @host_cpu@
-@@ -473,7 +477,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -432,12 +438,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -474,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25645,7 +52502,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +515,9 @@
+@@ -512,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25659,7 +52516,15 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/config/Makefile.in
+++ kview/kviewcanvas/config/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -165,6 +165,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25669,17 +52534,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -342,7 +345,8 @@
+@@ -309,18 +313,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -339,8 +341,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -349,6 +354,7 @@
host_cpu = @host_cpu@
-@@ -470,7 +474,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -431,12 +437,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25688,7 +52599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +512,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25702,7 +52613,15 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/Makefile.in
+++ kview/kviewcanvas/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -180,6 +180,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -274,6 +275,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25712,17 +52631,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,8 @@
+@@ -324,18 +328,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,8 +356,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -364,6 +369,7 @@
host_cpu = @host_cpu@
-@@ -487,7 +491,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -446,12 +452,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -488,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25731,7 +52696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +529,9 @@
+@@ -526,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25745,7 +52710,15 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/test/Makefile.in
+++ kview/kviewcanvas/test/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -149,6 +149,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25755,17 +52728,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,7 +329,8 @@
+@@ -293,18 +297,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -323,8 +325,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -333,6 +338,7 @@
host_cpu = @host_cpu@
-@@ -448,7 +452,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -415,12 +421,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -449,7 +458,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25774,7 +52793,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +490,9 @@
+@@ -487,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25788,7 +52807,15 @@
clean-checkPROGRAMS:
--- kview/kviewviewer/config/Makefile.in
+++ kview/kviewviewer/config/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -163,6 +163,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -257,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25798,17 +52825,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,8 @@
+@@ -307,18 +311,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +339,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -347,6 +352,7 @@
host_cpu = @host_cpu@
-@@ -466,7 +470,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -429,12 +435,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -467,7 +476,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25817,7 +52890,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +508,9 @@
+@@ -505,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25831,7 +52904,15 @@
@$(NORMAL_INSTALL)
--- kview/kviewviewer/Makefile.in
+++ kview/kviewviewer/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -183,6 +183,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -277,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25841,17 +52922,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -360,7 +363,8 @@
+@@ -327,18 +331,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -367,6 +372,7 @@
host_cpu = @host_cpu@
-@@ -494,7 +498,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -449,12 +455,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -495,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25860,7 +52987,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +536,9 @@
+@@ -533,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25872,7 +52999,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -949,18 +953,18 @@
+@@ -950,18 +959,18 @@
#>+ 3
@@ -25897,7 +53024,7 @@
#>+ 3
imagesettings.moc: $(srcdir)/imagesettings.h
-@@ -971,7 +975,7 @@
+@@ -972,7 +981,7 @@
#>+ 3
clean-metasources:
@@ -25906,7 +53033,7 @@
#>+ 2
KDE_DIST=kviewvieweriface.h Makefile.am printimagesettings.ui kviewviewer.desktop kviewpopup.rc Makefile.in imagesettings.h kviewviewer.rc kviewviewer_ro.rc
-@@ -1027,7 +1031,7 @@
+@@ -1028,7 +1037,7 @@
#>+ 11
@@ -25917,7 +53044,15 @@
echo "#define KDE_USE_FINAL 1" >> libkviewviewer_la.all_cpp.final; \
--- kview/kviewviewer/test/Makefile.in
+++ kview/kviewviewer/test/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -148,6 +148,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -242,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25927,17 +53062,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,7 +328,8 @@
+@@ -292,18 +296,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,8 +324,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -332,6 +337,7 @@
host_cpu = @host_cpu@
-@@ -447,7 +451,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -414,12 +420,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -448,7 +457,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25946,7 +53127,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +489,9 @@
+@@ -486,9 +495,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25960,7 +53141,15 @@
clean-checkPROGRAMS:
--- kview/Makefile.in
+++ kview/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -193,6 +193,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25970,17 +53159,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -370,7 +373,8 @@
+@@ -337,18 +341,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -377,6 +382,7 @@
host_cpu = @host_cpu@
-@@ -504,7 +508,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -459,12 +465,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -505,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25989,7 +53224,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +546,9 @@
+@@ -543,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26001,7 +53236,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1052,19 +1056,19 @@
+@@ -1053,20 +1062,20 @@
#>+ 16
install-kde-icons:
@@ -26009,24 +53244,36 @@
- $(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/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
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
uninstall-kde-icons:
- -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/16x16/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
#>+ 15
+ force-reedit:
--- kview/modules/browser/Makefile.in
+++ kview/modules/browser/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -161,6 +161,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26036,17 +53283,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,8 @@
+@@ -305,18 +309,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +337,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
-@@ -463,7 +467,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -464,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26055,7 +53348,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +505,9 @@
+@@ -502,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26069,7 +53362,15 @@
@$(NORMAL_INSTALL)
--- kview/modules/effects/Makefile.in
+++ kview/modules/effects/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -158,6 +158,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -252,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26079,17 +53380,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,8 @@
+@@ -302,18 +306,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +334,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
-@@ -460,7 +464,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -424,12 +430,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -461,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26098,7 +53445,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +502,9 @@
+@@ -499,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26112,7 +53459,15 @@
@$(NORMAL_INSTALL)
--- kview/modules/Makefile.in
+++ kview/modules/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26122,17 +53477,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26141,7 +53542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26155,7 +53556,15 @@
mostlyclean-libtool:
--- kview/modules/presenter/config/Makefile.in
+++ kview/modules/presenter/config/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -162,6 +162,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -256,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26165,17 +53574,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,8 @@
+@@ -306,18 +310,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
-@@ -465,7 +469,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -466,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26184,7 +53639,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +507,9 @@
+@@ -504,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26198,7 +53653,15 @@
@$(NORMAL_INSTALL)
--- kview/modules/presenter/Makefile.in
+++ kview/modules/presenter/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -178,6 +178,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -272,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26208,17 +53671,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -355,7 +358,8 @@
+@@ -322,18 +326,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,8 +354,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -362,6 +367,7 @@
host_cpu = @host_cpu@
-@@ -483,7 +487,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -444,12 +450,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -484,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26227,7 +53736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +525,9 @@
+@@ -522,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26241,7 +53750,15 @@
@$(NORMAL_INSTALL)
--- kview/modules/scale/Makefile.in
+++ kview/modules/scale/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -163,6 +163,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -257,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26251,17 +53768,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,8 @@
+@@ -307,18 +311,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +339,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -347,6 +352,7 @@
host_cpu = @host_cpu@
-@@ -465,7 +469,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -429,12 +435,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -466,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26270,7 +53833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +507,9 @@
+@@ -504,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26284,7 +53847,15 @@
@$(NORMAL_INSTALL)
--- kview/modules/scanner/Makefile.in
+++ kview/modules/scanner/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -158,6 +158,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -252,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26294,17 +53865,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,8 @@
+@@ -302,18 +306,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +334,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
-@@ -460,7 +464,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -424,12 +430,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -461,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26313,7 +53930,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +502,9 @@
+@@ -499,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26327,7 +53944,15 @@
@$(NORMAL_INSTALL)
--- kview/modules/template/Makefile.in
+++ kview/modules/template/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -159,6 +159,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -253,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26337,17 +53962,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -336,7 +339,8 @@
+@@ -303,18 +307,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,8 +335,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -343,6 +348,7 @@
host_cpu = @host_cpu@
-@@ -461,7 +465,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -425,12 +431,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -462,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26356,7 +54027,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +503,9 @@
+@@ -500,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26370,7 +54041,15 @@
@$(NORMAL_INSTALL)
--- kview/photobook/Makefile.in
+++ kview/photobook/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -160,6 +160,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -254,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26380,17 +54059,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -337,7 +340,8 @@
+@@ -304,18 +308,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +336,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -344,6 +349,7 @@
host_cpu = @host_cpu@
-@@ -465,7 +469,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -426,12 +432,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -466,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26399,7 +54124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +507,9 @@
+@@ -504,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26413,7 +54138,15 @@
@$(NORMAL_INSTALL)
--- kviewshell/Makefile.in
+++ kviewshell/Makefile.in
-@@ -339,6 +339,9 @@
+@@ -245,6 +245,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -339,6 +340,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26423,17 +54156,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,8 @@
+@@ -389,18 +393,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -429,6 +434,7 @@
host_cpu = @host_cpu@
-@@ -593,7 +597,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -511,12 +517,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26442,7 +54221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +635,9 @@
+@@ -632,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26454,7 +54233,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1405,11 +1409,11 @@
+@@ -1364,18 +1373,18 @@
+ mocs: renderedDocumentPage.moc
+
+ #>+ 3
+-kviewpart_iface.moc: $(srcdir)/kviewpart_iface.h
+- $(MOC) $(srcdir)/kviewpart_iface.h -o kviewpart_iface.moc
++kviewpart.moc: $(srcdir)/kviewpart.h
++ $(MOC) $(srcdir)/kviewpart.h -o kviewpart.moc
+
+ #>+ 2
+-mocs: kviewpart_iface.moc
++mocs: kviewpart.moc
+
+ #>+ 3
+-kviewpart.moc: $(srcdir)/kviewpart.h
+- $(MOC) $(srcdir)/kviewpart.h -o kviewpart.moc
++kviewpart_iface.moc: $(srcdir)/kviewpart_iface.h
++ $(MOC) $(srcdir)/kviewpart_iface.h -o kviewpart_iface.moc
+
+ #>+ 2
+-mocs: kviewpart.moc
++mocs: kviewpart_iface.moc
+
+ #>+ 3
+ documentWidget.moc: $(srcdir)/documentWidget.h
+@@ -1406,11 +1415,11 @@
mocs: documentRenderer.moc
#>+ 3
@@ -26469,88 +54273,27 @@
#>+ 3
sizePreview.moc: $(srcdir)/sizePreview.h
-@@ -1419,18 +1423,11 @@
+@@ -1420,11 +1429,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: history.moc
+-mocs: tableOfContents.moc
+mocs: kviewshell.moc
#>+ 3
- kmultipage.moc: $(srcdir)/kmultipage.h
-@@ -1440,11 +1437,11 @@
- mocs: kmultipage.moc
+ history.moc: $(srcdir)/history.h
+@@ -1513,10 +1522,10 @@
#>+ 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
-@@ -1454,18 +1451,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
-+zoom.moc: $(srcdir)/zoom.h
-+ $(MOC) $(srcdir)/zoom.h -o zoom.moc
-
- #>+ 2
--mocs: marklist.moc
-+mocs: zoom.moc
-
- #>+ 3
- pageSize.moc: $(srcdir)/pageSize.h
-@@ -1475,6 +1472,13 @@
- mocs: pageSize.moc
-
- #>+ 3
-+marklist.moc: $(srcdir)/marklist.h
-+ $(MOC) $(srcdir)/marklist.h -o marklist.moc
-+
-+#>+ 2
-+mocs: marklist.moc
-+
-+#>+ 3
- empty_multipage.moc: $(srcdir)/empty_multipage.h
- $(MOC) $(srcdir)/empty_multipage.h -o empty_multipage.moc
-
-@@ -1512,10 +1516,10 @@
-
- #>+ 3
clean-metasources:
- -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
++ -rm -f searchWidget.moc renderedDocumentPage.moc kviewpart.moc kviewpart_iface.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc documentRenderer.moc tableOfContents.moc sizePreview.moc kviewshell.moc history.moc kmultipage.moc pageView.moc renderedDocumentPagePixmap.moc zoom.moc marklist.moc pageSize.moc empty_multipage.moc pageSizeWidget.moc documentPageCache.moc
#>+ 2
-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
@@ -26558,18 +54301,17 @@
#>+ 4
clean-idl:
-@@ -1605,7 +1609,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
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26579,17 +54321,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -410,7 +414,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26598,7 +54386,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +452,9 @@
+@@ -449,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26610,44 +54398,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,24 +604,24 @@
-
+@@ -602,23 +611,23 @@
#>+ 20
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions
+ $(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-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/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/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.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
+ $(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
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/movetool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
-+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/32x32/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
#>+ 15
force-reedit:
--- kviewshell/pics/Makefile.in
+++ kviewshell/pics/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26657,17 +54450,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -426,7 +430,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26676,7 +54515,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +468,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26688,26 +54527,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -764,16 +768,16 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kviewshell.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kviewshell.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kviewshell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kviewshell.png
-
- #>+ 15
--- kviewshell/plugins/djvu/libdjvu/Makefile.in
+++ kviewshell/plugins/djvu/libdjvu/Makefile.in
@@ -54,9 +54,9 @@
@@ -26723,7 +54542,15 @@
am__DEPENDENCIES_1 =
libdjvu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libdjvu_la_OBJECTS = Arrays.lo DjVuDocEditor.lo DjVuMessageLite.lo \
-@@ -274,6 +274,9 @@
+@@ -180,6 +180,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -274,6 +275,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26733,17 +54560,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,8 @@
+@@ -324,18 +328,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,8 +356,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -364,6 +369,7 @@
host_cpu = @host_cpu@
-@@ -469,7 +473,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -446,12 +452,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -470,7 +479,7 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
INCLUDES = -I$(top_srcdir) $(all_includes)
@@ -26752,7 +54625,7 @@
libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
libdjvu_la_LIBADD = $(LIBJPEG)
libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
-@@ -491,7 +495,7 @@
+@@ -492,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26761,7 +54634,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -529,39 +533,39 @@
+@@ -530,39 +539,39 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26816,7 +54689,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -734,7 +738,7 @@
+@@ -735,7 +744,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -26825,7 +54698,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
-@@ -765,10 +769,10 @@
+@@ -766,10 +775,10 @@
#>+ 1
clean: kde-rpo-clean clean-am
@@ -26838,7 +54711,7 @@
mostlyclean-am
distclean: distclean-am
-@@ -787,13 +791,9 @@
+@@ -788,13 +797,9 @@
info-am:
@@ -26854,7 +54727,7 @@
install-info: install-info-am
-@@ -819,27 +819,27 @@
+@@ -820,20 +825,20 @@
ps-am:
@@ -26880,17 +54753,17 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
- .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
-@@ -276,6 +276,9 @@
+@@ -182,6 +182,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -276,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26900,17 +54773,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,8 @@
+@@ -326,18 +330,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -356,8 +358,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -366,6 +371,7 @@
host_cpu = @host_cpu@
-@@ -507,7 +511,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -448,12 +454,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -508,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26919,7 +54838,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +549,9 @@
+@@ -546,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26931,7 +54850,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -990,22 +994,22 @@
+@@ -991,22 +1000,22 @@
mocs: pageRangeWidget.moc
#>+ 3
@@ -26961,7 +54880,7 @@
#>+ 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
-@@ -1067,7 +1071,7 @@
+@@ -1068,7 +1077,7 @@
#>+ 11
@@ -26972,7 +54891,15 @@
echo "#define KDE_USE_FINAL 1" >> djvuviewpart_la.all_cpp.final; \
--- kviewshell/plugins/Makefile.in
+++ kviewshell/plugins/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -131,6 +131,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -225,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26982,17 +54909,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,7 +311,8 @@
+@@ -275,18 +279,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +307,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -315,6 +320,7 @@
host_cpu = @host_cpu@
-@@ -425,7 +429,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -27001,7 +54974,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +467,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27015,7 +54988,15 @@
mostlyclean-libtool:
--- libkscan/Makefile.in
+++ libkscan/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -185,6 +185,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27025,17 +55006,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,8 @@
+@@ -329,18 +333,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -359,8 +361,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -369,6 +374,7 @@
host_cpu = @host_cpu@
-@@ -503,7 +507,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -451,12 +457,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -504,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27044,7 +55071,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +545,9 @@
+@@ -542,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27056,9 +55083,85 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -949,18 +958,18 @@
+
+
+ #>+ 3
+-scandialog.moc: $(srcdir)/scandialog.h
+- $(MOC) $(srcdir)/scandialog.h -o scandialog.moc
++kgammatable.moc: $(srcdir)/kgammatable.h
++ $(MOC) $(srcdir)/kgammatable.h -o kgammatable.moc
+
+ #>+ 2
+-mocs: scandialog.moc
++mocs: kgammatable.moc
+
+ #>+ 3
+-kgammatable.moc: $(srcdir)/kgammatable.h
+- $(MOC) $(srcdir)/kgammatable.h -o kgammatable.moc
++scandialog.moc: $(srcdir)/scandialog.h
++ $(MOC) $(srcdir)/scandialog.h -o scandialog.moc
+
+ #>+ 2
+-mocs: kgammatable.moc
++mocs: scandialog.moc
+
+ #>+ 3
+ scansourcedialog.moc: $(srcdir)/scansourcedialog.h
+@@ -984,18 +993,18 @@
+ mocs: scanparams.moc
+
+ #>+ 3
+-kscanoption.moc: $(srcdir)/kscanoption.h
+- $(MOC) $(srcdir)/kscanoption.h -o kscanoption.moc
++massscandialog.moc: $(srcdir)/massscandialog.h
++ $(MOC) $(srcdir)/massscandialog.h -o massscandialog.moc
+
+ #>+ 2
+-mocs: kscanoption.moc
++mocs: massscandialog.moc
+
+ #>+ 3
+-massscandialog.moc: $(srcdir)/massscandialog.h
+- $(MOC) $(srcdir)/massscandialog.h -o massscandialog.moc
++kscanoption.moc: $(srcdir)/kscanoption.h
++ $(MOC) $(srcdir)/kscanoption.h -o kscanoption.moc
+
+ #>+ 2
+-mocs: massscandialog.moc
++mocs: kscanoption.moc
+
+ #>+ 3
+ dispgamma.moc: $(srcdir)/dispgamma.h
+@@ -1055,7 +1064,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f scandialog.moc kgammatable.moc scansourcedialog.moc previewer.moc scanparams.moc kscanoption.moc massscandialog.moc dispgamma.moc imgscaledialog.moc devselector.moc img_canvas.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
++ -rm -f kgammatable.moc scandialog.moc scansourcedialog.moc previewer.moc scanparams.moc massscandialog.moc kscanoption.moc dispgamma.moc imgscaledialog.moc devselector.moc img_canvas.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
+
+ #>+ 2
+ KDE_DIST=scanservice.desktop Makefile.am scandialog.h Makefile.in configure.in.in configure.in.bot kscandoc.h
+@@ -1106,7 +1115,7 @@
+
+
+ #>+ 11
+-libkscan_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kscandevice.cpp $(srcdir)/kscanslider.cpp $(srcdir)/kgammatable.cpp $(srcdir)/kscanoption.cpp $(srcdir)/kscanoptset.cpp $(srcdir)/gammadialog.cpp $(srcdir)/dispgamma.cpp $(srcdir)/scansourcedialog.cpp $(srcdir)/scanparams.cpp $(srcdir)/massscandialog.cpp $(srcdir)/devselector.cpp $(srcdir)/scandialog.cpp $(srcdir)/img_canvas.cpp $(srcdir)/previewer.cpp $(srcdir)/imgscaledialog.cpp $(srcdir)/sizeindicator.cpp $(srcdir)/imgscaninfo.cpp kgammatable.moc scandialog.moc scansourcedialog.moc previewer.moc scanparams.moc massscandialog.moc kscanoption.moc imgscaledialog.moc dispgamma.moc img_canvas.moc devselector.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
++libkscan_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kscandevice.cpp $(srcdir)/kscanslider.cpp $(srcdir)/kgammatable.cpp $(srcdir)/kscanoption.cpp $(srcdir)/kscanoptset.cpp $(srcdir)/gammadialog.cpp $(srcdir)/dispgamma.cpp $(srcdir)/scansourcedialog.cpp $(srcdir)/scanparams.cpp $(srcdir)/massscandialog.cpp $(srcdir)/devselector.cpp $(srcdir)/scandialog.cpp $(srcdir)/img_canvas.cpp $(srcdir)/previewer.cpp $(srcdir)/imgscaledialog.cpp $(srcdir)/sizeindicator.cpp $(srcdir)/imgscaninfo.cpp scandialog.moc kgammatable.moc scansourcedialog.moc previewer.moc scanparams.moc kscanoption.moc massscandialog.moc imgscaledialog.moc dispgamma.moc img_canvas.moc devselector.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
+ @echo 'creating libkscan_la.all_cpp.cpp ...'; \
+ rm -f libkscan_la.all_cpp.files libkscan_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkscan_la.all_cpp.final; \
--- libkscan/pics/Makefile.in
+++ libkscan/pics/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -115,6 +115,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -209,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27068,17 +55171,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,7 +295,8 @@
+@@ -259,18 +263,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -289,8 +291,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -299,6 +304,7 @@
host_cpu = @host_cpu@
-@@ -409,7 +413,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27087,7 +55236,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +451,9 @@
+@@ -448,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27099,27 +55248,38 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,15 +604,15 @@
+@@ -601,16 +610,16 @@
#>+ 13
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_halftone.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_lineart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_halftone.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_lineart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_halftone.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
$(INSTALL_DATA) $(srcdir)/cr16-action-palette_gray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_lineart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
#>+ 15
+ force-reedit:
--- Makefile.in
+++ Makefile.in
-@@ -243,6 +243,9 @@
+@@ -149,6 +149,7 @@
+ GMSGFMT = @GMSGFMT@
+ GPHOTO2_INCS = @GPHOTO2_INCS@
+ GPHOTO2_LIBS = @GPHOTO2_LIBS@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB_CFLAGS = @IMLIB_CFLAGS@
+ IMLIB_LIBS = @IMLIB_LIBS@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27129,17 +55289,63 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,7 +329,8 @@
+@@ -293,18 +297,16 @@
+ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -323,8 +325,11 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
--gphoto_devel = @gphoto_devel@
-+gphoto2_config = @gphoto2_config@
-+gphoto2_port_config = @gphoto2_port_config@
- host = @host@
- host_alias = @host_alias@
+ gphoto2_config = @gphoto2_config@
+ gphoto2_port_config = @gphoto2_port_config@
+@@ -333,6 +338,7 @@
host_cpu = @host_cpu@
-@@ -455,7 +459,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
+@@ -415,12 +421,15 @@
+ libexecdir = @libexecdir@
+ libkscan_SUBDIR_included_FALSE = @libkscan_SUBDIR_included_FALSE@
+ libkscan_SUBDIR_included_TRUE = @libkscan_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -456,7 +465,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -27148,7 +55354,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,12 +501,12 @@
+@@ -498,12 +507,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -27163,7 +55369,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -514,7 +518,7 @@
+@@ -515,7 +524,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -27172,12 +55378,12 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -1030,7 +1034,7 @@
+@@ -1031,7 +1040,7 @@
.NOEXPORT:
#>+ 2
-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
++KDE_DIST=Mainpage.dox stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am acinclude.m4 configure Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list