rev 3420 - trunk/packages/kdegraphics/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Mar 29 20:49:17 UTC 2006
Author: chrsmrtn
Date: 2006-03-29 20:49:09 +0000 (Wed, 29 Mar 2006)
New Revision: 3420
Modified:
trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
Updated kdegraphics buildprep.
Modified: trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2006-03-29 20:39:39 UTC (rev 3419)
+++ trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2006-03-29 20:49:09 UTC (rev 3420)
@@ -28,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5917,30 +5905,15 @@
+@@ -5970,30 +5958,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -60,11 +60,11 @@
+## modifications, as long as this notice is preserved.
-# serial 47 AC_PROG_LIBTOOL
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6000,7 +5973,7 @@
+@@ -6053,7 +6026,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6050,7 +6023,7 @@
+@@ -6103,7 +6076,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.
-@@ -6070,7 +6043,7 @@
+@@ -6123,7 +6096,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +91,26 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6118,6 +6091,8 @@
+@@ -6143,6 +6116,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -6162,15 +6136,17 @@
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -100,7 +119,15 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6163,6 +6138,48 @@
+@@ -6211,11 +6187,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
])# _LT_AC_SYS_COMPILER
@@ -127,7 +154,7 @@
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
@@ -140,7 +167,7 @@
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
@@ -149,7 +176,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6235,15 +6252,15 @@
+@@ -6288,15 +6309,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -168,7 +195,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6412,14 +6429,13 @@
+@@ -6465,14 +6486,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -185,7 +212,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6431,7 +6447,6 @@
+@@ -6484,7 +6504,6 @@
esac
;;
*64-bit*)
@@ -193,7 +220,30 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6496,7 +6511,7 @@
+@@ -6518,6 +6537,22 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *) LD="${LD-ld} -64" ;;
++ esac
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -6549,7 +6584,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 \
@@ -202,20 +252,20 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6506,8 +6521,10 @@
+@@ -6559,8 +6594,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
fi
-@@ -6533,11 +6550,16 @@
+@@ -6586,11 +6623,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
@@ -225,15 +275,15 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
else
$2=yes
fi
-@@ -6561,7 +6583,7 @@
+@@ -6614,7 +6656,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -242,7 +292,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6590,20 +6612,53 @@
+@@ -6643,20 +6685,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -266,6 +316,12 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
++
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -279,6 +335,17 @@
+ esac
+ fi
+ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
+ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -302,7 +369,32 @@
# 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.
-@@ -6699,7 +6754,7 @@
+@@ -6673,7 +6765,7 @@
+
+
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -6681,7 +6773,7 @@
+
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -6747,17 +6839,19 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -311,7 +403,22 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
-@@ -6753,7 +6808,7 @@
+ x$lt_dlneed_uscore) $2 ;;
+- x$lt_unknown|x*) $3 ;;
++ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+@@ -6769,7 +6863,7 @@
+
+
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -6806,7 +6900,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -320,7 +427,25 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6842,20 +6897,13 @@
+@@ -6840,7 +6934,7 @@
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -6853,7 +6947,7 @@
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ 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 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -342,14 +467,14 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6867,13 +6915,18 @@
+@@ -6920,13 +7007,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
@@ -365,7 +490,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6932,8 +6985,8 @@
+@@ -6985,8 +7077,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)" || \
@@ -376,7 +501,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -6990,7 +7043,7 @@
+@@ -7043,7 +7135,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -385,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7003,7 +7056,7 @@
+@@ -7056,7 +7148,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -394,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7013,7 +7066,20 @@
+@@ -7066,7 +7158,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -416,7 +541,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7078,7 +7144,7 @@
+@@ -7131,7 +7236,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -425,7 +550,7 @@
;;
beos*)
-@@ -7087,7 +7153,7 @@
+@@ -7140,7 +7245,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -434,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}'
-@@ -7103,7 +7169,7 @@
+@@ -7156,7 +7261,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -443,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7115,7 +7181,8 @@
+@@ -7168,7 +7273,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -453,7 +578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7145,7 +7212,7 @@
+@@ -7198,7 +7304,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -462,7 +587,7 @@
;;
esac
;;
-@@ -7168,7 +7235,7 @@
+@@ -7221,7 +7327,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -471,19 +596,22 @@
# 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"`
-@@ -7191,7 +7258,7 @@
+@@ -7244,20 +7350,17 @@
dynamic_linker=no
;;
-kfreebsd*-gnu*)
-+kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -7203,8 +7270,17 @@
- dynamic_linker='GNU ld.so'
- ;;
-
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
@@ -500,7 +628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7222,7 +7298,7 @@
+@@ -7275,14 +7378,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -509,7 +637,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -7249,9 +7325,9 @@
+- *) # from 3.2 on
++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ freebsd*) # from 4.6 on
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -7302,9 +7410,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -521,7 +662,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7266,7 +7342,7 @@
+@@ -7319,7 +7427,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -530,7 +671,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7277,7 +7353,7 @@
+@@ -7330,7 +7438,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -539,7 +680,34 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7339,22 +7415,19 @@
+@@ -7342,6 +7450,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ 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'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -7385,29 +7505,26 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++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'
@@ -568,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,
-@@ -7364,6 +7437,30 @@
+@@ -7417,6 +7534,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -584,22 +752,10 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7373,7 +7470,7 @@
+@@ -7426,7 +7555,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -608,9 +764,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7402,7 +7499,11 @@
+@@ -7454,8 +7583,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -621,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
-@@ -7422,7 +7523,7 @@
+@@ -7475,7 +7609,7 @@
os2*)
libname_spec='$name'
@@ -630,8 +788,83 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7568,7 +7669,9 @@
+@@ -7493,13 +7627,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -7525,7 +7652,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -7558,6 +7685,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7571,6 +7721,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+@@ -7595,6 +7750,9 @@
+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+ fi
+ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -7621,7 +7779,9 @@
+
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
@@ -641,7 +874,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7630,7 +7733,7 @@
+@@ -7683,7 +7843,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -650,7 +883,16 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7804,7 +7907,7 @@
+@@ -7721,7 +7881,7 @@
+
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -7857,7 +8017,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -659,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
-@@ -7914,7 +8017,7 @@
+@@ -7967,7 +8127,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,
@@ -668,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'*)
-@@ -7946,7 +8049,7 @@
+@@ -7999,7 +8159,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,
@@ -677,14 +919,14 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7973,6 +8076,15 @@
+@@ -8026,6 +8186,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
-+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
@@ -693,7 +935,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8006,44 +8118,36 @@
+@@ -8059,44 +8228,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -738,7 +980,7 @@
;;
-freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -749,7 +991,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8059,7 +8163,7 @@
+@@ -8112,7 +8273,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -758,9 +1000,15 @@
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
-@@ -8076,42 +8180,21 @@
+@@ -8128,43 +8289,27 @@
+ esac
;;
++interix3*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++ ;;
++
irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
@@ -788,7 +1036,7 @@
;;
# This must be Linux ELF.
- linux*)
+-linux*)
- case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
- lt_cv_deplibs_check_method=pass_all ;;
@@ -800,15 +1048,16 @@
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
-+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -8130,19 +8213,14 @@
+@@ -8183,32 +8328,22 @@
;;
openbsd*)
@@ -827,18 +1076,107 @@
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+-sco3.2v5*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8152,7 +8230,6 @@
-
solaris*)
lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_test_file=/lib/libc.so
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8260,13 +8337,13 @@
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -8229,10 +8364,13 @@
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+ esac
+ ;;
+
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+@@ -8252,36 +8390,43 @@
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+ else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
+ esac
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+ done
+- IFS="$lt_save_ifs"
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -8313,13 +8458,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -859,7 +1197,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8285,13 +8362,13 @@
+@@ -8338,13 +8483,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -880,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
-@@ -8329,10 +8406,21 @@
+@@ -8382,10 +8527,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -890,7 +1228,7 @@
])# _LT_AC_LANG_CXX
+# _LT_AC_PROG_CXXCPP
-+# ---------------
++# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
@@ -903,28 +1241,69 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8405,6 +8493,10 @@
+@@ -8425,7 +8581,7 @@
+
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -8458,36 +8614,9 @@
+
_LT_AC_SYS_COMPILER
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
+- else
+- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+- fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+- [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -8418,7 +8510,7 @@
- fi
- if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
-+ if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
- else
- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8459,7 +8551,7 @@
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -8501,9 +8630,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+@@ -8512,7 +8641,7 @@
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -932,7 +1311,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8468,48 +8560,11 @@
+@@ -8521,48 +8650,11 @@
fi
;;
@@ -983,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8534,7 +8589,7 @@
+@@ -8587,7 +8679,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -992,7 +1371,15 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8563,7 +8618,7 @@
+@@ -8599,6 +8691,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
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -8616,7 +8709,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1001,7 +1388,13 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8578,6 +8633,10 @@
+@@ -8626,11 +8719,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1012,7 +1405,20 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8599,7 +8658,7 @@
+@@ -8641,18 +8738,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+- unset lt_cv_prog_gnu_ld
++ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+- unset lt_cv_path_LD
++ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1021,7 +1427,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8617,8 +8676,8 @@
+@@ -8670,8 +8767,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
@@ -1032,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'
-@@ -8644,7 +8703,7 @@
+@@ -8697,7 +8794,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.
@@ -1041,7 +1447,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8674,8 +8733,22 @@
+@@ -8727,8 +8824,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1061,12 +1467,13 @@
+ ;;
+ esac
+ done
++ ;;
+ esac
+
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8692,7 +8765,7 @@
+@@ -8745,7 +8857,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1075,8 +1482,11 @@
# 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`
-@@ -8713,6 +8786,9 @@
+@@ -8764,8 +8876,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -1085,7 +1495,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8721,15 +8797,16 @@
+@@ -8774,15 +8890,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1106,39 +1516,67 @@
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.
-@@ -8738,13 +8815,12 @@
+@@ -8791,13 +8908,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_cmds, $1)="\$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"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8758,8 +8834,8 @@
+@@ -8806,22 +8922,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'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -8772,16 +8848,17 @@
+- chorus*)
+- case $cc_basename in
+- *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
++
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ chorus*)
++ case $cc_basename in
++ *)
++ # FIXME: insert proper C++ library support
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
esac
;;
-+
- cygwin* | mingw* | pw32*)
+@@ -8829,12 +8955,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'
@@ -1149,16 +1587,16 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8790,70 +8867,81 @@
+@@ -8843,70 +8969,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
@@ -1287,7 +1725,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8864,14 +8952,14 @@
+@@ -8917,14 +9054,14 @@
;;
esac
;;
@@ -1300,11 +1738,11 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8888,12 +8976,12 @@
+@@ -8941,12 +9078,12 @@
# location of the library.
case $cc_basename in
@@ -1320,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.
-@@ -8902,11 +8990,11 @@
+@@ -8955,11 +9092,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.
@@ -1334,25 +1772,49 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8916,7 +9004,7 @@
+@@ -8969,34 +9106,23 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
+ case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -8932,7 +9020,7 @@
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
esac
fi
- case "$host_cpu" in
+- hppa*64*)
+ case $host_cpu in
- hppa*64*)
++ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8953,17 +9041,17 @@
+ ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+- # but as the default
+- # location of the library.
+- ;;
+ *)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+@@ -9006,17 +9132,20 @@
esac
case $cc_basename in
@@ -1363,10 +1825,15 @@
;;
- aCC)
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ aCC*)
+ case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -1374,14 +1841,19 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8979,12 +9067,12 @@
+@@ -9032,12 +9161,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- ia64*|hppa*64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
- ia64*|hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -1389,8 +1861,24 @@
;;
esac
fi
-@@ -8997,9 +9085,9 @@
+@@ -9048,11 +9180,25 @@
+ ;;
+ esac
;;
++ interix3*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
irix5* | irix6*)
case $cc_basename in
- CC)
@@ -1401,7 +1889,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9010,9 +9098,9 @@
+@@ -9063,9 +9209,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1413,9 +1901,12 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9023,14 +9111,14 @@
+@@ -9074,16 +9220,16 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux*)
+- linux*)
++ linux* | k*bsd*-gnu)
case $cc_basename in
- KCC)
+ KCC*)
@@ -1431,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.
-@@ -9048,20 +9136,44 @@
+@@ -9101,20 +9247,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1482,7 +1973,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9089,7 +9201,7 @@
+@@ -9142,7 +9312,7 @@
;;
mvs*)
case $cc_basename in
@@ -1491,16 +1982,16 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9099,7 +9211,7 @@
+@@ -9152,7 +9322,7 @@
;;
esac
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
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=
-@@ -9110,15 +9222,31 @@
+@@ -9163,15 +9333,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::"'
;;
@@ -1534,7 +2025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9128,14 +9256,14 @@
+@@ -9181,14 +9367,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1552,7 +2043,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9153,7 +9281,7 @@
+@@ -9206,7 +9392,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1561,7 +2052,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9172,13 +9300,13 @@
+@@ -9225,13 +9411,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1577,7 +2068,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9187,17 +9315,17 @@
+@@ -9240,17 +9426,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1599,7 +2090,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9216,7 +9344,7 @@
+@@ -9269,7 +9455,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1608,17 +2099,23 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,7 +9368,7 @@
- sco*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case $cc_basename in
+@@ -9290,27 +9476,14 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- sco*)
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case $cc_basename in
- CC)
-+ CC*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-@@ -9252,12 +9380,12 @@
- ;;
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- ;;
sunos4*)
case $cc_basename in
- CC)
@@ -1632,7 +2129,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9270,36 +9398,33 @@
+@@ -9323,36 +9496,33 @@
;;
solaris*)
case $cc_basename in
@@ -1681,7 +2178,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9307,9 +9432,9 @@
+@@ -9360,9 +9530,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -1693,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'
-@@ -9319,9 +9444,9 @@
+@@ -9372,9 +9542,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
@@ -1705,7 +2202,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9330,9 +9455,9 @@
+@@ -9383,9 +9553,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1717,8 +2214,65 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9350,7 +9475,7 @@
+@@ -9398,12 +9568,63 @@
+ ;;
+ esac
;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
+ ;;
tandem*)
case $cc_basename in
- NCC)
@@ -1726,7 +2280,25 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9460,7 +9585,7 @@
+@@ -9440,8 +9661,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -9459,7 +9678,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -9513,7 +9732,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.
@@ -1735,7 +2307,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9500,7 +9625,7 @@
+@@ -9553,7 +9772,7 @@
fi
;;
@@ -1744,13 +2316,21 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9536,6 +9661,21 @@
+@@ -9589,13 +9808,37 @@
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
++interix3*)
++ # Interix 3.5 installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ _LT_AC_TAGVAR(predep_objects,$1)=
++ _LT_AC_TAGVAR(postdep_objects,$1)=
++ _LT_AC_TAGVAR(postdeps,$1)=
++ ;;
++
+solaris*)
+ case $cc_basename in
+ CC*)
@@ -1760,13 +2340,22 @@
+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ ;;
+ esac
++ ;;
+esac
+])
+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -9586,12 +9726,16 @@
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9639,12 +9882,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1784,7 +2373,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9601,7 +9745,7 @@
+@@ -9654,7 +9901,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1793,7 +2382,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9609,8 +9753,10 @@
+@@ -9662,8 +9909,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1806,7 +2395,25 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9661,20 +9807,27 @@
+@@ -9673,8 +9922,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+
+@@ -9684,8 +9931,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -9714,20 +9959,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -1835,7 +2442,25 @@
## 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
-@@ -9721,11 +9874,16 @@
+@@ -9739,8 +9991,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -9750,7 +10000,7 @@
+
+
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9774,11 +10024,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1852,7 +2477,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9751,11 +9909,12 @@
+@@ -9804,11 +10059,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1862,12 +2487,12 @@
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9805,7 +9964,7 @@
+@@ -9858,7 +10114,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1876,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 | \
-@@ -9871,11 +10030,11 @@
+@@ -9924,11 +10180,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -1890,7 +2515,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9906,6 +10065,12 @@
+@@ -9959,6 +10215,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -1903,7 +2528,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9936,7 +10101,7 @@
+@@ -9970,6 +10232,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+@@ -9989,7 +10254,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1912,7 +2547,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9967,7 +10132,7 @@
+@@ -10020,7 +10285,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1921,7 +2556,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9982,7 +10147,7 @@
+@@ -10035,7 +10300,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -1930,7 +2565,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10211,7 +10376,10 @@
+@@ -10264,7 +10529,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.
@@ -1942,7 +2577,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10253,9 +10421,6 @@
+@@ -10306,9 +10574,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -1952,11 +2587,11 @@
# 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'"
-@@ -10277,6 +10442,13 @@
+@@ -10330,14 +10595,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'"
;;
-+linux*)
++linux* | k*bsd*-gnu)
+ if test "$host_cpu" = ia64; then
+ symcode='[[ABCDGIRSTW]]'
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -1966,16 +2601,26 @@
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
-@@ -10284,7 +10456,7 @@
+ osf*)
symcode='[[BCDEGQRST]]'
;;
- solaris* | sysv5*)
+-solaris* | sysv5*)
- symcode='[[BDT]]'
++solaris*)
+ symcode='[[BDRT]]'
++ ;;
++sco3.2v5*)
++ symcode='[[DT]]'
++ ;;
++sysv4.2uw2*)
++ symcode='[[DT]]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[[ABDT]]'
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10302,14 +10474,17 @@
+@@ -10355,14 +10636,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1995,7 +2640,18 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10473,7 +10648,7 @@
+@@ -10518,6 +10802,10 @@
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -10526,7 +10814,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2004,7 +2660,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10498,18 +10673,28 @@
+@@ -10551,18 +10839,28 @@
;;
chorus*)
case $cc_basename in
@@ -2036,12 +2692,12 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10517,22 +10702,22 @@
+@@ -10570,22 +10868,22 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -2049,7 +2705,8 @@
- CC)
+ CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
@@ -2057,14 +2714,21 @@
- aCC)
+ aCC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10547,7 +10732,7 @@
+@@ -10598,9 +10896,13 @@
+ ;;
+ esac
;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
++ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
@@ -2072,9 +2736,12 @@
_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.
-@@ -10558,18 +10743,24 @@
+@@ -10609,20 +10911,26 @@
+ ;;
+ esac
;;
- linux*)
+- linux*)
++ linux* | k*bsd*-gnu)
case $cc_basename in
- KCC)
+ KCC*)
@@ -2101,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.
-@@ -10586,25 +10777,25 @@
+@@ -10639,25 +10947,25 @@
;;
mvs*)
case $cc_basename in
@@ -2114,7 +2781,7 @@
esac
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -2132,17 +2799,19 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10620,7 +10811,7 @@
+@@ -10671,24 +10979,15 @@
;;
- sco*)
- case $cc_basename in
+ psos*)
+ ;;
+- sco*)
+- case $cc_basename in
- CC)
-+ CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- *)
-@@ -10629,13 +10820,13 @@
- ;;
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
solaris*)
case $cc_basename in
- CC)
@@ -2157,7 +2826,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10645,12 +10836,12 @@
+@@ -10698,12 +10997,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2172,7 +2841,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10660,7 +10851,7 @@
+@@ -10713,7 +11012,7 @@
;;
tandem*)
case $cc_basename in
@@ -2181,7 +2850,35 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10731,7 +10922,7 @@
+@@ -10721,7 +11020,14 @@
+ ;;
+ esac
+ ;;
+- unixware*)
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ _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'
++ ;;
++ esac
+ ;;
+ vxworks*)
+ ;;
+@@ -10768,6 +11074,11 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ 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 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2190,7 +2887,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10757,6 +10948,16 @@
+@@ -10810,6 +11121,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2207,7 +2904,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10768,7 +10969,7 @@
+@@ -10821,7 +11142,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.
@@ -2216,11 +2913,13 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10792,12 +10993,19 @@
+@@ -10844,13 +11165,20 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux*)
+- linux*)
- case $CC in
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -2237,9 +2936,15 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10818,9 +11026,14 @@
+@@ -10865,15 +11193,15 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+- ;;
+-
solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -2253,10 +2958,25 @@
;;
sunos4*)
-@@ -10842,6 +11055,11 @@
+@@ -10882,7 +11210,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10895,6 +11223,17 @@
fi
;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
+ unicos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
@@ -2265,7 +2985,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10869,7 +11087,7 @@
+@@ -10922,7 +11261,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2274,19 +2994,36 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10902,7 +11120,10 @@
+@@ -10931,6 +11270,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
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ $lt_tmp_static_flag,
++ [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+
+
+@@ -10955,7 +11304,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
-+ linux*)
++ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10928,7 +11149,7 @@
+@@ -10981,7 +11333,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -2295,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*
-@@ -10945,7 +11166,8 @@
+@@ -10998,7 +11350,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -2305,7 +3042,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10965,6 +11187,27 @@
+@@ -11008,6 +11361,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -11018,6 +11375,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -2333,7 +3081,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11002,7 +11245,7 @@
+@@ -11055,7 +11433,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
@@ -2342,7 +3090,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11012,13 +11255,13 @@
+@@ -11065,13 +11443,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'
@@ -2355,23 +3103,39 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11027,19 +11270,51 @@
+@@ -11080,23 +11458,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
- ld_shlibs=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
+ fi
+ ;;
+
+- netbsd*)
++ interix3*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
-+ linux*)
++ linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
@@ -2400,11 +3164,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ fi
++ ;;
++
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -2416,7 +3179,12 @@
fi
;;
-@@ -11057,8 +11332,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ 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 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2427,8 +3195,40 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11073,24 +11348,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -11126,24 +11578,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -2459,7 +3259,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11124,9 +11394,20 @@
+@@ -11155,7 +11602,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
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -11177,9 +11624,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
@@ -2475,6 +3284,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -2482,7 +3292,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11143,7 +11424,7 @@
+@@ -11196,7 +11655,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -2491,8 +3301,11 @@
# 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`
-@@ -11164,6 +11445,9 @@
+@@ -11215,8 +11674,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -2501,16 +3314,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11172,29 +11456,29 @@
+@@ -11224,30 +11687,30 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -2530,28 +3346,34 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11208,8 +11492,8 @@
+@@ -11256,13 +11719,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'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -11222,7 +11506,7 @@
+@@ -11275,7 +11736,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2560,7 +3382,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11232,69 +11516,69 @@
+@@ -11285,69 +11746,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2676,18 +3498,18 @@
;;
dgux*)
-@@ -11327,8 +11611,8 @@
+@@ -11380,8 +11841,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11336,7 +11620,7 @@
+@@ -11389,7 +11850,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2696,15 +3518,41 @@
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
-@@ -11352,16 +11636,16 @@
+@@ -11403,47 +11864,62 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -2713,21 +3561,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -11371,7 +11655,7 @@
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
+ case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -11404,7 +11688,7 @@
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+@@ -11457,7 +11933,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -2735,16 +3614,16 @@
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'
-@@ -11414,7 +11698,7 @@
+@@ -11467,7 +11943,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11437,7 +11721,8 @@
+@@ -11490,7 +11966,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
@@ -2754,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
-@@ -11447,7 +11732,7 @@
+@@ -11500,7 +11977,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -2763,7 +3642,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11458,14 +11743,14 @@
+@@ -11511,14 +11988,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
@@ -2780,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'
-@@ -11477,13 +11762,13 @@
+@@ -11530,13 +12007,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}\*'
@@ -2796,7 +3675,18 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11502,10 +11787,12 @@
+@@ -11544,21 +12021,15 @@
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -2811,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'
-@@ -11514,8 +11801,18 @@
+@@ -11567,8 +12038,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2832,7 +3722,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11524,7 +11821,7 @@
+@@ -11577,7 +12058,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.
@@ -2841,19 +3731,86 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11584,9 +11881,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+@@ -11625,36 +12106,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- sysv5*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- _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'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11644,7 +11941,7 @@
++
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -11672,11 +12162,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -11697,13 +12182,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2862,7 +3819,14 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11778,7 +12075,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -11831,7 +12317,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
@@ -2934,8 +3898,8 @@
# 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 CXXRPOFLAGS RPO_YES RPO_NO TIFF_LIBS TIFF_CFLAGS PTHREAD_LIBS PTHREAD_CFLAGS THREAD_LIBS THREAD_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN gphoto_devel GPHOTO2_INCS GPHOTO2_LIBS LTLIBOBJS LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS FREETYPE_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE POPPLER_CFLAGS POPPLER_LIBS include_PDF_TRUE include_PDF_FALSE LIBTIFF include_TIFF_TRUE include_TIFF_FALSE LIBVM KADMOS_LIB KADMOS_INC FREETYPE_VERSION LIBFREETYPE_RPATH XFT_CFLAGS XFT_LIBS LIBPAPER_LIBS NOREGMOVE GLINC GLLIB LIBART_LIBS LIBART_CFLAGS LIBART_RPATH FONTCONFIG_LIBS FONTCONFIG_CFLAGS FONTCONFIG_RPATH FREETYPE_LIBS FREETYPE_CFLAGS LCMS_LIBS FRIBIDI_LIBS FRIBIDI_CFLAGS FRIBIDI_RPATH GENERIC_API_VERSION GENERIC_LIBRARY_VERSION GENERIC_LIBRARY_NAME GENERIC_RELEASE GENERIC_VERSION LIB_IMLIB IMLIB_CFLAGS CXXRPOFLAGS RPO_YES RPO_NO TIFF_LIBS TIFF_CFLAGS PTHREAD_LIBS PTHREAD_CFLAGS THREAD_LIBS THREAD_CFLAGS include_kooka_TRUE include_kooka_FALSE LIBSANE_LIBS LIBSANE_LDFLAGS LIBSANE_INCLUDES TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kamera_SUBDIR_included_TRUE kamera_SUBDIR_included_FALSE kcoloredit_SUBDIR_included_TRUE kcoloredit_SUBDIR_included_FALSE kfax_SUBDIR_included_TRUE kfax_SUBDIR_included_FALSE kgamma_SUBDIR_included_TRUE kgamma_SUBDIR_included_FALSE kghostview_SUBDIR_included_TRUE kghostview_SUBDIR_included_FALSE kiconedit_SUBDIR_included_TRUE kiconedit_SUBDIR_included_FALSE kmrml_SUBDIR_included_TRUE kmrml_SUBDIR_included_FALSE kolourpaint_SUBDIR_included_TRUE kolourpaint_SUBDIR_included_FALSE kpdf_SUBDIR_included_TRUE kpdf_SUBDIR_included_FALSE kpovmodeler_SUBDIR_included_TRUE kpovmodeler_SUBDIR_included_FALSE kruler_SUBDIR_included_TRUE kruler_SUBDIR_included_FALSE ksnapshot_SUBDIR_included_TRUE ksnapshot_SUBDIR_included_FALSE ksvg_SUBDIR_included_TRUE ksvg_SUBDIR_included_FALSE kuickshow_SUBDIR_included_TRUE kuickshow_SUBDIR_included_FALSE kview_SUBDIR_included_TRUE kview_SUBDIR_included_FALSE kviewshell_SUBDIR_included_TRUE kviewshell_SUBDIR_included_FALSE libkscan_SUBDIR_included_TRUE libkscan_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kfaxview_SUBDIR_included_TRUE kfaxview_SUBDIR_included_FALSE kdvi_SUBDIR_included_TRUE kdvi_SUBDIR_included_FALSE kooka_SUBDIR_included_TRUE kooka_SUBDIR_included_FALSE LIBOBJS'
+-ac_subst_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_files=''
# Initialize some variables set by options.
@@ -2948,7 +3912,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1226,7 +1228,7 @@
+@@ -1225,7 +1227,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -2957,7 +3921,7 @@
done
fi
-@@ -2129,6 +2131,31 @@
+@@ -2128,6 +2130,31 @@
@@ -2989,7 +3953,7 @@
unset CDPATH
-@@ -3062,8 +3089,7 @@
+@@ -3061,8 +3088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2999,7 +3963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3121,8 +3147,7 @@
+@@ -3120,8 +3146,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3009,7 +3973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3238,8 +3263,7 @@
+@@ -3237,8 +3262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3019,7 +3983,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3293,8 +3317,7 @@
+@@ -3292,8 +3316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3029,7 +3993,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3339,8 +3362,7 @@
+@@ -3338,8 +3361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3039,7 +4003,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3384,8 +3406,7 @@
+@@ -3383,8 +3405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3049,7 +4013,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3942,8 +3963,7 @@
+@@ -3941,8 +3962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3059,7 +4023,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4001,8 +4021,7 @@
+@@ -4000,8 +4020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3069,7 +4033,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4073,8 +4092,7 @@
+@@ -4072,8 +4091,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3079,7 +4043,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4118,8 +4136,7 @@
+@@ -4117,8 +4135,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3089,7 +4053,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4297,8 +4314,7 @@
+@@ -4296,8 +4313,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3099,7 +4063,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4409,8 +4425,7 @@
+@@ -4408,8 +4424,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3109,7 +4073,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4498,8 +4513,7 @@
+@@ -4497,8 +4512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3119,7 +4083,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4601,8 +4615,7 @@
+@@ -4600,8 +4614,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3129,7 +4093,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4701,8 +4714,7 @@
+@@ -4700,8 +4713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3139,7 +4103,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4786,8 +4798,7 @@
+@@ -4785,8 +4797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3149,7 +4113,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4876,8 +4887,7 @@
+@@ -4875,8 +4886,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3159,7 +4123,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4964,8 +4974,7 @@
+@@ -4963,8 +4973,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3169,7 +4133,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5052,8 +5061,7 @@
+@@ -5051,8 +5060,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3189,7 +4153,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5247,8 +5254,7 @@
+@@ -5253,8 +5260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3199,7 +4163,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5335,8 +5341,7 @@
+@@ -5341,8 +5347,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3209,7 +4173,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5423,8 +5428,7 @@
+@@ -5429,8 +5434,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3219,7 +4183,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5555,8 +5559,7 @@
+@@ -5517,8 +5521,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3229,17 +4193,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5644,8 +5647,7 @@
+@@ -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=$?
-@@ -5732,8 +5734,7 @@
+@@ -5815,8 +5816,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3249,7 +4223,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5820,8 +5821,7 @@
+@@ -5903,8 +5903,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3259,7 +4233,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5908,8 +5908,7 @@
+@@ -5991,8 +5990,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3269,7 +4243,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5996,8 +5995,7 @@
+@@ -6079,8 +6077,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3279,7 +4253,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6420,8 +6418,7 @@
+@@ -6167,8 +6164,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3289,7 +4263,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6547,8 +6544,7 @@
+@@ -6591,8 +6587,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3299,7 +4273,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6636,8 +6632,7 @@
+@@ -6718,8 +6713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3309,7 +4283,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6720,185 +6715,6 @@
+@@ -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 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3495,7 +4479,7 @@
fi
-@@ -7062,7 +6878,7 @@
+@@ -7244,7 +7058,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
@@ -3504,7 +4488,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7167,7 +6983,7 @@
+@@ -7349,7 +7163,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,
@@ -3513,7 +4497,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'*)
-@@ -7201,7 +7017,7 @@
+@@ -7383,7 +7197,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3522,14 +4506,14 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7231,6 +7047,15 @@
+@@ -7413,6 +7227,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
-+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
@@ -3538,7 +4522,75 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7317,44 +7142,36 @@
+@@ -7423,36 +7246,43 @@
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+ else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
+ esac
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+ done
+- IFS="$lt_save_ifs"
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+@@ -7499,44 +7329,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3582,7 +4634,7 @@
;;
-freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3593,7 +4645,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7370,7 +7187,7 @@
+@@ -7552,7 +7374,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3602,9 +4654,15 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7387,42 +7204,21 @@
+@@ -7568,43 +7390,27 @@
+ esac
;;
++interix3*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
++ ;;
++
irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
@@ -3632,7 +4690,7 @@
;;
# This must be Linux ELF.
- linux*)
+-linux*)
- case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
- lt_cv_deplibs_check_method=pass_all ;;
@@ -3644,15 +4702,16 @@
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
-+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7441,19 +7237,14 @@
+@@ -7623,32 +7429,22 @@
;;
openbsd*)
@@ -3671,27 +4730,58 @@
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+-sco3.2v5*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7463,7 +7254,6 @@
-
solaris*)
lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_test_file=/lib/libc.so
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7540,7 +7330,7 @@
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+@@ -7669,10 +7465,13 @@
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+ esac
;;
+
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+@@ -7688,6 +7487,9 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+
+@@ -7722,7 +7524,7 @@
+ ;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7543 "configure"' > conftest.$ac_ext
-+ echo '#line 7333 "configure"' > conftest.$ac_ext
+- echo '#line 7725 "configure"' > conftest.$ac_ext
++ echo '#line 7527 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7583,14 +7373,13 @@
+@@ -7765,14 +7567,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3708,7 +4798,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7602,7 +7391,6 @@
+@@ -7784,7 +7585,6 @@
esac
;;
*64-bit*)
@@ -3716,7 +4806,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7662,8 +7450,7 @@
+@@ -7844,8 +7644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3726,7 +4816,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7738,8 +7525,7 @@
+@@ -7880,6 +7679,26 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *) LD="${LD-ld} -64" ;;
++ esac
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++
+
+ esac
+
+@@ -7920,8 +7739,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3736,7 +4853,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7909,8 +7695,7 @@
+@@ -8091,8 +7909,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3746,7 +4863,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7977,8 +7762,7 @@
+@@ -8159,8 +7976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3756,7 +4873,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8093,6 +7877,243 @@
+@@ -8275,6 +8091,243 @@
done
@@ -4000,16 +5117,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8185,7 +8206,7 @@
+@@ -8367,7 +8420,7 @@
# Provide some information about the compiler.
--echo "$as_me:8188:" \
-+echo "$as_me:8209:" \
+-echo "$as_me:8370:" \
++echo "$as_me:8423:" \
"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
-@@ -8231,8 +8252,7 @@
+@@ -8413,8 +8466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4019,7 +5136,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8281,8 +8301,7 @@
+@@ -8463,8 +8515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4029,7 +5146,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8340,7 +8359,7 @@
+@@ -8522,7 +8573,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4038,7 +5155,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8369,20 +8388,53 @@
+@@ -8551,20 +8602,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4062,6 +5179,12 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
++
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -4075,6 +5198,17 @@
+ esac
+ fi
+ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
+ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -4098,7 +5232,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.
-@@ -8419,9 +8471,6 @@
+@@ -8601,9 +8702,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4108,11 +5242,11 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8443,6 +8492,13 @@
+@@ -8625,14 +8723,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'"
;;
-+linux*)
++linux* | k*bsd*-gnu)
+ if test "$host_cpu" = ia64; then
+ symcode='[ABCDGIRSTW]'
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4122,16 +5256,26 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8450,7 +8506,7 @@
+ osf*)
symcode='[BCDEGQRST]'
;;
- solaris* | sysv5*)
+-solaris* | sysv5*)
- symcode='[BDT]'
++solaris*)
+ symcode='[BDRT]'
++ ;;
++sco3.2v5*)
++ symcode='[DT]'
++ ;;
++sysv4.2uw2*)
++ symcode='[DT]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[ABDT]'
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8468,14 +8524,17 @@
+@@ -8650,14 +8764,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4151,7 +5295,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8637,7 +8696,7 @@
+@@ -8819,7 +8936,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4160,7 +5304,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8657,7 +8716,7 @@
+@@ -8839,7 +8956,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4169,7 +5313,26 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8942,6 +9001,17 @@
+@@ -9096,6 +9213,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -9115,15 +9233,26 @@
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4187,7 +5350,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8967,7 +9037,7 @@
+@@ -9149,7 +9278,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4196,7 +5359,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
-@@ -9029,7 +9099,7 @@
+@@ -9211,7 +9340,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4205,46 +5368,91 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9128,6 +9198,20 @@
+@@ -9306,68 +9435,25 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+-#
+-# Check for any special shared library compilation flags.
+-#
+-lt_prog_cc_shlib=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- lt_prog_cc_shlib='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$lt_prog_cc_shlib"; then
+- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then :
+- else
+- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+- lt_cv_prog_cc_can_build_shared=no
+- fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- lt_prog_compiler_static_works=no
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test -s conftest.err; then
+- # Append any errors to the config.log.
+- cat conftest.err 1>&5
+- else
+- lt_prog_compiler_static_works=yes
+- fi
+- fi
+- $rm conftest*
+- LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-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
+- :
+-else
+- lt_prog_compiler_static=
+-fi
+-
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
-+
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -9164,11 +9248,16 @@
- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-- # The compiler can only warn and ignore the option if not recognized
-+ # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
-+ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works=yes
-+ fi
- else
- lt_prog_compiler_static_works=yes
- fi
-@@ -9214,18 +9303,20 @@
+
+
+ ## CAVEAT EMPTOR:
+@@ -9396,18 +9482,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4252,25 +5460,37 @@
+ -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:9220: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9309: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9402: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9224: \$? = $ac_status" >&5
-+ echo "$as_me:9313: \$? = $ac_status" >&5
+- echo "$as_me:9406: \$? = $ac_status" >&5
++ echo "$as_me:9492: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9302,7 +9393,7 @@
+@@ -9468,6 +9556,11 @@
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ 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 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4279,7 +5499,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9328,6 +9419,16 @@
+@@ -9510,6 +9603,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4296,7 +5516,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9339,7 +9440,7 @@
+@@ -9521,7 +9624,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.
@@ -4305,11 +5525,13 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9363,12 +9464,19 @@
+@@ -9544,13 +9647,20 @@
+ lt_prog_compiler_static='-Bstatic'
;;
- linux*)
+- linux*)
- case $CC in
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
@@ -4326,9 +5548,15 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9389,9 +9497,14 @@
+@@ -9565,15 +9675,15 @@
+ lt_prog_compiler_static='-non_shared'
;;
+- sco3.2v5*)
+- lt_prog_compiler_pic='-Kpic'
+- lt_prog_compiler_static='-dn'
+- ;;
+-
solaris*)
- lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -4342,10 +5570,25 @@
;;
sunos4*)
-@@ -9413,6 +9526,11 @@
+@@ -9582,7 +9692,7 @@
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+@@ -9595,6 +9705,17 @@
fi
;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ ;;
++
+ unicos*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_can_build_shared=no
@@ -4354,7 +5597,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9447,18 +9565,20 @@
+@@ -9629,18 +9750,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4362,25 +5605,25 @@
+ -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:9453: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9571: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9635: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9756: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9457: \$? = $ac_status" >&5
-+ echo "$as_me:9575: \$? = $ac_status" >&5
+- echo "$as_me:9639: \$? = $ac_status" >&5
++ echo "$as_me:9760: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9479,7 +9599,7 @@
+@@ -9661,7 +9784,7 @@
fi
fi
@@ -4389,7 +5632,56 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9501,38 +9621,36 @@
+@@ -9671,6 +9794,48 @@
+ ;;
+ esac
+
++#
++# 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
++if test "${lt_prog_compiler_static_works+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_prog_compiler_static_works=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works=yes
++ fi
++ else
++ lt_prog_compiler_static_works=yes
++ fi
++ fi
++ $rm conftest*
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++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
++ :
++else
++ lt_prog_compiler_static=
++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+set}" = set; then
+@@ -9683,38 +9848,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4410,21 +5702,21 @@
+ -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:9520: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9633: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9702: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9860: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9524: \$? = $ac_status" >&5
-+ echo "$as_me:9637: \$? = $ac_status" >&5
+- echo "$as_me:9706: \$? = $ac_status" >&5
++ echo "$as_me:9864: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
fi
fi
@@ -4440,7 +5732,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9603,6 +9721,16 @@
+@@ -9785,6 +9948,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4457,7 +5749,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9623,6 +9751,27 @@
+@@ -9795,6 +9968,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -9805,6 +9982,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4485,7 +5788,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9660,7 +9809,7 @@
+@@ -9842,7 +10040,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4494,7 +5797,7 @@
else
ld_shlibs=no
fi
-@@ -9670,13 +9819,13 @@
+@@ -9852,13 +10050,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'
@@ -4507,22 +5810,37 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9685,19 +9834,51 @@
+@@ -9867,23 +10065,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
-+ linux*)
++ interix3*)
++ hardcode_direct=no
++ hardcode_shlibpath_var=no
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
++ linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
@@ -4555,7 +5873,7 @@
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -4567,7 +5885,12 @@
fi
;;
-@@ -9715,8 +9896,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ cat <<EOF 1>&2
+@@ -9897,13 +10142,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4578,8 +5901,40 @@
else
ld_shlibs=no
fi
-@@ -9731,24 +9912,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++ ld_shlibs=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ ld_shlibs=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -9913,24 +10185,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -4610,7 +5965,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9782,9 +9958,20 @@
+@@ -9942,7 +10209,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+@@ -9964,9 +10231,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
@@ -4626,6 +5990,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -4633,7 +5998,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9801,7 +9988,7 @@
+@@ -9983,7 +10262,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4642,8 +6007,11 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9822,6 +10009,9 @@
+@@ -10002,8 +10281,12 @@
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -4652,16 +6020,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9830,21 +10020,22 @@
+@@ -10011,22 +10294,23 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -4680,7 +6051,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9868,8 +10059,7 @@
+@@ -10050,8 +10334,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4690,7 +6061,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9896,14 +10086,13 @@
+@@ -10078,14 +10361,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4698,17 +6069,17 @@
- archive_cmds="\$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"
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9930,8 +10119,7 @@
+@@ -10112,8 +10394,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4718,18 +6089,24 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9968,8 +10156,8 @@
+@@ -10145,13 +10426,11 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag=' ${wl}-bernotok'
+ allow_undefined_flag=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec=' '
+- whole_archive_flag_spec=' '
++ whole_archive_flag_spec='$convenience'
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -9982,7 +10170,7 @@
+@@ -10164,7 +10443,7 @@
ld_shlibs=no
;;
@@ -4738,7 +6115,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9992,13 +10180,13 @@
+@@ -10174,13 +10453,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4755,11 +6132,10 @@
# 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.
-@@ -10007,53 +10195,53 @@
- enable_shared_with_static_runtimes=yes
+@@ -10190,52 +10469,52 @@
;;
-- darwin* | rhapsody*)
+ darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc=no
- case "$host_os" in
@@ -4780,7 +6156,6 @@
- esac
- fi
- ;;
-+ darwin* | rhapsody*)
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
@@ -4850,18 +6225,18 @@
fi
;;
-@@ -10087,8 +10275,8 @@
+@@ -10269,8 +10548,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10096,7 +10284,7 @@
+@@ -10278,7 +10557,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4870,15 +6245,41 @@
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
-@@ -10112,16 +10300,16 @@
+@@ -10292,47 +10571,62 @@
+ export_dynamic_flag_spec='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
++
++ hardcode_direct=yes
++ export_dynamic_flag_spec='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ hardcode_minus_L=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -4887,21 +6288,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -10131,7 +10319,7 @@
+ *)
+- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10164,7 +10352,7 @@
+- hardcode_libdir_separator=:
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ ;;
+- ia64*)
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_direct=no
+- hardcode_shlibpath_var=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- hardcode_minus_L=yes
+- ;;
+ *)
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator=:
+ hardcode_direct=yes
+ export_dynamic_flag_spec='${wl}-E'
+@@ -10346,7 +10640,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -4909,16 +6341,16 @@
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'
-@@ -10174,7 +10362,7 @@
+@@ -10356,7 +10650,7 @@
link_all_deplibs=yes
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10197,7 +10385,8 @@
+@@ -10379,7 +10673,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
@@ -4928,7 +6360,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10207,7 +10396,7 @@
+@@ -10389,7 +10684,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -4937,7 +6369,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10218,14 +10407,14 @@
+@@ -10400,14 +10695,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4954,7 +6386,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'
-@@ -10237,13 +10426,13 @@
+@@ -10419,13 +10714,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4970,7 +6402,18 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10262,10 +10451,12 @@
+@@ -10433,21 +10728,15 @@
+ hardcode_libdir_separator=:
+ ;;
+
+- sco3.2v5*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- export_dynamic_flag_spec='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -4985,7 +6428,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'
-@@ -10274,8 +10465,18 @@
+@@ -10456,8 +10745,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5006,7 +6449,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10284,7 +10485,7 @@
+@@ -10466,7 +10765,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.
@@ -5015,19 +6458,94 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10344,9 +10545,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag='${wl}-z ${wl}text'
+@@ -10514,36 +10813,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct=yes
+- hardcode_minus_L=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ no_undefined_flag='${wl}-z,text'
++ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+- no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var=no
+ ;;
+
+- sysv5*)
+- no_undefined_flag=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- 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'
+- hardcode_libdir_flag_spec=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ no_undefined_flag='${wl}-z,text'
++ allow_undefined_flag='${wl}-z,nodefs'
++ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator=':'
++ link_all_deplibs=yes
++ export_dynamic_flag_spec='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
-@@ -10452,7 +10653,7 @@
++
++ if test "$GCC" = yes; then
++ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -10562,11 +10870,6 @@
+ echo "${ECHO_T}$ld_shlibs" >&6
+ test "$ld_shlibs" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -10599,6 +10902,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
++ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -10634,7 +10938,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5036,7 +6554,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10462,7 +10663,20 @@
+@@ -10644,7 +10948,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5058,7 +6576,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10527,7 +10741,7 @@
+@@ -10709,7 +11026,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5067,7 +6585,7 @@
;;
beos*)
-@@ -10536,7 +10750,7 @@
+@@ -10718,7 +11035,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5076,7 +6594,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10552,7 +10766,7 @@
+@@ -10734,7 +11051,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5085,7 +6603,7 @@
need_version=no
need_lib_prefix=no
-@@ -10564,7 +10778,8 @@
+@@ -10746,7 +11063,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5095,7 +6613,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10594,7 +10809,7 @@
+@@ -10776,7 +11094,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5104,7 +6622,7 @@
;;
esac
;;
-@@ -10617,7 +10832,7 @@
+@@ -10799,7 +11117,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5113,19 +6631,22 @@
# 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"`
-@@ -10640,7 +10855,7 @@
+@@ -10822,20 +11140,17 @@
dynamic_linker=no
;;
-kfreebsd*-gnu*)
-+kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -10652,8 +10867,17 @@
- dynamic_linker='GNU ld.so'
- ;;
-
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
@@ -5142,7 +6663,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10671,7 +10895,7 @@
+@@ -10853,14 +11168,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5151,7 +6672,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10698,9 +10922,9 @@
+- *) # from 3.2 on
++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ freebsd*) # from 4.6 on
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -10880,9 +11200,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5163,7 +6697,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10715,7 +10939,7 @@
+@@ -10897,7 +11217,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5172,7 +6706,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10726,7 +10950,7 @@
+@@ -10908,7 +11228,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5181,7 +6715,34 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10788,22 +11012,19 @@
+@@ -10920,6 +11240,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ 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'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -10963,29 +11295,26 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++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'
@@ -5210,7 +6771,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,
-@@ -10813,6 +11034,30 @@
+@@ -10995,6 +11324,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5226,22 +6787,10 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10822,7 +11067,7 @@
+@@ -11004,7 +11345,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5250,9 +6799,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10851,7 +11096,11 @@
+@@ -11032,8 +11373,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -5263,7 +6814,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
-@@ -10871,7 +11120,7 @@
+@@ -11053,7 +11399,7 @@
os2*)
libname_spec='$name'
@@ -5272,7 +6823,69 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10973,8 +11222,8 @@
+@@ -11071,13 +11417,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -11103,7 +11442,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -11136,6 +11475,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11151,12 +11513,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ 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" || \
@@ -5283,7 +6896,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11100,8 +11349,7 @@
+@@ -11282,8 +11649,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5293,7 +6906,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11204,8 +11452,7 @@
+@@ -11386,8 +11752,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5303,7 +6916,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11270,8 +11517,7 @@
+@@ -11452,8 +11817,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5313,7 +6926,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11364,8 +11610,7 @@
+@@ -11546,8 +11910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5323,7 +6936,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11430,8 +11675,7 @@
+@@ -11612,8 +11975,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5333,7 +6946,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11497,8 +11741,7 @@
+@@ -11679,8 +12041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5343,7 +6956,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11564,8 +11807,7 @@
+@@ -11746,8 +12107,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5353,16 +6966,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11640,7 +11882,7 @@
+@@ -11806,7 +12166,7 @@
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -11822,7 +12182,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11643 "configure"
-+#line 11885 "configure"
+-#line 11825 "configure"
++#line 12185 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11706,7 +11948,7 @@
+@@ -11879,6 +12239,8 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
+ }
+@@ -11888,12 +12250,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5371,16 +7002,40 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11738,7 +11980,7 @@
+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+ esac
+ else :
+ # compilation failed
+@@ -11908,7 +12270,7 @@
+ echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
++ 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
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+@@ -11920,7 +12282,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11741 "configure"
-+#line 11983 "configure"
+-#line 11923 "configure"
++#line 12285 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11804,7 +12046,7 @@
+@@ -11977,6 +12339,8 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
+ }
+@@ -11986,12 +12350,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5389,8 +7044,23 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11854,7 +12096,7 @@
+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+ esac
+ else :
+ # compilation failed
+@@ -12024,7 +12388,7 @@
+ fi
+
+-# Report which librarie types wil actually be built
++# 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 @@
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -5398,7 +7068,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11863,47 +12105,10 @@
+@@ -12045,47 +12409,10 @@
fi
;;
@@ -5447,17 +7117,17 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11929,7 +12134,8 @@
+@@ -12111,7 +12438,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.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12043,11 +12249,11 @@
+@@ -12225,11 +12553,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5471,7 +7141,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12077,6 +12283,12 @@
+@@ -12259,6 +12587,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5484,7 +7154,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12107,7 +12319,7 @@
+@@ -12270,6 +12604,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler
+
+@@ -12289,7 +12626,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5493,7 +7173,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12138,7 +12350,7 @@
+@@ -12320,7 +12657,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5502,7 +7182,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12153,7 +12365,7 @@
+@@ -12335,7 +12672,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5511,7 +7191,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12380,7 +12592,10 @@
+@@ -12562,7 +12899,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.
@@ -5523,8 +7203,18 @@
fi
-@@ -12445,7 +12660,9 @@
+@@ -12597,6 +12937,9 @@
+ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+ fi
+ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -12627,7 +12970,9 @@
+
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
@@ -5534,7 +7224,15 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12482,7 +12699,7 @@
+@@ -12647,6 +12992,7 @@
+ hardcode_libdir_flag_spec_ld_CXX=
+ hardcode_libdir_separator_CXX=
+ hardcode_minus_L_CXX=no
++hardcode_shlibpath_var_CXX=unsupported
+ hardcode_automatic_CXX=no
+ module_cmds_CXX=
+ module_expsym_cmds_CXX=
+@@ -12664,7 +13010,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5543,20 +7241,35 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12503,6 +12720,20 @@
+@@ -12674,17 +13020,34 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -5564,7 +7277,20 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12524,7 +12755,16 @@
+@@ -12695,18 +13058,27 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+- unset lt_cv_prog_gnu_ld
++ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+- unset lt_cv_path_LD
++ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5582,7 +7308,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12595,7 +12835,7 @@
+@@ -12777,7 +13149,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,
@@ -5591,7 +7317,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'*)
-@@ -12629,7 +12869,7 @@
+@@ -12811,7 +13183,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5600,7 +7326,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12648,8 +12888,8 @@
+@@ -12830,8 +13202,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
@@ -5611,7 +7337,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12675,7 +12915,7 @@
+@@ -12857,7 +13229,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.
@@ -5620,7 +7346,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12706,8 +12946,22 @@
+@@ -12888,8 +13260,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5640,12 +7366,13 @@
+ ;;
+ esac
+ done
++ ;;
+ esac
+
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12724,7 +12978,7 @@
+@@ -12906,7 +13293,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5654,8 +7381,11 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12745,6 +12999,9 @@
+@@ -12925,8 +13312,12 @@
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_libdir_separator_CXX=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -5664,7 +7394,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12753,15 +13010,16 @@
+@@ -12935,15 +13326,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5685,7 +7415,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.
-@@ -12791,8 +13049,7 @@
+@@ -12973,8 +13365,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5695,23 +7425,23 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12821,13 +13078,12 @@
+@@ -13003,13 +13394,12 @@
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"
- archive_expsym_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` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12854,8 +13110,7 @@
+@@ -13036,8 +13426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5721,23 +7451,39 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12892,8 +13147,8 @@
+@@ -13069,16 +13458,26 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_CXX=' ${wl}-bernotok'
+ allow_undefined_flag_CXX=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols_CXX=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX=' '
+- whole_archive_flag_spec_CXX=' '
++ whole_archive_flag_spec_CXX='$convenience'
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -12906,16 +13161,17 @@
- esac
- ;;
-
+
- cygwin* | mingw* | pw32*)
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ allow_undefined_flag_CXX=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ ld_shlibs_CXX=no
++ fi
++ ;;
++
+ chorus*)
+ case $cc_basename in
+ *)
+@@ -13092,12 +13491,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'
@@ -5748,16 +7494,16 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12924,70 +13180,81 @@
+@@ -13106,70 +13505,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
fi
@@ -5886,7 +7632,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12998,14 +13265,14 @@
+@@ -13180,14 +13590,14 @@
;;
esac
;;
@@ -5899,11 +7645,11 @@
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13022,12 +13289,12 @@
+@@ -13204,12 +13614,12 @@
# location of the library.
case $cc_basename in
@@ -5919,7 +7665,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13036,11 +13303,11 @@
+@@ -13218,11 +13628,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.
@@ -5933,25 +7679,48 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13050,7 +13317,7 @@
+@@ -13232,33 +13642,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_CXX=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13066,7 +13333,7 @@
+- hardcode_libdir_separator_CXX=:
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_CXX='-L$libdir'
;;
+ *)
+- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator_CXX=:
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ ;;
esac
fi
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_direct_CXX=no
+- hardcode_shlibpath_var_CXX=no
+- ;;
+- ia64*)
+ case $host_cpu in
- hppa*64*)
++ hppa*64*|ia64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -13087,17 +13354,17 @@
+- hardcode_minus_L_CXX=yes # Not in the search PATH,
+- # but as the default
+- # location of the library.
+ ;;
+ *)
+ hardcode_direct_CXX=yes
+@@ -13269,17 +13668,20 @@
esac
case $cc_basename in
@@ -5962,10 +7731,15 @@
;;
- aCC)
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ aCC*)
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -5973,14 +7747,19 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13113,12 +13380,12 @@
+@@ -13295,12 +13697,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- ia64*|hppa*64*)
+- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
- ia64*|hppa*64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -5988,8 +7767,24 @@
;;
esac
fi
-@@ -13131,9 +13398,9 @@
+@@ -13311,11 +13716,25 @@
+ ;;
+ esac
;;
++ interix3*)
++ hardcode_direct_CXX=no
++ hardcode_shlibpath_var_CXX=no
++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_CXX='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
irix5* | irix6*)
case $cc_basename in
- CC)
@@ -6000,7 +7795,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13144,9 +13411,9 @@
+@@ -13326,9 +13745,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6012,9 +7807,12 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13157,14 +13424,14 @@
+@@ -13337,16 +13756,16 @@
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
;;
- linux*)
+- linux*)
++ linux* | k*bsd*-gnu)
case $cc_basename in
- KCC)
+ KCC*)
@@ -6030,7 +7828,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13182,20 +13449,44 @@
+@@ -13364,20 +13783,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6081,7 +7879,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13223,7 +13514,7 @@
+@@ -13405,7 +13848,7 @@
;;
mvs*)
case $cc_basename in
@@ -6090,16 +7888,16 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13233,7 +13524,7 @@
+@@ -13415,7 +13858,7 @@
;;
esac
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
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=
-@@ -13244,15 +13535,31 @@
+@@ -13426,15 +13869,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::"'
;;
@@ -6133,7 +7931,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13262,14 +13569,14 @@
+@@ -13444,14 +13903,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6151,7 +7949,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13287,7 +13594,7 @@
+@@ -13469,7 +13928,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6160,7 +7958,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13306,13 +13613,13 @@
+@@ -13488,13 +13947,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6176,7 +7974,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13321,17 +13628,17 @@
+@@ -13503,17 +13962,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6198,7 +7996,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13350,7 +13657,7 @@
+@@ -13532,7 +13991,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6207,17 +8005,23 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13374,7 +13681,7 @@
- sco*)
- archive_cmds_need_lc_CXX=no
- case $cc_basename in
+@@ -13553,27 +14012,14 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- sco*)
+- archive_cmds_need_lc_CXX=no
+- case $cc_basename in
- CC)
-+ CC*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-@@ -13386,12 +13693,12 @@
- ;;
+- # FIXME: insert proper C++ library support
+- ld_shlibs_CXX=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs_CXX=no
+- ;;
+- esac
+- ;;
sunos4*)
case $cc_basename in
- CC)
@@ -6231,7 +8035,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13404,36 +13711,33 @@
+@@ -13586,36 +14032,33 @@
;;
solaris*)
case $cc_basename in
@@ -6280,7 +8084,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13441,9 +13745,9 @@
+@@ -13623,9 +14066,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6292,7 +8096,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13453,9 +13757,9 @@
+@@ -13635,9 +14078,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
@@ -6304,7 +8108,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13464,9 +13768,9 @@
+@@ -13646,9 +14089,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6316,8 +8120,65 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13484,7 +13788,7 @@
+@@ -13661,12 +14104,63 @@
+ ;;
+ esac
;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++ no_undefined_flag_CXX='${wl}-z,text'
++ archive_cmds_need_lc_CXX=no
++ hardcode_shlibpath_var_CXX=no
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ no_undefined_flag_CXX='${wl}-z,text'
++ allow_undefined_flag_CXX='${wl}-z,nodefs'
+ archive_cmds_need_lc_CXX=no
++ hardcode_shlibpath_var_CXX=no
++ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator_CXX=':'
++ link_all_deplibs_CXX=yes
++ export_dynamic_flag_spec_CXX='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
+ ;;
tandem*)
case $cc_basename in
- NCC)
@@ -6325,7 +8186,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13541,7 +13845,7 @@
+@@ -13723,7 +14217,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.
@@ -6334,7 +8195,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13581,7 +13885,7 @@
+@@ -13763,7 +14257,7 @@
fi
;;
@@ -6343,12 +8204,20 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13617,6 +13921,20 @@
+@@ -13799,6 +14293,29 @@
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+case $host_os in
++interix3*)
++ # Interix 3.5 installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ predep_objects_CXX=
++ postdep_objects_CXX=
++ postdeps_CXX=
++ ;;
++
+solaris*)
+ case $cc_basename in
+ CC*)
@@ -6358,13 +8227,25 @@
+ postdeps_CXX='-lCstd -lCrun'
+ ;;
+ esac
++ ;;
+esac
+
+
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13672,7 +13990,7 @@
+@@ -13846,6 +14363,10 @@
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ lt_prog_compiler_pic_CXX=-Kconform_pic
+@@ -13854,7 +14375,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6373,7 +8254,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13697,18 +14015,28 @@
+@@ -13879,18 +14400,28 @@
;;
chorus*)
case $cc_basename in
@@ -6405,12 +8286,12 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13716,22 +14044,22 @@
+@@ -13898,22 +14429,22 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -6418,7 +8299,8 @@
- CC)
+ CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
lt_prog_compiler_pic_CXX='+Z'
fi
@@ -6426,14 +8308,21 @@
- aCC)
+ aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13746,7 +14074,7 @@
+@@ -13926,9 +14457,13 @@
+ ;;
+ esac
;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
++ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
@@ -6441,9 +8330,12 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13757,18 +14085,24 @@
+@@ -13937,20 +14472,26 @@
+ ;;
+ esac
;;
- linux*)
+- linux*)
++ linux* | k*bsd*-gnu)
case $cc_basename in
- KCC)
+ KCC*)
@@ -6469,7 +8361,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13785,25 +14119,25 @@
+@@ -13967,25 +14508,25 @@
;;
mvs*)
case $cc_basename in
@@ -6482,7 +8374,7 @@
esac
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -6500,17 +8392,19 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13819,7 +14153,7 @@
+@@ -13999,24 +14540,15 @@
;;
- sco*)
- case $cc_basename in
+ psos*)
+ ;;
+- sco*)
+- case $cc_basename in
- CC)
-+ CC*)
- lt_prog_compiler_pic_CXX='-fPIC'
- ;;
- *)
-@@ -13828,13 +14162,13 @@
- ;;
+- lt_prog_compiler_pic_CXX='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
solaris*)
case $cc_basename in
- CC)
@@ -6525,7 +8419,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13844,12 +14178,12 @@
+@@ -14026,12 +14558,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6540,7 +8434,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13859,7 +14193,7 @@
+@@ -14041,7 +14573,7 @@
;;
tandem*)
case $cc_basename in
@@ -6549,7 +8443,23 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13900,18 +14234,20 @@
+@@ -14049,7 +14581,14 @@
+ ;;
+ esac
+ ;;
+- unixware*)
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ lt_prog_compiler_wl_CXX='-Wl,'
++ lt_prog_compiler_pic_CXX='-KPIC'
++ lt_prog_compiler_static_CXX='-Bstatic'
++ ;;
++ esac
+ ;;
+ vxworks*)
+ ;;
+@@ -14082,18 +14621,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -6557,25 +8467,25 @@
+ -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:13906: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14240: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14088: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14627: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13910: \$? = $ac_status" >&5
-+ echo "$as_me:14244: \$? = $ac_status" >&5
+- echo "$as_me:14092: \$? = $ac_status" >&5
++ echo "$as_me:14631: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13932,7 +14268,7 @@
+@@ -14114,7 +14655,7 @@
fi
fi
@@ -6584,10 +8494,29 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13954,38 +14290,36 @@
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+@@ -14124,50 +14665,90 @@
+ ;;
+ 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
++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
@@ -6595,7 +8524,53 @@
- # builds.
- chmod -w .
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
+- lt_compiler_flag="-o out/conftest2.$ac_objext"
++ lt_prog_compiler_static_works_CXX=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works_CXX=yes
++ fi
++ else
++ lt_prog_compiler_static_works_CXX=yes
++ fi
++ fi
++ $rm conftest*
++ 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
++
++if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++ :
++else
++ lt_prog_compiler_static_CXX=
++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"
# 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
@@ -6605,21 +8580,21 @@
+ -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:13973: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14302: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14155: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14731: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13977: \$? = $ac_status" >&5
-+ echo "$as_me:14306: \$? = $ac_status" >&5
+- echo "$as_me:14159: \$? = $ac_status" >&5
++ echo "$as_me:14735: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
@@ -6635,19 +8610,39 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14035,7 +14369,10 @@
+@@ -14217,7 +14798,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
-+ linux*)
++ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14118,7 +14455,7 @@
+@@ -14228,11 +14812,6 @@
+ 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"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -14265,6 +14844,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_CXX
++ pic_flag=$lt_prog_compiler_pic_CXX
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -14300,7 +14880,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6656,7 +8651,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14128,7 +14465,20 @@
+@@ -14310,7 +14890,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6678,7 +8673,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14193,7 +14543,7 @@
+@@ -14375,7 +14968,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6687,7 +8682,7 @@
;;
beos*)
-@@ -14202,7 +14552,7 @@
+@@ -14384,7 +14977,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6696,7 +8691,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14218,7 +14568,7 @@
+@@ -14400,7 +14993,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6705,7 +8700,7 @@
need_version=no
need_lib_prefix=no
-@@ -14230,7 +14580,8 @@
+@@ -14412,7 +15005,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6715,7 +8710,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14260,7 +14611,7 @@
+@@ -14442,7 +15036,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6724,7 +8719,7 @@
;;
esac
;;
-@@ -14283,7 +14634,7 @@
+@@ -14465,7 +15059,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6733,19 +8728,22 @@
# 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"`
-@@ -14306,7 +14657,7 @@
+@@ -14488,20 +15082,17 @@
dynamic_linker=no
;;
-kfreebsd*-gnu*)
-+kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -14318,8 +14669,17 @@
- dynamic_linker='GNU ld.so'
- ;;
-
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
@@ -6762,7 +8760,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14337,7 +14697,7 @@
+@@ -14519,14 +15110,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6771,7 +8769,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14364,9 +14724,9 @@
+- *) # from 3.2 on
++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ freebsd*) # from 4.6 on
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -14546,9 +15142,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6783,7 +8794,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14381,7 +14741,7 @@
+@@ -14563,7 +15159,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6792,7 +8803,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14392,7 +14752,7 @@
+@@ -14574,7 +15170,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6801,7 +8812,34 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14454,22 +14814,19 @@
+@@ -14586,6 +15182,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ 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'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -14629,29 +15237,26 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++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'
@@ -6830,7 +8868,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,
-@@ -14479,6 +14836,30 @@
+@@ -14661,6 +15266,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6846,22 +8884,10 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14488,7 +14869,7 @@
+@@ -14670,7 +15287,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6870,9 +8896,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14517,7 +14898,11 @@
+@@ -14698,8 +15315,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -6883,7 +8911,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
-@@ -14537,7 +14922,7 @@
+@@ -14719,7 +15341,7 @@
os2*)
libname_spec='$name'
@@ -6892,7 +8920,69 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14639,8 +15024,8 @@
+@@ -14737,13 +15359,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -14769,7 +15384,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -14802,6 +15417,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14817,12 +15455,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ 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" || \
@@ -6903,163 +8993,1349 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14766,8 +15151,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+@@ -14854,1118 +15497,293 @@
+ enable_fast_install=needless
+ fi
+
+-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
+-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
+-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
+- else
+- 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
+- ;;
+- 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
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++ # See if we are running on zsh, and set the options which allow our commands through
++ # without removal of \ escapes.
++ if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++ fi
++ # Now quote all the things that may contain metacharacters while being
++ # careful not to overquote the AC_SUBSTed values. We take copies of the
++ # variables and quote the copies for generation of the libtool script.
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++ deplibs_check_method reload_flag reload_cmds need_locks \
++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++ lt_cv_sys_global_symbol_to_c_name_address \
++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++ old_postinstall_cmds old_postuninstall_cmds \
++ compiler_CXX \
++ CC_CXX \
++ LD_CXX \
++ lt_prog_compiler_wl_CXX \
++ lt_prog_compiler_pic_CXX \
++ lt_prog_compiler_static_CXX \
++ lt_prog_compiler_no_builtin_flag_CXX \
++ export_dynamic_flag_spec_CXX \
++ thread_safe_flag_spec_CXX \
++ whole_archive_flag_spec_CXX \
++ enable_shared_with_static_runtimes_CXX \
++ old_archive_cmds_CXX \
++ old_archive_from_new_cmds_CXX \
++ predep_objects_CXX \
++ postdep_objects_CXX \
++ predeps_CXX \
++ postdeps_CXX \
++ compiler_lib_search_path_CXX \
++ archive_cmds_CXX \
++ archive_expsym_cmds_CXX \
++ postinstall_cmds_CXX \
++ postuninstall_cmds_CXX \
++ old_archive_from_expsyms_cmds_CXX \
++ allow_undefined_flag_CXX \
++ no_undefined_flag_CXX \
++ export_symbols_cmds_CXX \
++ hardcode_libdir_flag_spec_CXX \
++ hardcode_libdir_flag_spec_ld_CXX \
++ hardcode_libdir_separator_CXX \
++ hardcode_automatic_CXX \
++ module_cmds_CXX \
++ module_expsym_cmds_CXX \
++ 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 | \
++ archive_cmds_CXX | \
++ archive_expsym_cmds_CXX | \
++ module_cmds_CXX | \
++ module_expsym_cmds_CXX | \
++ old_archive_from_expsyms_cmds_CXX | \
++ export_symbols_cmds_CXX | \
++ extract_expsyms_cmds | reload_cmds | finish_cmds | \
++ postinstall_cmds | postuninstall_cmds | \
++ old_postinstall_cmds | old_postuninstall_cmds | \
++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++ # Double-quote double-evaled strings.
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++ ;;
++ *)
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++ ;;
++ esac
++ done
++
++ case $lt_echo in
++ *'\$0 --fallback-echo"')
++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+ ;;
++ esac
+
+- mingw* | pw32*)
+- lt_cv_dlopen="LoadLibrary"
+- lt_cv_dlopen_libs=
+- ;;
++cfgfile="$ofile"
+
+- cygwin*)
+- lt_cv_dlopen="dlopen"
+- lt_cv_dlopen_libs=
+- ;;
++ cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+- 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
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-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`:
+
+-/* 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- 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
- ac_status=$?
-@@ -14870,8 +15254,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (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_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+
+-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
+-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
+
+- 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
+
+-fi
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+- ;;
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+- *)
+- 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
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* 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
+
+-/* 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
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+-#undef shl_load
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+
+-/* 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 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)
+-choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+
+-int
+-main ()
+-{
+-return f != shl_load;
+- ;
+- 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
- ac_status=$?
-@@ -14936,8 +15319,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (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_func_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# A C compiler.
++LTCC=$lt_LTCC
+
+-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
+-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
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+
+-/* 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 shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+- ;
+- 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
- ac_status=$?
-@@ -15030,8 +15412,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (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_lib_dld_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# A language-specific compiler.
++CC=$lt_compiler_CXX
+
+-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
+-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
+-if test "${ac_cv_func_dlopen+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. */
+-/* 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
+
+-/* 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
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+
+-#undef dlopen
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+
+-/* 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 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)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++# A BSD-compatible nm program.
++NM=$lt_NM
+
+-int
+-main ()
+-{
+-return f != dlopen;
+- ;
+- 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
- ac_status=$?
-@@ -15096,8 +15477,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (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_func_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# A symbol stripping program
++STRIP=$lt_STRIP
+
+-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
+-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
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-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
+
+-/* 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- 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
- ac_status=$?
-@@ -15163,8 +15543,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (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_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+
+-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
+-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
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+
+-/* 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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- 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
- ac_status=$?
-@@ -15230,8 +15609,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (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_lib_svld_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Used on cygwin: assembler.
++AS="$AS"
+
+-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
+-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
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-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
+
+-/* 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 dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+- ;
+- 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
- ac_status=$?
-@@ -15306,7 +15684,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15309 "configure"
-+#line 15687 "configure"
- #include "confdefs.h"
+- { (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_lib_dld_dld_link=yes
+-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
- #if HAVE_DLFCN_H
-@@ -15372,7 +15750,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15404,7 +15782,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15407 "configure"
-+#line 15785 "configure"
- #include "confdefs.h"
+-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
+-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
- #if HAVE_DLFCN_H
-@@ -15470,7 +15848,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++# Object file suffix (normally "o").
++objext="$ac_objext"
+
+-fi
++# Old archive suffix (normally "a").
++libext="$libext"
+
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+
+-fi
++# Executable file suffix (normally "").
++exeext="$exeext"
+
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+
+-fi
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+-fi
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+
+-fi
++# Do we need a version for libraries?
++need_version=$need_version
+
+- ;;
+- esac
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+
+- 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
+
+- 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
+
+- 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
+
+- 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
+
+- 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
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 15491 "configure"
+-#include "confdefs.h"
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_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
+
+-#include <stdio.h>
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
++# Library versioning type.
++version_type=$version_type
+
+-/* 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
++# Format of library name prefix.
++libname_spec=$lt_libname_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
+
+-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
+
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- 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
+
+- 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
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15521,7 +15899,8 @@
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15621,6 +16000,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
+- 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*
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -15651,7 +16036,7 @@
- NM=$lt_NM
++# 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
- # A symbol stripping program
--STRIP=$STRIP
-+STRIP=$lt_STRIP
+-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
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -15682,7 +16067,7 @@
- libext="$libext"
+- 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 15589 "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
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -15697,7 +16082,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-#include <stdio.h>
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_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. */
+-#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
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
+
+-#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_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
+-fi
+-rm -fr conftest*
+-
+-
+-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
+-
+- 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
+-
+-
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+- # See if we are running on zsh, and set the options which allow our commands through
+- # without removal of \ escapes.
+- if test -n "${ZSH_VERSION+set}" ; then
+- setopt NO_GLOB_SUBST
+- fi
+- # Now quote all the things that may contain metacharacters while being
+- # careful not to overquote the AC_SUBSTed values. We take copies of the
+- # variables and quote the copies for generation of the libtool script.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+- deplibs_check_method reload_flag reload_cmds need_locks \
+- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+- lt_cv_sys_global_symbol_to_c_name_address \
+- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+- old_postinstall_cmds old_postuninstall_cmds \
+- compiler_CXX \
+- CC_CXX \
+- LD_CXX \
+- lt_prog_compiler_wl_CXX \
+- lt_prog_compiler_pic_CXX \
+- lt_prog_compiler_static_CXX \
+- lt_prog_compiler_no_builtin_flag_CXX \
+- export_dynamic_flag_spec_CXX \
+- thread_safe_flag_spec_CXX \
+- whole_archive_flag_spec_CXX \
+- enable_shared_with_static_runtimes_CXX \
+- old_archive_cmds_CXX \
+- old_archive_from_new_cmds_CXX \
+- predep_objects_CXX \
+- postdep_objects_CXX \
+- predeps_CXX \
+- postdeps_CXX \
+- compiler_lib_search_path_CXX \
+- archive_cmds_CXX \
+- archive_expsym_cmds_CXX \
+- postinstall_cmds_CXX \
+- postuninstall_cmds_CXX \
+- old_archive_from_expsyms_cmds_CXX \
+- allow_undefined_flag_CXX \
+- no_undefined_flag_CXX \
+- export_symbols_cmds_CXX \
+- hardcode_libdir_flag_spec_CXX \
+- hardcode_libdir_flag_spec_ld_CXX \
+- hardcode_libdir_separator_CXX \
+- hardcode_automatic_CXX \
+- module_cmds_CXX \
+- module_expsym_cmds_CXX \
+- lt_cv_prog_compiler_c_o_CXX \
+- exclude_expsyms_CXX \
+- include_expsyms_CXX; do
+-
+- case $var in
+- old_archive_cmds_CXX | \
+- old_archive_from_new_cmds_CXX | \
+- archive_cmds_CXX | \
+- archive_expsym_cmds_CXX | \
+- module_cmds_CXX | \
+- module_expsym_cmds_CXX | \
+- old_archive_from_expsyms_cmds_CXX | \
+- export_symbols_cmds_CXX | \
+- extract_expsyms_cmds | reload_cmds | finish_cmds | \
+- postinstall_cmds | postuninstall_cmds | \
+- old_postinstall_cmds | old_postuninstall_cmds | \
+- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+- # Double-quote double-evaled strings.
+- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+- ;;
+- *)
+- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+- ;;
+- esac
+- done
+-
+- case $lt_echo in
+- *'\$0 --fallback-echo"')
+- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+- ;;
+- esac
+-
+-cfgfile="$ofile"
+-
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-
-# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
+-need_locks=$lt_need_locks
+-
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+-
+-# Do we need a version for libraries?
+-need_version=$need_version
+-
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_CXX
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+-
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+-
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_CXX
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_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
+-
+-# 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
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_CXX
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_CXX
+-
+-# 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
- # Do we need the lib prefix for modules?
-@@ -15899,7 +16284,10 @@
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+@@ -16081,7 +15899,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.
@@ -7071,20 +10347,27 @@
fi
-@@ -15975,12 +16363,35 @@
+@@ -16153,16 +15974,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -7108,7 +10391,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15993,7 +16404,7 @@
+@@ -16175,7 +16022,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7117,7 +10400,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16001,8 +16412,10 @@
+@@ -16183,8 +16030,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7130,7 +10413,28 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16079,7 +16492,7 @@
+@@ -16197,8 +16046,6 @@
+ echo "$as_me:$LINENO: result: $enable_static" >&5
+ echo "${ECHO_T}$enable_static" >&6
+
+-test "$ld_shlibs_F77" = no && can_build_shared=no
+-
+ GCC_F77="$G77"
+ LD_F77="$LD"
+
+@@ -16245,6 +16092,11 @@
+ lt_prog_compiler_pic_F77='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ 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 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7139,7 +10443,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16105,6 +16518,16 @@
+@@ -16287,6 +16139,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7156,7 +10460,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16116,7 +16539,7 @@
+@@ -16298,7 +16160,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.
@@ -7165,11 +10469,13 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16140,12 +16563,19 @@
+@@ -16321,13 +16183,20 @@
+ lt_prog_compiler_static_F77='-Bstatic'
;;
- linux*)
+- linux*)
- case $CC in
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
@@ -7186,9 +10492,15 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16166,9 +16596,14 @@
+@@ -16342,15 +16211,15 @@
+ lt_prog_compiler_static_F77='-non_shared'
;;
+- sco3.2v5*)
+- lt_prog_compiler_pic_F77='-Kpic'
+- lt_prog_compiler_static_F77='-dn'
+- ;;
+-
solaris*)
- lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
@@ -7202,10 +10514,25 @@
;;
sunos4*)
-@@ -16190,6 +16625,11 @@
+@@ -16359,7 +16228,7 @@
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -16372,6 +16241,17 @@
fi
;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ lt_prog_compiler_wl_F77='-Wl,'
++ lt_prog_compiler_pic_F77='-KPIC'
++ lt_prog_compiler_static_F77='-Bstatic'
++ ;;
++
+ unicos*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_can_build_shared_F77=no
@@ -7214,7 +10541,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16224,18 +16664,20 @@
+@@ -16406,18 +16286,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -7222,25 +10549,25 @@
+ -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:16230: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16670: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16412: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16292: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16234: \$? = $ac_status" >&5
-+ echo "$as_me:16674: \$? = $ac_status" >&5
+- echo "$as_me:16416: \$? = $ac_status" >&5
++ echo "$as_me:16296: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16256,7 +16698,7 @@
+@@ -16438,7 +16320,7 @@
fi
fi
@@ -7249,7 +10576,56 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16278,38 +16720,36 @@
+@@ -16448,6 +16330,48 @@
+ ;;
+ esac
+
++#
++# 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
++if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_prog_compiler_static_works_F77=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works_F77=yes
++ fi
++ else
++ lt_prog_compiler_static_works_F77=yes
++ fi
++ fi
++ $rm conftest*
++ 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
++
++if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++ :
++else
++ lt_prog_compiler_static_F77=
++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_F77+set}" = set; then
+@@ -16460,38 +16384,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7270,21 +10646,21 @@
+ -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:16297: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16732: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16479: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16396: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16301: \$? = $ac_status" >&5
-+ echo "$as_me:16736: \$? = $ac_status" >&5
+- echo "$as_me:16483: \$? = $ac_status" >&5
++ echo "$as_me:16400: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_F77=yes
fi
fi
@@ -7300,7 +10676,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16380,6 +16820,16 @@
+@@ -16562,6 +16484,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7317,7 +10693,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16400,6 +16850,27 @@
+@@ -16572,6 +16504,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -16582,6 +16518,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7345,7 +10732,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16437,7 +16908,7 @@
+@@ -16619,7 +16576,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7354,7 +10741,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16447,13 +16918,13 @@
+@@ -16629,13 +16586,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'
@@ -7367,24 +10754,38 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16462,19 +16933,51 @@
+@@ -16644,23 +16601,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
- ld_shlibs=no
+ ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
-+ linux*)
++ fi
++ ;;
++
++ interix3*)
++ hardcode_direct_F77=no
++ hardcode_shlibpath_var_F77=no
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
++ linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
@@ -7413,10 +10814,11 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -7428,7 +10830,12 @@
fi
;;
-@@ -16492,8 +16995,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_F77=no
+ cat <<EOF 1>&2
+@@ -16674,13 +16678,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7439,8 +10846,40 @@
else
ld_shlibs_F77=no
fi
-@@ -16508,24 +17011,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++ ld_shlibs_F77=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ ld_shlibs_F77=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -16690,24 +16721,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -7471,7 +10910,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16559,9 +17057,20 @@
+@@ -16719,7 +16745,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L_F77=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct_F77=unsupported
+@@ -16741,9 +16767,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
@@ -7487,6 +10935,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -7494,7 +10943,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16578,7 +17087,7 @@
+@@ -16760,7 +16798,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7503,8 +10952,11 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16599,6 +17108,9 @@
+@@ -16779,8 +16817,12 @@
+ hardcode_libdir_flag_spec_F77='-L$libdir'
+ hardcode_libdir_separator_F77=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -7513,16 +10965,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16607,21 +17119,22 @@
+@@ -16788,22 +16830,23 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -7541,7 +10996,7 @@
program main
end
-@@ -16635,8 +17148,7 @@
+@@ -16817,8 +16860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7551,7 +11006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16663,14 +17175,13 @@
+@@ -16845,14 +16887,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7559,17 +11014,17 @@
- archive_cmds_F77="\$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"
- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_F77="-z nodefs"
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16687,8 +17198,7 @@
+@@ -16869,8 +16910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7579,18 +11034,24 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16725,8 +17235,8 @@
+@@ -16902,13 +16942,11 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_F77=' ${wl}-bernotok'
+ allow_undefined_flag_F77=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols_F77=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_F77=' '
+- whole_archive_flag_spec_F77=' '
++ whole_archive_flag_spec_F77='$convenience'
archive_cmds_need_lc_F77=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -16739,7 +17249,7 @@
+@@ -16921,7 +16959,7 @@
ld_shlibs_F77=no
;;
@@ -7599,7 +11060,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16749,68 +17259,68 @@
+@@ -16931,68 +16969,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7712,18 +11173,18 @@
fi
;;
-@@ -16844,8 +17354,8 @@
+@@ -17026,8 +17064,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16853,7 +17363,7 @@
+@@ -17035,7 +17073,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7732,15 +11193,41 @@
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
-@@ -16869,16 +17379,16 @@
+@@ -17049,47 +17087,62 @@
+ export_dynamic_flag_spec_F77='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_F77=:
++
++ hardcode_direct_F77=yes
++ export_dynamic_flag_spec_F77='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ hardcode_minus_L_F77=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -7749,21 +11236,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -16888,7 +17398,7 @@
+ *)
+- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_F77=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16921,7 +17431,7 @@
+- hardcode_libdir_separator_F77=:
+- hardcode_direct_F77=no
+- hardcode_shlibpath_var_F77=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- hardcode_minus_L_F77=yes
+ ;;
+ *)
+- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator_F77=:
+ hardcode_direct_F77=yes
+ export_dynamic_flag_spec_F77='${wl}-E'
+@@ -17103,7 +17156,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -7771,16 +11289,16 @@
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'
-@@ -16931,7 +17441,7 @@
+@@ -17113,7 +17166,7 @@
link_all_deplibs_F77=yes
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16954,7 +17464,8 @@
+@@ -17136,7 +17189,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
@@ -7790,7 +11308,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16964,7 +17475,7 @@
+@@ -17146,7 +17200,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7799,7 +11317,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16975,14 +17486,14 @@
+@@ -17157,14 +17211,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7816,7 +11334,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'
-@@ -16994,13 +17505,13 @@
+@@ -17176,13 +17230,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7832,7 +11350,18 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17019,10 +17530,12 @@
+@@ -17190,21 +17244,15 @@
+ hardcode_libdir_separator_F77=:
+ ;;
+
+- sco3.2v5*)
+- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var_F77=no
+- export_dynamic_flag_spec_F77='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7847,7 +11376,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'
-@@ -17031,8 +17544,18 @@
+@@ -17213,8 +17261,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7868,7 +11397,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17041,7 +17564,7 @@
+@@ -17223,7 +17281,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.
@@ -7877,19 +11406,94 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17101,9 +17624,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_F77='${wl}-z ${wl}text'
+@@ -17271,36 +17329,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct_F77=yes
+- hardcode_minus_L_F77=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ no_undefined_flag_F77='${wl}-z,text'
++ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+- no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var_F77=no
+ ;;
+
+- sysv5*)
+- no_undefined_flag_F77=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- 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'
+- hardcode_libdir_flag_spec_F77=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ no_undefined_flag_F77='${wl}-z,text'
++ allow_undefined_flag_F77='${wl}-z,nodefs'
++ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator_F77=':'
++ link_all_deplibs_F77=yes
++ export_dynamic_flag_spec_F77='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_F77=no
-@@ -17209,7 +17732,7 @@
++
++ if test "$GCC" = yes; then
++ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -17319,11 +17386,6 @@
+ 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"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -17356,6 +17418,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_F77
++ pic_flag=$lt_prog_compiler_pic_F77
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -17391,7 +17454,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7898,7 +11502,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17219,7 +17742,20 @@
+@@ -17401,7 +17464,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7920,7 +11524,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17284,7 +17820,7 @@
+@@ -17466,7 +17542,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7929,7 +11533,7 @@
;;
beos*)
-@@ -17293,7 +17829,7 @@
+@@ -17475,7 +17551,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7938,7 +11542,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17309,7 +17845,7 @@
+@@ -17491,7 +17567,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7947,7 +11551,7 @@
need_version=no
need_lib_prefix=no
-@@ -17321,7 +17857,8 @@
+@@ -17503,7 +17579,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7957,7 +11561,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17351,7 +17888,7 @@
+@@ -17533,7 +17610,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7966,7 +11570,7 @@
;;
esac
;;
-@@ -17374,7 +17911,7 @@
+@@ -17556,7 +17633,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7975,19 +11579,22 @@
# 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"`
-@@ -17397,7 +17934,7 @@
+@@ -17579,20 +17656,17 @@
dynamic_linker=no
;;
-kfreebsd*-gnu*)
-+kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17409,8 +17946,17 @@
- dynamic_linker='GNU ld.so'
- ;;
-
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
@@ -8004,7 +11611,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17428,7 +17974,7 @@
+@@ -17610,14 +17684,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8013,7 +11620,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17455,9 +18001,9 @@
+- *) # from 3.2 on
++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ freebsd*) # from 4.6 on
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -17637,9 +17716,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8025,7 +11645,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17472,7 +18018,7 @@
+@@ -17654,7 +17733,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8034,7 +11654,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17483,7 +18029,7 @@
+@@ -17665,7 +17744,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8043,7 +11663,34 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17545,22 +18091,19 @@
+@@ -17677,6 +17756,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ 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'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -17720,29 +17811,26 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++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'
@@ -8072,7 +11719,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,
-@@ -17570,6 +18113,30 @@
+@@ -17752,6 +17840,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8088,22 +11735,10 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17579,7 +18146,7 @@
+@@ -17761,7 +17861,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8112,9 +11747,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17608,7 +18175,11 @@
+@@ -17789,8 +17889,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -8125,7 +11762,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
-@@ -17628,7 +18199,7 @@
+@@ -17810,7 +17915,7 @@
os2*)
libname_spec='$name'
@@ -8134,7 +11771,69 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17730,8 +18301,8 @@
+@@ -17828,13 +17933,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -17860,7 +17958,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -17893,6 +17991,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17908,12 +18029,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ 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" || \
@@ -8145,17 +11844,54 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17807,7 +18378,8 @@
+@@ -17945,36 +18071,6 @@
+ enable_fast_install=needless
+ fi
+
+-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
+-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
+-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
+- else
+- 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
+- ;;
+- esac
+-fi
+-
+-
+
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -17989,7 +18085,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.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17907,6 +18479,12 @@
+@@ -18089,6 +18186,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8168,7 +11904,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17937,7 +18515,7 @@
+@@ -18100,6 +18203,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_F77
+
+@@ -18119,7 +18225,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8177,7 +11923,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17968,7 +18546,7 @@
+@@ -18150,7 +18256,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8186,7 +11932,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17983,7 +18561,7 @@
+@@ -18165,7 +18271,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8195,7 +11941,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18185,7 +18763,10 @@
+@@ -18367,7 +18473,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.
@@ -8207,7 +11953,7 @@
fi
-@@ -18218,7 +18799,7 @@
+@@ -18400,26 +18509,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8216,20 +11962,26 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18229,15 +18810,41 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -8258,7 +12010,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
-@@ -18264,18 +18871,20 @@
+@@ -18446,18 +18584,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8266,25 +12018,37 @@
+ -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:18270: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18877: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18452: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18590: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18274: \$? = $ac_status" >&5
-+ echo "$as_me:18881: \$? = $ac_status" >&5
+- echo "$as_me:18456: \$? = $ac_status" >&5
++ echo "$as_me:18594: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18352,7 +18961,7 @@
+@@ -18518,6 +18658,11 @@
+ lt_prog_compiler_pic_GCJ='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ 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 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8293,7 +12057,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18378,6 +18987,16 @@
+@@ -18560,6 +18705,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8310,7 +12074,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18389,7 +19008,7 @@
+@@ -18571,7 +18726,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.
@@ -8319,11 +12083,13 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18413,12 +19032,19 @@
+@@ -18594,13 +18749,20 @@
+ lt_prog_compiler_static_GCJ='-Bstatic'
;;
- linux*)
+- linux*)
- case $CC in
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -8340,9 +12106,15 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18439,9 +19065,14 @@
+@@ -18615,15 +18777,15 @@
+ lt_prog_compiler_static_GCJ='-non_shared'
;;
+- sco3.2v5*)
+- lt_prog_compiler_pic_GCJ='-Kpic'
+- lt_prog_compiler_static_GCJ='-dn'
+- ;;
+-
solaris*)
- lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
@@ -8356,10 +12128,25 @@
;;
sunos4*)
-@@ -18463,6 +19094,11 @@
+@@ -18632,7 +18794,7 @@
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18645,6 +18807,17 @@
fi
;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ ;;
++
+ unicos*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_can_build_shared_GCJ=no
@@ -8368,7 +12155,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18497,18 +19133,20 @@
+@@ -18679,18 +18852,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8376,25 +12163,25 @@
+ -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:18503: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19139: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18685: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18858: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18507: \$? = $ac_status" >&5
-+ echo "$as_me:19143: \$? = $ac_status" >&5
+- echo "$as_me:18689: \$? = $ac_status" >&5
++ echo "$as_me:18862: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18529,7 +19167,7 @@
+@@ -18711,7 +18886,7 @@
fi
fi
@@ -8403,7 +12190,56 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18551,38 +19189,36 @@
+@@ -18721,6 +18896,48 @@
+ ;;
+ esac
+
++#
++# 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
++if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_prog_compiler_static_works_GCJ=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works_GCJ=yes
++ fi
++ else
++ lt_prog_compiler_static_works_GCJ=yes
++ fi
++ fi
++ $rm conftest*
++ 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
++
++if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++ :
++else
++ lt_prog_compiler_static_GCJ=
++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_GCJ+set}" = set; then
+@@ -18733,38 +18950,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8424,21 +12260,21 @@
+ -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:18570: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19201: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18752: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18962: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18574: \$? = $ac_status" >&5
-+ echo "$as_me:19205: \$? = $ac_status" >&5
+- echo "$as_me:18756: \$? = $ac_status" >&5
++ echo "$as_me:18966: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_GCJ=yes
fi
fi
@@ -8454,7 +12290,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18653,6 +19289,16 @@
+@@ -18835,6 +19050,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8471,7 +12307,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18673,6 +19319,27 @@
+@@ -18845,6 +19070,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -18855,6 +19084,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8499,7 +12346,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18710,7 +19377,7 @@
+@@ -18892,7 +19142,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8508,7 +12355,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18720,13 +19387,13 @@
+@@ -18902,13 +19152,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'
@@ -8521,23 +12368,38 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18735,19 +19402,51 @@
+@@ -18917,23 +19167,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
-+ linux*)
++ interix3*)
++ hardcode_direct_GCJ=no
++ hardcode_shlibpath_var_GCJ=no
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
++ linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
@@ -8570,7 +12432,7 @@
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -8582,7 +12444,12 @@
fi
;;
-@@ -18765,8 +19464,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_GCJ=no
+ cat <<EOF 1>&2
+@@ -18947,13 +19244,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8593,8 +12460,40 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18781,24 +19480,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++ ld_shlibs_GCJ=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ ld_shlibs_GCJ=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -18963,24 +19287,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -8625,7 +12524,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18832,9 +19526,20 @@
+@@ -18992,7 +19311,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L_GCJ=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct_GCJ=unsupported
+@@ -19014,9 +19333,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
@@ -8641,6 +12549,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -8648,7 +12557,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18851,7 +19556,7 @@
+@@ -19033,7 +19364,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8657,8 +12566,11 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -18872,6 +19577,9 @@
+@@ -19052,8 +19383,12 @@
+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
+ hardcode_libdir_separator_GCJ=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -8667,16 +12579,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18880,21 +19588,22 @@
+@@ -19061,22 +19396,23 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -8695,7 +12610,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18918,8 +19627,7 @@
+@@ -19100,8 +19436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8705,7 +12620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18946,14 +19654,13 @@
+@@ -19128,14 +19463,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8713,17 +12628,17 @@
- archive_cmds_GCJ="\$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"
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_GCJ="-z nodefs"
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18980,8 +19687,7 @@
+@@ -19162,8 +19496,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8733,18 +12648,24 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -19018,8 +19724,8 @@
+@@ -19195,13 +19528,11 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_GCJ=' ${wl}-bernotok'
+ allow_undefined_flag_GCJ=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols_GCJ=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_GCJ=' '
+- whole_archive_flag_spec_GCJ=' '
++ whole_archive_flag_spec_GCJ='$convenience'
archive_cmds_need_lc_GCJ=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -19032,7 +19738,7 @@
+@@ -19214,7 +19545,7 @@
ld_shlibs_GCJ=no
;;
@@ -8753,7 +12674,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19042,68 +19748,68 @@
+@@ -19224,68 +19555,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -8866,18 +12787,18 @@
fi
;;
-@@ -19137,8 +19843,8 @@
+@@ -19319,8 +19650,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19146,7 +19852,7 @@
+@@ -19328,7 +19659,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8886,15 +12807,41 @@
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
-@@ -19162,16 +19868,16 @@
+@@ -19342,47 +19673,62 @@
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_GCJ=:
++
++ hardcode_direct_GCJ=yes
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ hardcode_minus_L_GCJ=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -8903,21 +12850,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -19181,7 +19887,7 @@
+ *)
+- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_GCJ=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19214,7 +19920,7 @@
+- hardcode_libdir_separator_GCJ=:
+- hardcode_direct_GCJ=no
+- hardcode_shlibpath_var_GCJ=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- hardcode_minus_L_GCJ=yes
+ ;;
+ *)
+- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator_GCJ=:
+ hardcode_direct_GCJ=yes
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+@@ -19396,7 +19742,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -8925,16 +12903,16 @@
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'
-@@ -19224,7 +19930,7 @@
+@@ -19406,7 +19752,7 @@
link_all_deplibs_GCJ=yes
;;
- netbsd*)
-+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19247,7 +19953,8 @@
+@@ -19429,7 +19775,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
@@ -8944,7 +12922,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19257,7 +19964,7 @@
+@@ -19439,7 +19786,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8953,7 +12931,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19268,14 +19975,14 @@
+@@ -19450,14 +19797,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8970,7 +12948,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'
-@@ -19287,13 +19994,13 @@
+@@ -19469,13 +19816,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -8986,7 +12964,18 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19312,10 +20019,12 @@
+@@ -19483,21 +19830,15 @@
+ hardcode_libdir_separator_GCJ=:
+ ;;
+
+- sco3.2v5*)
+- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var_GCJ=no
+- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9001,7 +12990,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'
-@@ -19324,8 +20033,18 @@
+@@ -19506,8 +19847,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9022,7 +13011,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19334,7 +20053,7 @@
+@@ -19516,7 +19867,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.
@@ -9031,19 +13020,94 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19394,9 +20113,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_GCJ='${wl}-z ${wl}text'
+@@ -19564,36 +19915,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct_GCJ=yes
+- hardcode_minus_L_GCJ=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ no_undefined_flag_GCJ='${wl}-z,text'
++ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+- no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- sysv5*)
+- no_undefined_flag_GCJ=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- 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'
+- hardcode_libdir_flag_spec_GCJ=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ no_undefined_flag_GCJ='${wl}-z,text'
++ allow_undefined_flag_GCJ='${wl}-z,nodefs'
++ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator_GCJ=':'
++ link_all_deplibs_GCJ=yes
++ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
-@@ -19502,7 +20221,7 @@
++
++ if test "$GCC" = yes; then
++ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -19612,11 +19972,6 @@
+ 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"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -19649,6 +20004,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_GCJ
++ pic_flag=$lt_prog_compiler_pic_GCJ
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -19684,7 +20040,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9052,7 +13116,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19512,7 +20231,20 @@
+@@ -19694,7 +20050,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9074,7 +13138,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19577,7 +20309,7 @@
+@@ -19759,7 +20128,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9083,7 +13147,7 @@
;;
beos*)
-@@ -19586,7 +20318,7 @@
+@@ -19768,7 +20137,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9092,7 +13156,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19602,7 +20334,7 @@
+@@ -19784,7 +20153,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9101,7 +13165,7 @@
need_version=no
need_lib_prefix=no
-@@ -19614,7 +20346,8 @@
+@@ -19796,7 +20165,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9111,7 +13175,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19644,7 +20377,7 @@
+@@ -19826,7 +20196,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9120,7 +13184,7 @@
;;
esac
;;
-@@ -19667,7 +20400,7 @@
+@@ -19849,7 +20219,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9129,19 +13193,22 @@
# 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"`
-@@ -19690,7 +20423,7 @@
+@@ -19872,20 +20242,17 @@
dynamic_linker=no
;;
-kfreebsd*-gnu*)
-+kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -19702,8 +20435,17 @@
- dynamic_linker='GNU ld.so'
- ;;
-
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
@@ -9158,7 +13225,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19721,7 +20463,7 @@
+@@ -19903,14 +20270,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9167,7 +13234,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19748,9 +20490,9 @@
+- *) # from 3.2 on
++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ freebsd*) # from 4.6 on
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -19930,9 +20302,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9179,7 +13259,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19765,7 +20507,7 @@
+@@ -19947,7 +20319,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9188,7 +13268,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19776,7 +20518,7 @@
+@@ -19958,7 +20330,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9197,10 +13277,52 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19838,22 +20580,19 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+@@ -19970,6 +20342,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ 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'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ 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.
+-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'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -9208,28 +13330,854 @@
- 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
+- # 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
+- 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
+- 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
+- ;;
+-
+-os2*)
+- libname_spec='$name'
+- shrext=".dll"
+- need_lib_prefix=no
+- library_names_spec='$libname${shared_ext} $libname.a'
+- dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=LIBPATH
+- ;;
+-
+-osf3* | osf4* | osf5*)
+- version_type=osf
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+- ;;
+-
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-solaris*)
+- 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
+- hardcode_into_libs=yes
+- # ldd complains unless libraries are executable
+- postinstall_cmds='chmod +x $lib'
+- ;;
+-
+-sunos4*)
+- version_type=sunos
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- fi
+- need_version=yes
+- ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- sni)
+- shlibpath_overrides_runpath=no
+- need_lib_prefix=no
+- export_dynamic_flag_spec='${wl}-Blargedynsym'
+- runpath_var=LD_RUN_PATH
+- ;;
+- siemens)
+- need_lib_prefix=no
+- ;;
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+- ;;
+- esac
+- ;;
+-
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
+- ;;
+-
+-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
+-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
+-hardcode_action_GCJ=
+-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+- test -n "$runpath_var GCJ" || \
+- test "X$hardcode_automatic_GCJ"="Xyes" ; then
+-
+- # We can hardcode non-existant directories.
+- if test "$hardcode_direct_GCJ" != no &&
+- # If the only mechanism to avoid hardcoding is shlibpath_var, we
+- # have to relink, otherwise we might link with an installed library
+- # when we should be linking with a yet-to-be-installed one
+- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+- test "$hardcode_minus_L_GCJ" != no; then
+- # Linking always hardcodes the temporary library directory.
+- hardcode_action_GCJ=relink
+- else
+- # We can link without hardcoding, and we can hardcode nonexisting dirs.
+- hardcode_action_GCJ=immediate
+- fi
+-else
+- # We cannot hardcode anything, or else we can only hardcode existing
+- # directories.
+- hardcode_action_GCJ=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-echo "${ECHO_T}$hardcode_action_GCJ" >&6
+-
+-if test "$hardcode_action_GCJ" = relink; then
+- # Fast installation is not supported
+- enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+- test "$enable_shared" = no; then
+- # Fast installation is not necessary
+- enable_fast_install=needless
+-fi
+-
+-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
+-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
+-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
+- else
+- 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
+- ;;
+- 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=
+-
+- case $host_os in
+- beos*)
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ;;
+-
+- mingw* | pw32*)
+- lt_cv_dlopen="LoadLibrary"
+- lt_cv_dlopen_libs=
+- ;;
+-
+- cygwin*)
+- lt_cv_dlopen="dlopen"
+- lt_cv_dlopen_libs=
+- ;;
+-
+- 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
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- 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'
+- { (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_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-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
+-if test $ac_cv_lib_dl_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+-
+-fi
+-
+- ;;
+-
+- *)
+- 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
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* 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
+-
+-/* 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. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+-
+-/* 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 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)
+-choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != shl_load;
+- ;
+- 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'
+- { (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_func_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-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
+-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
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $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 shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+- ;
+- 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'
+- { (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_lib_dld_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-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
+-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
+-if test "${ac_cv_func_dlopen+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. */
+-/* 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
+-
+-/* 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. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
+-
+-/* 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 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)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != dlopen;
+- ;
+- 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'
+- { (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_func_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-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
+-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
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- 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'
+- { (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_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-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
+-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
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld $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 dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- 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'
+- { (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_lib_svld_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-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
+-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
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $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 dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+- ;
+- 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'
+- { (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_lib_dld_dld_link=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-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
+-if test $ac_cv_lib_dld_dld_link = yes; then
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
+-
+-
+-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
-+
- # 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,
-@@ -19863,6 +20602,30 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
+-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
@@ -9241,181 +14189,450 @@
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
-+
-+knetbsd*-gnu)
+
+-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}'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
++ shlibpath_overrides_runpath=yes
+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -19872,7 +20635,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}'
-+ 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
-@@ -19901,7 +20664,11 @@
- openbsd*)
- version_type=sunos
- need_lib_prefix=no
-- need_version=no
+
+- ;;
++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
+-
+- 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
+- enable_dlopen=no
++ shlibpath_overrides_runpath=yes
+ fi
++ ;;
+
+- case $lt_cv_dlopen in
+- dlopen)
+- save_CPPFLAGS="$CPPFLAGS"
+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+- save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+- save_LIBS="$LIBS"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+- 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
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 20875 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
++ shlibpath_var=LIBPATH
++ ;;
+
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
+-/* 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
++solaris*)
++ 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
++ hardcode_into_libs=yes
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
++ fi
++ need_version=yes
++ ;;
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
++sysv4 | sysv4.3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_vendor in
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
+ 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
-@@ -19921,7 +20688,7 @@
++ ;;
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -20023,8 +20790,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-- test -n "$runpath_var GCJ" || \
-- test "X$hardcode_automatic_GCJ"="Xyes" ; then
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
++sysv4*MP*)
++ if test -d /usr/nec ;then
++ version_type=linux
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ fi
++ ;;
+
+- 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 ;;
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
+ esac
+- 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 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
++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: 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
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
-@@ -20150,8 +20917,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { 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=$?
-@@ -20254,8 +21020,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=$?
-@@ -20320,8 +21085,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=$?
-@@ -20414,8 +21178,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=$?
-@@ -20480,8 +21243,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=$?
-@@ -20547,8 +21309,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=$?
-@@ -20614,8 +21375,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=$?
-@@ -20690,7 +21450,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20693 "configure"
-+#line 21453 "configure"
- #include "confdefs.h"
++ # We can hardcode non-existant directories.
++ if test "$hardcode_direct_GCJ" != no &&
++ # If the only mechanism to avoid hardcoding is shlibpath_var, we
++ # have to relink, otherwise we might link with an installed library
++ # when we should be linking with a yet-to-be-installed one
++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++ test "$hardcode_minus_L_GCJ" != no; then
++ # Linking always hardcodes the temporary library directory.
++ hardcode_action_GCJ=relink
++ else
++ # We can link without hardcoding, and we can hardcode nonexisting dirs.
++ hardcode_action_GCJ=immediate
++ fi
++else
++ # 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
- #if HAVE_DLFCN_H
-@@ -20756,7 +21516,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20788,7 +21548,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20791 "configure"
-+#line 21551 "configure"
- #include "confdefs.h"
+- case $lt_cv_dlopen_self_static in
+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+- *) enable_dlopen_self_static=unknown ;;
+- esac
++if test "$hardcode_action_GCJ" = relink; then
++ # Fast installation is not supported
++ enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
++ # Fast installation is not necessary
++ enable_fast_install=needless
+ fi
- #if HAVE_DLFCN_H
-@@ -20854,7 +21614,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20905,7 +21665,8 @@
+
+@@ -21087,7 +20671,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.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21005,6 +21766,12 @@
+@@ -21187,6 +20772,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9428,7 +14645,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21035,7 +21802,7 @@
+@@ -21198,6 +20789,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_GCJ
+
+@@ -21217,7 +20811,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9437,7 +14664,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21066,7 +21833,7 @@
+@@ -21248,7 +20842,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9446,7 +14673,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21081,7 +21848,7 @@
+@@ -21263,7 +20857,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9455,7 +14682,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21283,7 +22050,10 @@
+@@ -21465,7 +21059,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.
@@ -9467,20 +14694,27 @@
fi
-@@ -21326,11 +22096,35 @@
+@@ -21504,15 +21101,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -9503,17 +14737,17 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21346,7 +22140,8 @@
+@@ -21528,7 +21152,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.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21446,6 +22241,12 @@
+@@ -21628,6 +21253,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9526,7 +14760,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21476,7 +22277,7 @@
+@@ -21639,6 +21270,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_RC
+
+@@ -21658,7 +21292,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9535,7 +14779,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21507,7 +22308,7 @@
+@@ -21689,7 +21323,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9544,7 +14788,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21522,7 +22323,7 @@
+@@ -21704,7 +21338,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9553,7 +14797,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21724,7 +22525,10 @@
+@@ -21906,7 +21540,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.
@@ -9565,7 +14809,7 @@
fi
-@@ -21771,7 +22575,7 @@
+@@ -21953,7 +21590,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9574,7 +14818,7 @@
# Prevent multiple expansion
-@@ -22012,8 +22816,7 @@
+@@ -22194,8 +21831,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9584,7 +14828,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22087,9 +22890,6 @@
+@@ -22269,9 +21905,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9594,7 +14838,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22123,8 +22923,7 @@
+@@ -22305,8 +21938,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9604,7 +14848,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22228,8 +23027,7 @@
+@@ -22410,8 +22042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9614,7 +14858,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22308,9 +23106,6 @@
+@@ -22490,9 +22121,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9624,7 +14868,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22343,8 +23138,7 @@
+@@ -22525,8 +22153,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9634,7 +14878,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22447,8 +23241,7 @@
+@@ -22629,8 +22256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9644,7 +14888,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22538,8 +23331,7 @@
+@@ -22720,8 +22346,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9654,7 +14898,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22600,8 +23392,7 @@
+@@ -22782,8 +22407,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9664,7 +14908,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22669,8 +23460,7 @@
+@@ -22851,8 +22475,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9674,7 +14918,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22736,8 +23526,7 @@
+@@ -22918,8 +22541,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9684,7 +14928,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22830,8 +23619,7 @@
+@@ -23012,8 +22634,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9694,7 +14938,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22909,8 +23697,7 @@
+@@ -23091,8 +22712,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9704,7 +14948,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22994,8 +23781,7 @@
+@@ -23176,8 +22796,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9714,7 +14958,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23063,8 +23849,7 @@
+@@ -23245,8 +22864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9724,7 +14968,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23159,8 +23944,7 @@
+@@ -23341,8 +22959,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9734,7 +14978,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23224,8 +24008,7 @@
+@@ -23406,8 +23023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9744,7 +14988,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23320,8 +24103,7 @@
+@@ -23502,8 +23118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9754,7 +14998,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23385,8 +24167,7 @@
+@@ -23567,8 +23182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9764,7 +15008,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23482,8 +24263,7 @@
+@@ -23664,8 +23278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9774,7 +15018,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23547,8 +24327,7 @@
+@@ -23729,8 +23342,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9784,7 +15028,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23645,8 +24424,7 @@
+@@ -23827,8 +23439,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9794,7 +15038,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23711,8 +24489,7 @@
+@@ -23893,8 +23504,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9804,7 +15048,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23780,8 +24557,7 @@
+@@ -23962,8 +23572,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9814,7 +15058,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23932,8 +24708,7 @@
+@@ -24114,8 +23723,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9824,7 +15068,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24088,8 +24863,7 @@
+@@ -24270,8 +23878,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9834,7 +15078,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24154,8 +24928,7 @@
+@@ -24336,8 +23943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9844,7 +15088,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24302,8 +25075,7 @@
+@@ -24484,8 +24090,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9854,7 +15098,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24458,8 +25230,7 @@
+@@ -24640,8 +24245,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9864,7 +15108,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24515,9 +25286,6 @@
+@@ -24697,9 +24301,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9874,7 +15118,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24551,8 +25319,7 @@
+@@ -24733,8 +24334,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9884,7 +15128,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24656,8 +25423,7 @@
+@@ -24838,8 +24438,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9894,7 +15138,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24757,8 +25523,7 @@
+@@ -24939,8 +24538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9904,7 +15148,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24832,8 +25597,7 @@
+@@ -25014,8 +24612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9914,7 +15158,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24896,8 +25660,7 @@
+@@ -25078,8 +24675,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9924,7 +15168,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24959,8 +25722,7 @@
+@@ -25141,8 +24737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9934,7 +15178,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25000,8 +25762,7 @@
+@@ -25182,8 +24777,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9944,7 +15188,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25057,8 +25818,7 @@
+@@ -25239,8 +24833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9954,7 +15198,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25098,8 +25858,7 @@
+@@ -25280,8 +24873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9964,7 +15208,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25163,8 +25922,7 @@
+@@ -25345,8 +24937,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9974,7 +15218,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25195,10 +25953,8 @@
+@@ -25377,10 +24968,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9987,7 +15231,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25309,8 +26065,7 @@
+@@ -25491,8 +25080,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9997,7 +15241,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25372,8 +26127,7 @@
+@@ -25554,8 +25142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10007,7 +15251,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25413,8 +26167,7 @@
+@@ -25595,8 +25182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10017,7 +15261,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25470,8 +26223,7 @@
+@@ -25652,8 +25238,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10027,7 +15271,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25511,8 +26263,7 @@
+@@ -25693,8 +25278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10037,7 +15281,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25576,8 +26327,7 @@
+@@ -25758,8 +25342,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10047,7 +15291,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25608,10 +26358,8 @@
+@@ -25790,10 +25373,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10060,7 +15304,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25722,8 +26470,7 @@
+@@ -25904,8 +25485,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10070,7 +15314,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25785,8 +26532,7 @@
+@@ -25967,8 +25547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10080,7 +15324,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25826,8 +26572,7 @@
+@@ -26008,8 +25587,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10090,7 +15334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25883,8 +26628,7 @@
+@@ -26065,8 +25643,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10100,7 +15344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25924,8 +26668,7 @@
+@@ -26106,8 +25683,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10110,7 +15354,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25989,8 +26732,7 @@
+@@ -26171,8 +25747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10120,7 +15364,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26021,10 +26763,8 @@
+@@ -26203,10 +25778,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10133,7 +15377,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26135,8 +26875,7 @@
+@@ -26317,8 +25890,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10143,7 +15387,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26198,8 +26937,7 @@
+@@ -26380,8 +25952,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10153,7 +15397,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26239,8 +26977,7 @@
+@@ -26421,8 +25992,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10163,7 +15407,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26296,8 +27033,7 @@
+@@ -26478,8 +26048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10173,7 +15417,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26337,8 +27073,7 @@
+@@ -26519,8 +26088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10183,7 +15427,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26402,8 +27137,7 @@
+@@ -26584,8 +26152,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10193,7 +15437,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26434,10 +27168,8 @@
+@@ -26616,10 +26183,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10206,7 +15450,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26556,8 +27288,7 @@
+@@ -26738,8 +26303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10216,7 +15460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26628,8 +27359,7 @@
+@@ -26810,8 +26374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10226,7 +15470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26699,8 +27429,7 @@
+@@ -26881,8 +26444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10236,7 +15480,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26762,8 +27491,7 @@
+@@ -26944,8 +26506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10246,7 +15490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26803,8 +27531,7 @@
+@@ -26985,8 +26546,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10256,7 +15500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26860,8 +27587,7 @@
+@@ -27042,8 +26602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10266,7 +15510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26901,8 +27627,7 @@
+@@ -27083,8 +26642,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10276,7 +15520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26966,8 +27691,7 @@
+@@ -27148,8 +26706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10286,7 +15530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26998,10 +27722,8 @@
+@@ -27180,10 +26737,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10299,7 +15543,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27113,8 +27835,7 @@
+@@ -27295,8 +26850,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10309,7 +15553,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27176,8 +27897,7 @@
+@@ -27358,8 +26912,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10319,7 +15563,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27217,8 +27937,7 @@
+@@ -27399,8 +26952,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10329,7 +15573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27274,8 +27993,7 @@
+@@ -27456,8 +27008,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10339,7 +15583,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27315,8 +28033,7 @@
+@@ -27497,8 +27048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10349,7 +15593,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27380,8 +28097,7 @@
+@@ -27562,8 +27112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10359,7 +15603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27412,10 +28128,8 @@
+@@ -27594,10 +27143,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10372,7 +15616,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27526,8 +28240,7 @@
+@@ -27708,8 +27255,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10382,7 +15626,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27608,8 +28321,7 @@
+@@ -27790,8 +27336,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10392,7 +15636,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27709,8 +28421,7 @@
+@@ -27891,8 +27436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10402,7 +15646,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27890,8 +28601,7 @@
+@@ -28072,8 +27616,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10412,7 +15656,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28000,8 +28710,7 @@
+@@ -28182,8 +27725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10422,7 +15666,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28225,8 +28934,7 @@
+@@ -28407,8 +27949,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10432,7 +15676,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28449,8 +29157,7 @@
+@@ -28631,8 +28172,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10442,7 +15686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28526,8 +29233,7 @@
+@@ -28708,8 +28248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10452,7 +15696,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28753,8 +29459,7 @@
+@@ -28935,8 +28474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10462,7 +15706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28829,8 +29534,7 @@
+@@ -29011,8 +28549,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10472,7 +15716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28890,8 +29594,7 @@
+@@ -29072,8 +28609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10482,7 +15726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28974,8 +29677,7 @@
+@@ -29156,8 +28692,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10492,7 +15736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29068,8 +29770,7 @@
+@@ -29250,8 +28785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10502,7 +15746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29243,8 +29944,7 @@
+@@ -29425,8 +28959,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10512,7 +15756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29342,8 +30042,7 @@
+@@ -29524,8 +29057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10522,7 +15766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29430,8 +30129,7 @@
+@@ -29612,8 +29144,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10532,7 +15776,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29508,8 +30206,7 @@
+@@ -29690,8 +29221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10542,25 +15786,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29562,7 +30259,7 @@
+@@ -29744,7 +29274,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29565: $i/$j" >&5
-+ echo "configure: 30262: $i/$j" >&5
+- echo "configure: 29747: $i/$j" >&5
++ echo "configure: 29277: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29860,7 +30557,7 @@
+@@ -30042,7 +29572,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29863: $i/$j" >&5
-+ echo "configure: 30560: $i/$j" >&5
+- echo "configure: 30045: $i/$j" >&5
++ echo "configure: 29575: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30537,8 +31234,7 @@
+@@ -30719,8 +30249,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10570,43 +15814,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30697,7 +31393,7 @@
+@@ -30879,7 +30408,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30700: $i/$j" >&5
-+ echo "configure: 31396: $i/$j" >&5
+- echo "configure: 30882: $i/$j" >&5
++ echo "configure: 30411: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30727,7 +31423,7 @@
+@@ -30909,7 +30438,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30730: $i/$j" >&5
-+ echo "configure: 31426: $i/$j" >&5
+- echo "configure: 30912: $i/$j" >&5
++ echo "configure: 30441: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30745,7 +31441,7 @@
+@@ -30927,7 +30456,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30748: $i/$j" >&5
-+ echo "configure: 31444: $i/$j" >&5
+- echo "configure: 30930: $i/$j" >&5
++ echo "configure: 30459: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32268,7 +32964,7 @@
+@@ -32450,7 +31979,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32271: $i/$j" >&5
-+ echo "configure: 32967: $i/$j" >&5
+- echo "configure: 32453: $i/$j" >&5
++ echo "configure: 31982: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32467,8 +33163,7 @@
+@@ -32649,8 +32178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10616,7 +15860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32540,8 +33235,7 @@
+@@ -32722,8 +32250,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10626,7 +15870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32595,8 +33289,7 @@
+@@ -32777,8 +32304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10636,7 +15880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32667,8 +33360,7 @@
+@@ -32849,8 +32375,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10646,7 +15890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32722,8 +33414,7 @@
+@@ -32904,8 +32429,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10656,7 +15900,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32790,8 +33481,7 @@
+@@ -32972,8 +32496,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10666,7 +15910,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32961,8 +33651,7 @@
+@@ -33143,8 +32666,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10676,7 +15920,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33099,9 +33788,6 @@
+@@ -33281,9 +32803,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10686,7 +15930,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33132,8 +33818,7 @@
+@@ -33314,8 +32833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10696,7 +15940,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33234,8 +33919,7 @@
+@@ -33416,8 +32934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10706,7 +15950,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33314,9 +33998,6 @@
+@@ -33496,9 +33013,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10716,7 +15960,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33347,8 +34028,7 @@
+@@ -33529,8 +33043,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10726,7 +15970,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33449,8 +34129,7 @@
+@@ -33631,8 +33144,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10736,7 +15980,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33529,9 +34208,6 @@
+@@ -33711,9 +33223,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10746,7 +15990,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33564,8 +34240,7 @@
+@@ -33746,8 +33255,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10756,7 +16000,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33668,8 +34343,7 @@
+@@ -33850,8 +33358,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10766,7 +16010,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33748,9 +34422,6 @@
+@@ -33930,9 +33437,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10776,7 +16020,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33784,8 +34455,7 @@
+@@ -33966,8 +33470,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10786,7 +16030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33889,8 +34559,7 @@
+@@ -34071,8 +33574,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10796,7 +16040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33980,8 +34649,7 @@
+@@ -34162,8 +33664,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10806,16 +16050,107 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34029,7 +34697,7 @@
+@@ -34211,7 +33712,7 @@
do
for j in qsql.html;
do
-- echo "configure: 34032: $i/$j" >&5
-+ echo "configure: 34700: $i/$j" >&5
+- echo "configure: 34214: $i/$j" >&5
++ echo "configure: 33715: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -34302,8 +34970,7 @@
+@@ -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
++
++ 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
++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 $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.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -34424,30 +33961,30 @@
+ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+- 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"
+ 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
+ else
+ 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"
+ 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.
+@@ -34484,8 +34021,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10825,7 +16160,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34379,8 +35046,7 @@
+@@ -34561,8 +34097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10835,7 +16170,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34468,8 +35134,7 @@
+@@ -34650,8 +34185,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10845,7 +16180,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34533,8 +35198,7 @@
+@@ -34715,8 +34249,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10855,7 +16190,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34598,8 +35262,7 @@
+@@ -34780,8 +34313,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10865,7 +16200,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34773,8 +35436,7 @@
+@@ -34955,8 +34487,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10875,7 +16210,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35115,8 +35777,7 @@
+@@ -35297,8 +34828,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10885,7 +16220,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35374,8 +36035,7 @@
+@@ -35556,8 +35086,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10895,7 +16230,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35471,8 +36131,7 @@
+@@ -35653,8 +35182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10905,7 +16240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35598,8 +36257,7 @@
+@@ -35780,8 +35308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10915,7 +16250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35668,8 +36326,7 @@
+@@ -35850,8 +35377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10925,7 +16260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35751,8 +36408,7 @@
+@@ -35933,8 +35459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10935,7 +16270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36138,8 +36794,7 @@
+@@ -36423,8 +35948,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10945,7 +16280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36346,8 +37001,7 @@
+@@ -36631,8 +36155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10955,24 +16290,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36386,7 +37040,7 @@
+@@ -36671,7 +36194,7 @@
do
for j in xpdfrc;
do
-- echo "configure: 36389: $i/$j" >&5
-+ echo "configure: 37043: $i/$j" >&5
+- echo "configure: 36674: $i/$j" >&5
++ echo "configure: 36197: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
xpdfrc=$i
-@@ -36403,6 +37057,7 @@
-
- fi
-
-+
- # Check whether --enable-largefile or --disable-largefile was given.
- if test "${enable_largefile+set}" = set; then
- enableval="$enable_largefile"
-@@ -36453,8 +37108,7 @@
+@@ -36739,8 +36262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10982,7 +16309,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36483,8 +37137,7 @@
+@@ -36769,8 +36291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10992,7 +16319,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36554,8 +37207,7 @@
+@@ -36840,8 +36361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11002,7 +16329,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36607,8 +37259,7 @@
+@@ -36893,8 +36413,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11012,7 +16339,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36679,8 +37330,7 @@
+@@ -36965,8 +36484,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11022,7 +16349,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36732,8 +37382,7 @@
+@@ -37018,8 +36536,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11032,23 +16359,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36767,6 +37416,15 @@
- rm -f conftest*
- fi
-
-+if test "$ac_cv_sys_file_offset_bits" != no; then
-+ CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-+fi
-+
-+if test "x$ac_cv_sys_large_files" != "xno"; then
-+ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
-+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
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-@@ -36798,8 +37456,7 @@
+@@ -37093,8 +36610,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11058,7 +16369,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36843,8 +37500,7 @@
+@@ -37138,8 +36654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11068,7 +16379,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36909,8 +37565,7 @@
+@@ -37204,8 +36719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11078,7 +16389,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37011,8 +37666,7 @@
+@@ -37306,8 +36820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11088,7 +16399,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37115,8 +37769,7 @@
+@@ -37410,8 +36923,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11098,7 +16409,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37283,8 +37936,7 @@
+@@ -37578,8 +37090,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11108,7 +16419,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37389,8 +38041,7 @@
+@@ -37684,8 +37195,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11118,7 +16429,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37595,8 +38246,7 @@
+@@ -37890,8 +37400,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11128,7 +16439,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37816,8 +38466,7 @@
+@@ -38111,8 +37620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11138,7 +16449,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38263,8 +38912,7 @@
+@@ -38558,8 +38066,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11148,7 +16459,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38437,8 +39085,7 @@
+@@ -38732,8 +38239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11158,7 +16469,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38746,8 +39393,7 @@
+@@ -39041,8 +38547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11168,7 +16479,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39061,8 +39707,7 @@
+@@ -39463,8 +38968,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11178,7 +16489,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39140,8 +39785,7 @@
+@@ -39542,8 +39046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11188,7 +16499,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39219,8 +39863,7 @@
+@@ -39621,8 +39124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11198,7 +16509,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39300,8 +39943,7 @@
+@@ -39702,8 +39204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11208,7 +16519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39379,8 +40021,7 @@
+@@ -39781,8 +39282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11218,7 +16529,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39462,8 +40103,7 @@
+@@ -39864,8 +39364,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11228,7 +16539,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39566,8 +40206,7 @@
+@@ -39968,8 +39467,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11238,7 +16549,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39640,8 +40279,7 @@
+@@ -40042,8 +39540,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11248,7 +16559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39713,8 +40351,7 @@
+@@ -40115,8 +39612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11258,7 +16569,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39886,8 +40523,7 @@
+@@ -40288,8 +39784,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11268,7 +16579,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39959,8 +40595,7 @@
+@@ -40361,8 +39856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11278,7 +16589,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40014,8 +40649,7 @@
+@@ -40416,8 +39910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11288,7 +16599,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40086,8 +40720,7 @@
+@@ -40488,8 +39981,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11298,7 +16609,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40141,8 +40774,7 @@
+@@ -40543,8 +40035,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11308,7 +16619,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40209,8 +40841,7 @@
+@@ -40611,8 +40102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11318,7 +16629,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40280,8 +40911,7 @@
+@@ -40682,8 +40172,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11328,7 +16639,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40349,8 +40979,7 @@
+@@ -40751,8 +40240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11338,7 +16649,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40501,8 +41130,7 @@
+@@ -40903,8 +40391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11348,7 +16659,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40654,8 +41282,7 @@
+@@ -41056,8 +40543,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11358,7 +16669,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40719,8 +41346,7 @@
+@@ -41121,8 +40607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11368,7 +16679,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40785,8 +41411,7 @@
+@@ -41187,8 +40672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11378,7 +16689,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40858,8 +41483,7 @@
+@@ -41260,8 +40744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11388,7 +16699,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41043,8 +41667,7 @@
+@@ -41445,8 +40928,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11398,7 +16709,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41283,8 +41906,7 @@
+@@ -41685,8 +41167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11408,7 +16719,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41352,8 +41974,7 @@
+@@ -41754,8 +41235,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11418,7 +16729,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41538,8 +42159,7 @@
+@@ -41940,8 +41420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11428,7 +16739,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41581,18 +42201,24 @@
+@@ -41983,18 +41462,24 @@
ac_cv_func_fork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
@@ -11465,7 +16776,7 @@
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -41872,8 +42498,7 @@
+@@ -42274,8 +41759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11475,7 +16786,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41976,8 +42601,7 @@
+@@ -42378,8 +41862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11485,7 +16796,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42081,8 +42705,7 @@
+@@ -42483,8 +41966,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11495,7 +16806,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42182,8 +42805,7 @@
+@@ -42584,8 +42066,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11505,7 +16816,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42278,8 +42900,7 @@
+@@ -42680,8 +42161,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11515,7 +16826,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42439,8 +43060,7 @@
+@@ -42841,8 +42321,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11525,7 +16836,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42563,8 +43183,7 @@
+@@ -42965,8 +42444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11535,7 +16846,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42692,8 +43311,7 @@
+@@ -43094,8 +42572,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11545,7 +16856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43562,6 +44180,13 @@
+@@ -43964,6 +43441,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11559,7 +16870,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -44497,6 +45122,9 @@
+@@ -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
@@ -11569,7 +16880,17 @@
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
-@@ -44950,11 +45578,6 @@
+@@ -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 ;;
esac
@@ -11581,7 +16902,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -44993,6 +45616,12 @@
+@@ -45396,6 +44879,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -11598,25 +16919,34 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdegraphics, "3.5.1") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdegraphics, "3.5.2") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -612,7 +614,7 @@
- fi
+@@ -117,12 +119,13 @@
- dnl #### Check for FSEEK variants
--AC_SYS_LARGEFILE
-+KDE_CHECK_LARGEFILE
- AC_FUNC_FSEEKO
- AC_CHECK_FUNCS(fseek64, xpdf_cv_func_fseek64=yes, xpdf_cv_func_fseek64=no)
- AC_CHECK_FUNCS(ftell64, xpdf_cv_func_ftell64=yes, xpdf_cv_func_ftell64=no)
+ 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
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11626,7 +16956,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11635,7 +16975,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11649,7 +16989,7 @@
mostlyclean-libtool:
--- doc/kcoloredit/Makefile.in
+++ doc/kcoloredit/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11659,7 +16999,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11668,7 +17018,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11682,7 +17032,7 @@
mostlyclean-libtool:
--- doc/kdvi/Makefile.in
+++ doc/kdvi/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11692,7 +17042,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11701,7 +17061,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11713,7 +17073,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -594,10 +597,10 @@
+@@ -595,10 +599,10 @@
.NOEXPORT:
#>+ 2
@@ -11726,7 +17086,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi
@@ -11752,7 +17112,7 @@
--- doc/kgamma/Makefile.in
+++ doc/kgamma/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11762,7 +17122,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11771,7 +17141,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11785,7 +17155,7 @@
mostlyclean-libtool:
--- doc/kghostview/Makefile.in
+++ doc/kghostview/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11795,7 +17165,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11804,7 +17184,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11818,7 +17198,7 @@
mostlyclean-libtool:
--- doc/kiconedit/Makefile.in
+++ doc/kiconedit/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11828,7 +17208,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11837,7 +17227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11849,7 +17239,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -597,7 +600,7 @@
+@@ -598,7 +602,7 @@
KDE_DIST=Makefile.in kiconedit-configuration.png index.docbook Makefile.am index.cache.bz2
#>+ 24
@@ -11858,7 +17248,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit
@@ -11884,7 +17274,7 @@
--- doc/kolourpaint/Makefile.in
+++ doc/kolourpaint/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11894,7 +17284,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11903,7 +17303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11915,7 +17315,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -594,10 +597,10 @@
+@@ -595,10 +599,10 @@
.NOEXPORT:
#>+ 2
@@ -11928,7 +17328,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint
@@ -11954,7 +17354,7 @@
--- doc/kooka/Makefile.in
+++ doc/kooka/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11964,7 +17364,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11973,7 +17383,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11985,7 +17395,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -594,10 +597,10 @@
+@@ -595,10 +599,10 @@
.NOEXPORT:
#>+ 2
@@ -11998,7 +17408,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka
@@ -12024,7 +17434,7 @@
--- doc/kpdf/Makefile.in
+++ doc/kpdf/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12034,7 +17444,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12043,7 +17463,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12055,7 +17475,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -597,7 +600,7 @@
+@@ -598,7 +602,7 @@
KDE_DIST=index.docbook configure.png Makefile.in Makefile.am index.cache.bz2
#>+ 24
@@ -12064,7 +17484,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf
@@ -12090,7 +17510,7 @@
--- doc/kpovmodeler/Makefile.in
+++ doc/kpovmodeler/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12100,7 +17520,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12109,7 +17539,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12121,7 +17551,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -594,10 +597,10 @@
+@@ -595,10 +599,10 @@
.NOEXPORT:
#>+ 2
@@ -12134,7 +17564,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler
@@ -12160,7 +17590,7 @@
--- doc/kruler/Makefile.in
+++ doc/kruler/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12170,7 +17600,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12179,7 +17619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12193,7 +17633,7 @@
mostlyclean-libtool:
--- doc/ksnapshot/Makefile.in
+++ doc/ksnapshot/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12203,7 +17643,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12212,7 +17662,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12224,7 +17674,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -597,7 +600,7 @@
+@@ -598,7 +602,7 @@
KDE_DIST=preview.png index.docbook window.png Makefile.in Makefile.am index.cache.bz2
#>+ 24
@@ -12233,7 +17683,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot
@@ -12259,7 +17709,7 @@
--- doc/kuickshow/Makefile.in
+++ doc/kuickshow/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12269,7 +17719,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12278,7 +17738,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12292,7 +17752,7 @@
mostlyclean-libtool:
--- doc/kview/Makefile.in
+++ doc/kview/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12302,7 +17762,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12311,7 +17781,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12323,7 +17793,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -597,7 +600,7 @@
+@@ -598,7 +602,7 @@
KDE_DIST=kview-application-configuration.png index.docbook Makefile.in kview-viewer-configuration.png Makefile.am index.cache.bz2
#>+ 24
@@ -12332,7 +17802,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -624,20 +627,20 @@
+@@ -625,20 +629,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview
@@ -12358,7 +17828,7 @@
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12368,7 +17838,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,13 +425,13 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -423,13 +427,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -12384,7 +17864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -467,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12398,7 +17878,7 @@
mostlyclean-libtool:
--- kamera/kcontrol/Makefile.in
+++ kamera/kcontrol/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12408,7 +17888,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -344,7 +347,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -469,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12417,7 +17907,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -507,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12431,7 +17921,7 @@
@$(NORMAL_INSTALL)
--- kamera/kioslave/Makefile.in
+++ kamera/kioslave/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12441,7 +17931,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -341,7 +344,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -467,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12450,7 +17950,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12464,7 +17964,7 @@
@$(NORMAL_INSTALL)
--- kamera/Makefile.in
+++ kamera/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12474,7 +17974,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -309,7 +312,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -426,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12483,7 +17993,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12497,7 +18007,7 @@
mostlyclean-libtool:
--- kamera/pics/Makefile.in
+++ kamera/pics/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12507,7 +18017,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -409,7 +413,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12516,7 +18036,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -447,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12528,7 +18048,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -598,29 +601,29 @@
+@@ -599,29 +603,29 @@
#>+ 25
install-kde-icons:
@@ -12575,7 +18095,7 @@
force-reedit:
--- kcoloredit/Makefile.in
+++ kcoloredit/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -281,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12585,7 +18105,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -364,7 +367,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -505,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12594,7 +18124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -543,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12606,7 +18136,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -857,18 +860,18 @@
+@@ -858,18 +862,18 @@
.NOEXPORT:
#>+ 3
@@ -12631,7 +18161,7 @@
#>+ 3
kcoloreditdoc.moc: $(srcdir)/kcoloreditdoc.h
-@@ -942,7 +945,7 @@
+@@ -943,7 +947,7 @@
#>+ 3
clean-metasources:
@@ -12640,7 +18170,7 @@
#>+ 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
-@@ -1005,7 +1008,7 @@
+@@ -1006,7 +1010,7 @@
#>+ 11
@@ -12651,7 +18181,7 @@
echo "#define KDE_USE_FINAL 1" >> kcoloredit.all_cpp.final; \
--- kdvi/Makefile.in
+++ kdvi/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -320,6 +320,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12661,7 +18191,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -403,7 +406,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -580,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -12670,7 +18210,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -618,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12682,7 +18222,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1197,13 +1200,6 @@
+@@ -1198,13 +1202,6 @@
mocs: dviPageCache.moc
#>+ 3
@@ -12696,7 +18236,7 @@
psgs.moc: $(srcdir)/psgs.h
$(MOC) $(srcdir)/psgs.h -o psgs.moc
-@@ -1211,11 +1207,11 @@
+@@ -1212,11 +1209,11 @@
mocs: psgs.moc
#>+ 3
@@ -12711,7 +18251,7 @@
#>+ 3
fontprogress.moc: $(srcdir)/fontprogress.h
-@@ -1225,18 +1221,18 @@
+@@ -1226,18 +1223,18 @@
mocs: fontprogress.moc
#>+ 3
@@ -12736,7 +18276,7 @@
#>+ 3
optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
-@@ -1246,18 +1242,18 @@
+@@ -1247,18 +1244,18 @@
mocs: optionDialogSpecialWidget.moc
#>+ 3
@@ -12761,7 +18301,7 @@
#>+ 3
dviRenderer.moc: $(srcdir)/dviRenderer.h
-@@ -1267,11 +1263,18 @@
+@@ -1268,11 +1265,18 @@
mocs: dviRenderer.moc
#>+ 3
@@ -12784,7 +18324,7 @@
clean-ui:
--- kdvi/pix/Makefile.in
+++ kdvi/pix/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12794,7 +18334,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -409,7 +413,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12803,7 +18353,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -447,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12815,7 +18365,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -598,23 +601,23 @@
+@@ -599,23 +603,23 @@
#>+ 19
install-kde-icons:
@@ -12850,7 +18400,7 @@
force-reedit:
--- kfax/Makefile.in
+++ kfax/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -266,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12860,7 +18410,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -349,7 +352,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -483,7 +487,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12869,7 +18429,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -521,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12881,7 +18441,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -874,23 +877,23 @@
+@@ -875,23 +879,23 @@
#>+ 19
install-kde-icons:
@@ -12913,7 +18473,7 @@
force-reedit:
--- kfaxview/libkfaximage/Makefile.in
+++ kfaxview/libkfaximage/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12923,7 +18483,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -465,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12932,7 +18502,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12946,7 +18516,7 @@
@$(NORMAL_INSTALL)
--- kfaxview/Makefile.in
+++ kfaxview/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -284,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12956,7 +18526,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -367,7 +370,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -509,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12965,7 +18545,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -547,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12977,7 +18557,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1143,23 +1146,23 @@
+@@ -1144,23 +1148,23 @@
#>+ 19
install-kde-icons:
@@ -13009,7 +18589,7 @@
force-reedit:
--- kfile-plugins/bmp/Makefile.in
+++ kfile-plugins/bmp/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13019,7 +18599,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13028,7 +18618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13042,7 +18632,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/dds/Makefile.in
+++ kfile-plugins/dds/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13052,7 +18642,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13061,7 +18661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13075,7 +18675,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/dvi/Makefile.in
+++ kfile-plugins/dvi/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13085,7 +18685,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13094,7 +18704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13108,7 +18718,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/exr/Makefile.in
+++ kfile-plugins/exr/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13118,7 +18728,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -339,7 +342,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -473,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13127,7 +18747,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -511,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13141,7 +18761,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/gif/Makefile.in
+++ kfile-plugins/gif/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13151,7 +18771,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -471,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13160,7 +18790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -509,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13174,7 +18804,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/ico/Makefile.in
+++ kfile-plugins/ico/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13184,7 +18814,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13193,7 +18833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13207,7 +18847,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/jpeg/Makefile.in
+++ kfile-plugins/jpeg/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13217,7 +18857,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -341,7 +344,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -474,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13226,7 +18876,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -512,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13240,7 +18890,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/Makefile.in
+++ kfile-plugins/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13250,7 +18900,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -309,7 +312,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -431,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13259,7 +18919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -469,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13273,7 +18933,7 @@
mostlyclean-libtool:
--- kfile-plugins/pcx/Makefile.in
+++ kfile-plugins/pcx/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13283,7 +18943,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -339,7 +342,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -469,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13292,7 +18962,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -507,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13306,7 +18976,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/pdf/Makefile.in
+++ kfile-plugins/pdf/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13316,7 +18986,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -339,7 +342,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -471,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13325,7 +19005,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -509,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13339,7 +19019,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/png/Makefile.in
+++ kfile-plugins/png/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13349,7 +19029,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13358,7 +19048,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13372,7 +19062,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/pnm/Makefile.in
+++ kfile-plugins/pnm/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13382,7 +19072,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13391,7 +19091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13405,7 +19105,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/ps/Makefile.in
+++ kfile-plugins/ps/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13415,7 +19115,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -345,7 +348,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -480,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13424,7 +19134,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -518,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13438,7 +19148,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/raw/Makefile.in
+++ kfile-plugins/raw/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -266,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13448,15 +19158,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,14 +483,14 @@
- mimetypeimagedata_DATA = x-image-raw.desktop
- magicdir = $(kde_confdir)/magic
- magic_DATA = x-image-raw.magic
--EXTRA_DIST = $(mimetypeimagedata_DATA) $(magic_DATA) parse.c.orig
-+EXTRA_DIST = $(mimetypeimagedata_DATA) $(magic_DATA)
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -349,7 +352,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -13465,7 +19177,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13479,7 +19191,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/rgb/Makefile.in
+++ kfile-plugins/rgb/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13489,7 +19201,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13498,7 +19220,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13512,7 +19234,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/tga/Makefile.in
+++ kfile-plugins/tga/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13522,7 +19244,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13531,7 +19263,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13545,7 +19277,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/tiff/Makefile.in
+++ kfile-plugins/tiff/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13555,7 +19287,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -339,7 +342,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -469,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13564,7 +19306,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -507,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13578,7 +19320,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/xbm/Makefile.in
+++ kfile-plugins/xbm/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13588,7 +19330,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13597,7 +19349,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13611,7 +19363,7 @@
@$(NORMAL_INSTALL)
--- kfile-plugins/xpm/Makefile.in
+++ kfile-plugins/xpm/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13621,7 +19373,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -468,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13630,7 +19392,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -506,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13644,7 +19406,7 @@
@$(NORMAL_INSTALL)
--- kgamma/kcmkgamma/Makefile.in
+++ kgamma/kcmkgamma/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -270,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13654,7 +19416,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -353,7 +356,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13663,7 +19435,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13675,7 +19447,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -924,22 +927,22 @@
+@@ -925,22 +929,22 @@
mocs: displaynumber.moc
#>+ 3
@@ -13707,7 +19479,7 @@
KDE_DIST=gammactrl.h xf86configpath.h kgamma.h kgamma.desktop displaynumber.h Makefile.in xvidextwrap.h Makefile.am
--- kgamma/kcmkgamma/pics/Makefile.in
+++ kgamma/kcmkgamma/pics/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13717,7 +19489,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -423,7 +427,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13726,7 +19508,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13740,7 +19522,7 @@
mostlyclean-libtool:
--- kgamma/Makefile.in
+++ kgamma/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13750,7 +19532,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -309,7 +312,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -426,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13759,7 +19551,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13773,7 +19565,7 @@
mostlyclean-libtool:
--- kgamma/xf86gammacfg/Makefile.in
+++ kgamma/xf86gammacfg/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13783,7 +19575,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -328,7 +331,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -451,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13792,7 +19594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13806,7 +19608,7 @@
@$(NORMAL_INSTALL)
--- kghostview/data/Makefile.in
+++ kghostview/data/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13816,7 +19618,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -420,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13825,7 +19637,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -458,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13839,7 +19651,7 @@
mostlyclean-libtool:
--- kghostview/Makefile.in
+++ kghostview/Makefile.in
-@@ -325,6 +325,9 @@
+@@ -326,6 +326,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13849,7 +19661,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -409,7 +412,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -580,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -13858,7 +19680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -618,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13870,7 +19692,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1298,18 +1301,18 @@
+@@ -1299,18 +1303,18 @@
mocs: kgvmainwidget.moc
#>+ 3
@@ -13895,7 +19717,7 @@
#>+ 3
viewcontrol.moc: $(srcdir)/viewcontrol.h
-@@ -1343,10 +1346,10 @@
+@@ -1344,10 +1348,10 @@
#>+ 3
clean-metasources:
@@ -13908,7 +19730,7 @@
#>+ 5
clean-ui:
-@@ -1368,26 +1371,26 @@
+@@ -1369,26 +1373,26 @@
#>+ 22
install-kde-icons:
@@ -13944,7 +19766,7 @@
#>+ 15
force-reedit:
-@@ -1440,7 +1443,7 @@
+@@ -1441,7 +1445,7 @@
rm -f libdscparse_la.all_cpp.final libdscparse_la.all_cpp.files
#>+ 11
@@ -13955,7 +19777,7 @@
echo "#define KDE_USE_FINAL 1" >> libkghostviewlib_la.all_cpp.final; \
--- kiconedit/Makefile.in
+++ kiconedit/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -279,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13965,7 +19787,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -362,7 +365,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -495,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13974,7 +19806,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -533,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13986,7 +19818,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -970,18 +973,18 @@
+@@ -971,18 +975,18 @@
mocs: kicon.moc
#>+ 3
@@ -14011,7 +19843,7 @@
#>+ 3
kiconcolors.moc: $(srcdir)/kiconcolors.h
-@@ -991,22 +994,22 @@
+@@ -992,22 +996,22 @@
mocs: kiconcolors.moc
#>+ 3
@@ -14041,7 +19873,7 @@
#>+ 2
KDE_DIST=kiconedit.h kiconeditui.rc kiconedit.desktop kicon.h kcolorgrid.h kiconconfig.h properties.h utils.h Makefile.in kresize.h palettetoolbar.h version.h knew.h Makefile.am kicongrid.h kiconcolors.h
-@@ -1053,7 +1056,7 @@
+@@ -1054,7 +1058,7 @@
#>+ 11
@@ -14050,7 +19882,7 @@
@echo 'creating kiconedit.all_cpp.cpp ...'; \
rm -f kiconedit.all_cpp.files kiconedit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kiconedit.all_cpp.final; \
-@@ -1096,8 +1099,8 @@
+@@ -1097,8 +1101,8 @@
knew.lo: knew.moc
kiconconfig.o: kiconconfig.moc
kiconcolors.o: kiconcolors.moc
@@ -14062,7 +19894,7 @@
nmcheck:
--- kiconedit/pics/icons/Makefile.in
+++ kiconedit/pics/icons/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14072,7 +19904,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -423,7 +427,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14081,7 +19923,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14095,7 +19937,7 @@
mostlyclean-libtool:
--- kiconedit/pics/Makefile.in
+++ kiconedit/pics/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14105,7 +19947,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -426,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14114,7 +19966,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14126,7 +19978,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -765,17 +768,17 @@
+@@ -766,17 +770,17 @@
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
@@ -14149,7 +20001,7 @@
#>+ 15
--- kiconedit/pics/toolbar/Makefile.in
+++ kiconedit/pics/toolbar/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14159,7 +20011,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -444,7 +448,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14168,7 +20030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -482,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14180,7 +20042,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -642,7 +645,7 @@
+@@ -643,7 +647,7 @@
.NOEXPORT:
#>+ 2
@@ -14191,7 +20053,7 @@
docs-am:
--- kmrml/kmrml/kcontrol/Makefile.in
+++ kmrml/kmrml/kcontrol/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14201,7 +20063,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -345,7 +348,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -475,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14210,7 +20082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -513,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14224,7 +20096,7 @@
@$(NORMAL_INSTALL)
--- kmrml/kmrml/lib/Makefile.in
+++ kmrml/kmrml/lib/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14234,7 +20106,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -331,7 +334,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -459,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14243,7 +20125,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -497,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14257,7 +20139,7 @@
clean-noinstLTLIBRARIES:
--- kmrml/kmrml/Makefile.in
+++ kmrml/kmrml/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -312,6 +312,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14267,7 +20149,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -395,7 +398,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -543,7 +547,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14276,7 +20168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14288,7 +20180,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1165,18 +1168,18 @@
+@@ -1166,18 +1170,18 @@
mocs: browser.moc
#>+ 3
@@ -14313,7 +20205,7 @@
#>+ 3
algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-@@ -1219,7 +1222,7 @@
+@@ -1220,7 +1224,7 @@
#>+ 3
clean-metasources:
@@ -14322,7 +20214,7 @@
#>+ 2
KDE_DIST=mrml_creator.h browser.h mrml.protocol mrml-servicemenu.desktop propertywidgets.h mrml_part.desktop mrml_view.h algorithmdialog.h mrml_elements.h propertysheet.h collectioncombo.h mrml.h Makefile.in algorithmcombo.h mrml.desktop loader.h propertywidgets.cpp mrml_part.h Makefile.am
-@@ -1270,7 +1273,7 @@
+@@ -1271,7 +1275,7 @@
#>+ 11
@@ -14333,7 +20225,7 @@
echo "#define KDE_USE_FINAL 1" >> libkmrmlpart_la.all_cpp.final; \
--- kmrml/kmrml/server/Makefile.in
+++ kmrml/kmrml/server/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14343,7 +20235,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -339,7 +342,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -467,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14352,7 +20254,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -505,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14366,7 +20268,7 @@
@$(NORMAL_INSTALL)
--- kmrml/Makefile.in
+++ kmrml/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14376,7 +20278,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -309,7 +312,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -426,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14385,7 +20297,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14399,7 +20311,7 @@
mostlyclean-libtool:
--- kolourpaint/cursors/Makefile.in
+++ kolourpaint/cursors/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14409,7 +20321,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -328,7 +331,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -454,7 +458,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14418,7 +20340,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -492,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14432,7 +20354,7 @@
clean-noinstLTLIBRARIES:
--- kolourpaint/Makefile.in
+++ kolourpaint/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -304,6 +304,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14442,7 +20364,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -387,7 +390,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -546,7 +550,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14451,7 +20383,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -584,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14463,7 +20395,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1088,13 +1091,6 @@
+@@ -1089,13 +1093,6 @@
mocs: kpdocument.moc
#>+ 3
@@ -14477,7 +20409,7 @@
kpcommandhistory.moc: $(srcdir)/kpcommandhistory.h
$(MOC) $(srcdir)/kpcommandhistory.h -o kpcommandhistory.moc
-@@ -1109,6 +1105,13 @@
+@@ -1110,6 +1107,13 @@
mocs: kpselection.moc
#>+ 3
@@ -14491,7 +20423,7 @@
kpsinglekeytriggersaction.moc: $(srcdir)/kpsinglekeytriggersaction.h
$(MOC) $(srcdir)/kpsinglekeytriggersaction.h -o kpsinglekeytriggersaction.moc
-@@ -1117,10 +1120,10 @@
+@@ -1118,10 +1122,10 @@
#>+ 3
clean-metasources:
@@ -14504,7 +20436,7 @@
#>+ 2
docs-am:
-@@ -1164,7 +1167,7 @@
+@@ -1165,7 +1169,7 @@
#>+ 11
@@ -14515,7 +20447,7 @@
echo "#define KDE_USE_FINAL 1" >> kolourpaint.all_cpp.final; \
--- kolourpaint/pics/custom/Makefile.in
+++ kolourpaint/pics/custom/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14525,7 +20457,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -427,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14534,7 +20476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -465,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14548,7 +20490,7 @@
mostlyclean-libtool:
--- kolourpaint/pics/Makefile.in
+++ kolourpaint/pics/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14558,7 +20500,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -428,7 +432,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14567,7 +20519,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -466,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14579,7 +20531,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -764,230 +767,230 @@
+@@ -765,230 +769,230 @@
.NOEXPORT:
#>+ 2
@@ -14987,7 +20939,7 @@
force-reedit:
--- kolourpaint/pixmapfx/Makefile.in
+++ kolourpaint/pixmapfx/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14997,7 +20949,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -332,7 +335,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -468,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15006,7 +20968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -506,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15018,7 +20980,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -752,6 +755,20 @@
+@@ -753,6 +757,20 @@
mocs: kpeffectflatten.moc
#>+ 3
@@ -15039,7 +21001,7 @@
kpeffectinvert.moc: $(srcdir)/kpeffectinvert.h
$(MOC) $(srcdir)/kpeffectinvert.h -o kpeffectinvert.moc
-@@ -773,36 +790,22 @@
+@@ -774,36 +792,22 @@
mocs: kpeffectemboss.moc
#>+ 3
@@ -15083,7 +21045,7 @@
#>+ 2
KDE_DIST=kpeffectsdialog.h kpeffectemboss.h kpeffectbalance.h kpfloodfill.h kpeffectblursharpen.h kpeffectinvert.h kpeffectreducecolors.h kppixmapfx.h kpeffectflatten.h Makefile.in kpcoloreffect.h Makefile.am
-@@ -849,7 +852,7 @@
+@@ -850,7 +854,7 @@
#>+ 11
@@ -15092,7 +21054,7 @@
@echo 'creating libkolourpaintpixmapfx_la.all_cpp.cpp ...'; \
rm -f libkolourpaintpixmapfx_la.all_cpp.files libkolourpaintpixmapfx_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintpixmapfx_la.all_cpp.final; \
-@@ -887,8 +890,8 @@
+@@ -888,8 +892,8 @@
#>+ 19
kpeffectemboss.lo: kpeffectemboss.moc
kpeffectsdialog.o: kpeffectsdialog.moc
@@ -15102,7 +21064,7 @@
kpeffectflatten.o: kpeffectflatten.moc
nmcheck:
kpeffectbalance.lo: kpeffectbalance.moc
-@@ -899,7 +902,7 @@
+@@ -900,7 +904,7 @@
kpeffectreducecolors.o: kpeffectreducecolors.moc
kpeffectflatten.lo: kpeffectflatten.moc
kpeffectinvert.o: kpeffectinvert.moc
@@ -15113,7 +21075,7 @@
kpeffectsdialog.lo: kpeffectsdialog.moc
--- kolourpaint/tools/Makefile.in
+++ kolourpaint/tools/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -264,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15123,7 +21085,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -347,7 +350,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -517,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15132,7 +21104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -555,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15144,7 +21116,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -971,7 +974,7 @@
+@@ -972,7 +976,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
@@ -15155,7 +21127,7 @@
docs-am:
--- kolourpaint/views/Makefile.in
+++ kolourpaint/views/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15165,7 +21137,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -329,7 +332,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -459,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15174,7 +21156,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -497,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15186,7 +21168,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -730,18 +733,18 @@
+@@ -731,18 +735,18 @@
.NOEXPORT:
#>+ 3
@@ -15211,7 +21193,7 @@
#>+ 3
kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-@@ -759,7 +762,7 @@
+@@ -760,7 +764,7 @@
#>+ 3
clean-metasources:
@@ -15220,7 +21202,7 @@
#>+ 2
KDE_DIST=kpunzoomedthumbnailview.h kpzoomedthumbnailview.h kpzoomedview.h Makefile.in Makefile.am kpthumbnailview.h
-@@ -806,7 +809,7 @@
+@@ -807,7 +811,7 @@
#>+ 11
@@ -15229,7 +21211,7 @@
@echo 'creating libkolourpaintviews_la.all_cpp.cpp ...'; \
rm -f libkolourpaintviews_la.all_cpp.files libkolourpaintviews_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintviews_la.all_cpp.final; \
-@@ -843,8 +846,8 @@
+@@ -844,8 +848,8 @@
#>+ 11
nmcheck:
@@ -15241,7 +21223,7 @@
nmcheck-am: nmcheck
--- kolourpaint/widgets/Makefile.in
+++ kolourpaint/widgets/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15251,7 +21233,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -475,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15260,7 +21252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -513,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15272,7 +21264,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -797,18 +800,18 @@
+@@ -798,18 +802,18 @@
mocs: kpresizesignallinglabel.moc
#>+ 3
@@ -15297,7 +21289,7 @@
#>+ 3
kptoolwidgetfillstyle.moc: $(srcdir)/kptoolwidgetfillstyle.h
-@@ -840,10 +843,10 @@
+@@ -841,10 +845,10 @@
#>+ 3
clean-metasources:
@@ -15310,7 +21302,7 @@
#>+ 2
docs-am:
-@@ -887,7 +890,7 @@
+@@ -888,7 +892,7 @@
#>+ 11
@@ -15319,7 +21311,7 @@
@echo 'creating libkolourpaintwidgets_la.all_cpp.cpp ...'; \
rm -f libkolourpaintwidgets_la.all_cpp.files libkolourpaintwidgets_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintwidgets_la.all_cpp.final; \
-@@ -932,8 +935,8 @@
+@@ -933,8 +937,8 @@
kpresizesignallinglabel.o: kpresizesignallinglabel.moc
kptoolwidgetfillstyle.o: kptoolwidgetfillstyle.moc
kpcolorsimilaritydialog.o: kpcolorsimilaritydialog.moc
@@ -15331,7 +21323,7 @@
kptoolwidgeterasersize.lo: kptoolwidgeterasersize.moc
--- kooka/Makefile.in
+++ kooka/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -295,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15341,7 +21333,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -378,7 +381,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -528,7 +532,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15350,7 +21352,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -566,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15362,7 +21364,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1003,81 +1006,67 @@
+@@ -1004,81 +1008,67 @@
.NOEXPORT:
#>+ 3
@@ -15471,7 +21473,7 @@
#>+ 3
imageselectline.moc: $(srcdir)/imageselectline.h
-@@ -1101,6 +1090,20 @@
+@@ -1102,6 +1092,20 @@
mocs: scanpackager.moc
#>+ 3
@@ -15492,7 +21494,7 @@
kookaview.moc: $(srcdir)/kookaview.h
$(MOC) $(srcdir)/kookaview.h -o kookaview.moc
-@@ -1108,11 +1111,11 @@
+@@ -1109,11 +1113,11 @@
mocs: kookaview.moc
#>+ 3
@@ -15507,7 +21509,7 @@
#>+ 3
kooka.moc: $(srcdir)/kooka.h
-@@ -1130,7 +1133,7 @@
+@@ -1131,7 +1135,7 @@
#>+ 3
clean-metasources:
@@ -15516,7 +21518,7 @@
#>+ 2
KDE_DIST=README.KADMOS kookaui.rc WARNING kooka.desktop CREDITS kookarc CHANGES configure.in.in Makefile.in dwmenuaction.h version.h Makefile.am
-@@ -1177,7 +1180,7 @@
+@@ -1178,7 +1182,7 @@
#>+ 11
@@ -15525,7 +21527,7 @@
@echo 'creating kooka.all_cpp.cpp ...'; \
rm -f kooka.all_cpp.files kooka.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kooka.all_cpp.final; \
-@@ -1218,14 +1221,14 @@
+@@ -1219,14 +1223,14 @@
kocrbase.lo: kocrbase.moc
imgnamecombo.o: imgnamecombo.moc
img_saver.o: img_saver.moc
@@ -15545,7 +21547,7 @@
imgprintdialog.lo: imgprintdialog.moc
--- kooka/pics/Makefile.in
+++ kooka/pics/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15555,7 +21557,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -427,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15564,7 +21576,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -465,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15576,7 +21588,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -625,7 +628,7 @@
+@@ -626,7 +630,7 @@
.NOEXPORT:
#>+ 2
@@ -15587,7 +21599,7 @@
docs-am:
--- kpdf/conf/Makefile.in
+++ kpdf/conf/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15597,7 +21609,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -335,7 +338,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -464,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15606,7 +21628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -502,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15620,7 +21642,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/core/generator_kimgio/Makefile.in
+++ kpdf/core/generator_kimgio/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -239,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15630,7 +21652,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -322,7 +325,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -443,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15639,7 +21671,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -481,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15653,7 +21685,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/core/generator_pdf/Makefile.in
+++ kpdf/core/generator_pdf/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -239,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15663,7 +21695,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -322,7 +325,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -444,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15672,7 +21714,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -482,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15686,7 +21728,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/core/Makefile.in
+++ kpdf/core/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15696,7 +21738,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -342,7 +345,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -465,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15705,7 +21757,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15719,7 +21771,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/Makefile.in
+++ kpdf/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -274,6 +274,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15729,7 +21781,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -357,7 +360,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -495,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15738,7 +21800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -533,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15750,7 +21812,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -973,7 +976,7 @@
+@@ -974,7 +978,7 @@
-rm -f part.moc
#>+ 2
@@ -15759,7 +21821,7 @@
#>+ 4
clean-idl:
-@@ -989,29 +992,29 @@
+@@ -990,29 +994,29 @@
#>+ 25
install-kde-icons:
@@ -15806,7 +21868,7 @@
force-reedit:
--- kpdf/shell/Makefile.in
+++ kpdf/shell/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15816,7 +21878,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -340,7 +343,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -466,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15825,7 +21897,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -504,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15839,7 +21911,7 @@
@$(NORMAL_INSTALL)
--- kpdf/ui/Makefile.in
+++ kpdf/ui/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15849,7 +21921,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -329,7 +332,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -453,7 +457,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15858,7 +21940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -491,9 +495,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15870,7 +21952,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -771,25 +774,25 @@
+@@ -772,25 +776,25 @@
mocs: searchwidget.moc
#>+ 3
@@ -15904,7 +21986,7 @@
#>+ 2
docs-am:
-@@ -833,7 +836,7 @@
+@@ -834,7 +838,7 @@
#>+ 11
@@ -15915,7 +21997,7 @@
echo "#define KDE_USE_FINAL 1" >> libkpdfui_la.all_cpp.final; \
--- kpdf/xpdf/fofi/Makefile.in
+++ kpdf/xpdf/fofi/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15925,7 +22007,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -327,7 +330,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -451,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -15934,7 +22026,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -489,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15948,7 +22040,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/goo/Makefile.in
+++ kpdf/xpdf/goo/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15958,7 +22050,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -335,7 +338,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -455,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -15967,7 +22069,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -493,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15981,7 +22083,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/Makefile.in
+++ kpdf/xpdf/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15991,7 +22093,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16000,7 +22112,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16014,7 +22126,7 @@
mostlyclean-libtool:
--- kpdf/xpdf/splash/Makefile.in
+++ kpdf/xpdf/splash/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16024,7 +22136,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -337,7 +340,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -461,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16033,7 +22155,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -499,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16047,7 +22169,7 @@
clean-noinstLTLIBRARIES:
--- kpdf/xpdf/xpdf/Makefile.in
+++ kpdf/xpdf/xpdf/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -264,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16057,7 +22179,26 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -347,7 +350,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ 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 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16066,7 +22207,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -520,9 +524,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16078,7 +22219,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -788,7 +791,7 @@
+@@ -789,7 +793,7 @@
.NOEXPORT:
#>+ 2
@@ -16089,7 +22230,7 @@
docs-am:
--- kpovmodeler/examples/includes/inlined/Makefile.in
+++ kpovmodeler/examples/includes/inlined/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16099,7 +22240,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -423,7 +427,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16108,7 +22259,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16122,7 +22273,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/includes/Makefile.in
+++ kpovmodeler/examples/includes/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16132,7 +22283,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16141,7 +22302,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16155,7 +22316,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/includes/original/Makefile.in
+++ kpovmodeler/examples/includes/original/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16165,7 +22326,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -423,7 +427,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16174,7 +22345,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -461,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16188,7 +22359,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/Makefile.in
+++ kpovmodeler/examples/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16198,7 +22369,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16207,7 +22388,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16221,7 +22402,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/advanced/Makefile.in
+++ kpovmodeler/examples/scenes/advanced/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16231,7 +22412,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -420,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16240,7 +22431,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -458,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16254,7 +22445,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/csg/Makefile.in
+++ kpovmodeler/examples/scenes/csg/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16264,7 +22455,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -420,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16273,7 +22474,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -458,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16287,7 +22488,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/interior/Makefile.in
+++ kpovmodeler/examples/scenes/interior/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16297,7 +22498,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -420,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16306,7 +22517,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -458,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16320,7 +22531,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/lights/Makefile.in
+++ kpovmodeler/examples/scenes/lights/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16330,7 +22541,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -420,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16339,7 +22560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -458,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16353,7 +22574,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/Makefile.in
+++ kpovmodeler/examples/scenes/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16363,7 +22584,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16372,7 +22603,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16386,7 +22617,7 @@
mostlyclean-libtool:
--- kpovmodeler/examples/scenes/objects/Makefile.in
+++ kpovmodeler/examples/scenes/objects/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16396,7 +22627,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -422,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16405,7 +22646,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -460,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16419,7 +22660,7 @@
mostlyclean-libtool:
--- kpovmodeler/Makefile.in
+++ kpovmodeler/Makefile.in
-@@ -450,6 +450,9 @@
+@@ -451,6 +451,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16429,7 +22670,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -978,7 +981,7 @@
+@@ -534,7 +537,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -979,7 +983,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16438,7 +22689,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1016,9 +1019,9 @@
+@@ -1017,9 +1021,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16450,7 +22701,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1792,18 +1795,18 @@
+@@ -1793,18 +1797,18 @@
mocs: pmcylinderedit.moc
#>+ 3
@@ -16475,7 +22726,7 @@
#>+ 3
pmblobedit.moc: $(srcdir)/pmblobedit.h
-@@ -1841,18 +1844,18 @@
+@@ -1842,18 +1846,18 @@
mocs: pmobjectselect.moc
#>+ 3
@@ -16500,7 +22751,7 @@
#>+ 3
pmcameraedit.moc: $(srcdir)/pmcameraedit.h
-@@ -1862,18 +1865,18 @@
+@@ -1863,18 +1867,18 @@
mocs: pmcameraedit.moc
#>+ 3
@@ -16525,7 +22776,7 @@
#>+ 3
pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-@@ -1897,25 +1900,25 @@
+@@ -1898,25 +1902,25 @@
mocs: pmdockwidget_private.moc
#>+ 3
@@ -16560,7 +22811,7 @@
#>+ 3
pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
-@@ -1925,11 +1928,11 @@
+@@ -1926,11 +1930,11 @@
mocs: pmlightgroupedit.moc
#>+ 3
@@ -16575,7 +22826,7 @@
#>+ 3
pmactions.moc: $(srcdir)/pmactions.h
-@@ -1953,13 +1956,6 @@
+@@ -1954,13 +1958,6 @@
mocs: pmlibrarybrowser.moc
#>+ 3
@@ -16589,7 +22840,7 @@
pmlightedit.moc: $(srcdir)/pmlightedit.h
$(MOC) $(srcdir)/pmlightedit.h -o pmlightedit.moc
-@@ -1967,11 +1963,11 @@
+@@ -1968,11 +1965,11 @@
mocs: pmlightedit.moc
#>+ 3
@@ -16604,7 +22855,7 @@
#>+ 3
pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-@@ -1981,6 +1977,13 @@
+@@ -1982,6 +1979,13 @@
mocs: pmobjectlibrarysettings.moc
#>+ 3
@@ -16618,7 +22869,7 @@
pmfactory.moc: $(srcdir)/pmfactory.h
$(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
-@@ -2009,18 +2012,18 @@
+@@ -2010,18 +2014,18 @@
mocs: pmlatheedit.moc
#>+ 3
@@ -16643,7 +22894,7 @@
#>+ 3
pmclippedbyedit.moc: $(srcdir)/pmclippedbyedit.h
-@@ -2058,18 +2061,18 @@
+@@ -2059,18 +2063,18 @@
mocs: pmdialogeditbase.moc
#>+ 3
@@ -16668,7 +22919,7 @@
#>+ 3
pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-@@ -2198,6 +2201,13 @@
+@@ -2199,6 +2203,13 @@
mocs: pmphotonsedit.moc
#>+ 3
@@ -16682,7 +22933,7 @@
pmsoredit.moc: $(srcdir)/pmsoredit.h
$(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-@@ -2219,11 +2229,11 @@
+@@ -2220,11 +2231,11 @@
mocs: pmdeclareedit.moc
#>+ 3
@@ -16697,7 +22948,7 @@
#>+ 3
pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-@@ -2233,25 +2243,25 @@
+@@ -2234,25 +2245,25 @@
mocs: pmsqeedit.moc
#>+ 3
@@ -16732,7 +22983,7 @@
#>+ 3
pmglview.moc: $(srcdir)/pmglview.h
-@@ -2261,13 +2271,6 @@
+@@ -2262,13 +2273,6 @@
mocs: pmglview.moc
#>+ 3
@@ -16746,7 +22997,7 @@
pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
$(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
-@@ -2380,18 +2383,18 @@
+@@ -2381,18 +2385,18 @@
mocs: pmpovrayrenderwidget.moc
#>+ 3
@@ -16771,7 +23022,7 @@
#>+ 3
pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-@@ -2415,18 +2418,18 @@
+@@ -2416,18 +2420,18 @@
mocs: pmrendermanager.moc
#>+ 3
@@ -16796,7 +23047,7 @@
#>+ 3
pmheightfieldedit.moc: $(srcdir)/pmheightfieldedit.h
-@@ -2450,18 +2453,18 @@
+@@ -2451,18 +2455,18 @@
mocs: pmvectoredit.moc
#>+ 3
@@ -16821,7 +23072,7 @@
#>+ 3
pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2579,7 +2582,7 @@
+@@ -2580,7 +2584,7 @@
#>+ 3
clean-metasources:
@@ -16830,7 +23081,7 @@
#>+ 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
-@@ -2598,29 +2601,29 @@
+@@ -2599,29 +2603,29 @@
#>+ 25
install-kde-icons:
@@ -16874,7 +23125,7 @@
force-reedit:
--- kpovmodeler/pics/crystalsvg/Makefile.in
+++ kpovmodeler/pics/crystalsvg/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16884,7 +23135,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16893,7 +23154,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16905,7 +23166,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -592,7 +595,7 @@
+@@ -593,7 +597,7 @@
.NOEXPORT:
#>+ 2
@@ -16914,7 +23175,7 @@
#>+ 2
docs-am:
-@@ -600,465 +603,465 @@
+@@ -601,465 +605,465 @@
#>+ 462
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
@@ -17780,7 +24041,7 @@
force-reedit:
--- kpovmodeler/pics/locolor/Makefile.in
+++ kpovmodeler/pics/locolor/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17790,7 +24051,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17799,7 +24070,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17811,7 +24082,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -600,156 +603,156 @@
+@@ -601,156 +605,156 @@
#>+ 153
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions
@@ -18090,7 +24361,7 @@
force-reedit:
--- kpovmodeler/pics/Makefile.in
+++ kpovmodeler/pics/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18100,7 +24371,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18109,7 +24390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18123,7 +24404,7 @@
mostlyclean-libtool:
--- kruler/Makefile.in
+++ kruler/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -272,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18133,7 +24414,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -355,7 +358,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -483,7 +487,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18142,7 +24433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -521,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18156,7 +24447,7 @@
@$(NORMAL_INSTALL)
--- kruler/pics/Makefile.in
+++ kruler/pics/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18166,7 +24457,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -421,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18175,7 +24476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -459,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18187,7 +24488,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -632,18 +635,18 @@
+@@ -633,18 +637,18 @@
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
@@ -18211,7 +24512,7 @@
force-reedit:
--- ksnapshot/Makefile.in
+++ ksnapshot/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18221,7 +24522,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -340,7 +343,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18230,7 +24541,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18242,7 +24553,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -837,23 +840,23 @@
+@@ -838,23 +842,23 @@
#>+ 19
install-kde-icons:
@@ -18277,7 +24588,7 @@
force-reedit:
--- ksvg/core/Makefile.in
+++ ksvg/core/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18287,7 +24598,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -341,7 +344,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -468,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -18296,7 +24617,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -506,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18308,7 +24629,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -811,22 +814,22 @@
+@@ -812,22 +816,22 @@
mocs: KSVGReader.moc
#>+ 3
@@ -18340,7 +24661,7 @@
KDE_DIST=KSVGHelper.h KSVGReader.h KSVGLoader.h Makefile.am KSVGTextChunk.h Makefile.in ksvgrenderer.desktop
--- ksvg/dom/Makefile.in
+++ ksvg/dom/Makefile.in
-@@ -372,6 +372,9 @@
+@@ -373,6 +373,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18350,7 +24671,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -456,7 +459,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -629,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18359,7 +24690,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -667,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18373,7 +24704,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/ecma/Makefile.in
+++ ksvg/ecma/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18383,7 +24714,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -327,7 +330,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -449,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18392,7 +24733,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -487,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18406,7 +24747,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/libs/art_support/Makefile.in
+++ ksvg/impl/libs/art_support/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -234,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18416,7 +24757,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -317,7 +320,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -437,7 +441,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18425,7 +24776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -475,9 +479,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18439,7 +24790,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/libs/libtext2path/Makefile.in
+++ ksvg/impl/libs/libtext2path/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18449,7 +24800,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -426,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18458,7 +24819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18472,7 +24833,7 @@
mostlyclean-libtool:
--- ksvg/impl/libs/libtext2path/src/Makefile.in
+++ ksvg/impl/libs/libtext2path/src/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18482,7 +24843,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -340,7 +343,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -464,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18491,7 +24862,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -502,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18505,7 +24876,7 @@
@$(NORMAL_INSTALL)
--- ksvg/impl/libs/Makefile.in
+++ ksvg/impl/libs/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18515,7 +24886,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18524,7 +24905,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18538,7 +24919,7 @@
mostlyclean-libtool:
--- ksvg/impl/libs/xrgbrender/Makefile.in
+++ ksvg/impl/libs/xrgbrender/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -234,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18548,7 +24929,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -317,7 +320,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -437,7 +441,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -18557,7 +24948,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -475,9 +479,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18571,7 +24962,7 @@
clean-noinstLTLIBRARIES:
--- ksvg/impl/Makefile.in
+++ ksvg/impl/Makefile.in
-@@ -408,6 +408,9 @@
+@@ -409,6 +409,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18581,7 +24972,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -721,7 +724,7 @@
+@@ -492,7 +495,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -722,7 +726,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -18590,7 +24991,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -759,9 +762,9 @@
+@@ -760,9 +764,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18602,7 +25003,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -1303,7 +1306,7 @@
+@@ -1304,7 +1308,7 @@
-rm -f SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
#>+ 2
@@ -18613,7 +25014,7 @@
docs-am:
--- ksvg/Makefile.in
+++ ksvg/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -269,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18623,7 +25024,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -352,7 +355,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18632,7 +25043,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18646,7 +25057,7 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/agg/Makefile.in
+++ ksvg/plugin/backends/agg/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18656,7 +25067,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -341,7 +344,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18665,7 +25086,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18679,7 +25100,7 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/libart/Makefile.in
+++ ksvg/plugin/backends/libart/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18689,7 +25110,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -342,7 +345,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -467,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18698,7 +25129,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18712,7 +25143,7 @@
@$(NORMAL_INSTALL)
--- ksvg/plugin/backends/Makefile.in
+++ ksvg/plugin/backends/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18722,7 +25153,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18731,7 +25172,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18745,7 +25186,7 @@
mostlyclean-libtool:
--- ksvg/plugin/Makefile.in
+++ ksvg/plugin/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -282,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18755,7 +25196,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -365,7 +368,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -500,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18764,7 +25215,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -538,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18776,7 +25227,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1013,18 +1016,18 @@
+@@ -1014,18 +1018,18 @@
mocs: svgcreator.moc
#>+ 3
@@ -18801,7 +25252,7 @@
#>+ 8
svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
-@@ -1037,7 +1040,7 @@
+@@ -1038,7 +1042,7 @@
#>+ 3
clean-metasources:
@@ -18810,7 +25261,7 @@
#>+ 2
KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
-@@ -1088,7 +1091,7 @@
+@@ -1089,7 +1093,7 @@
#>+ 11
@@ -18821,7 +25272,7 @@
echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
--- ksvg/test/external/Makefile.in
+++ ksvg/test/external/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18831,7 +25282,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -334,7 +337,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -460,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -18840,7 +25301,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -498,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18854,7 +25315,7 @@
@$(NORMAL_INSTALL)
--- ksvg/test/Makefile.in
+++ ksvg/test/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18864,7 +25325,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18873,7 +25344,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18887,7 +25358,7 @@
mostlyclean-libtool:
--- kuickshow/Makefile.in
+++ kuickshow/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18897,7 +25368,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -309,7 +312,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -426,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18906,7 +25387,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18920,7 +25401,7 @@
mostlyclean-libtool:
--- kuickshow/misc/Makefile.in
+++ kuickshow/misc/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18930,7 +25411,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -420,7 +424,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18939,7 +25430,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -458,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18953,7 +25444,7 @@
mostlyclean-libtool:
--- kuickshow/pics/Makefile.in
+++ kuickshow/pics/Makefile.in
-@@ -218,6 +218,9 @@
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18963,7 +25454,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -302,7 +305,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -427,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18972,7 +25473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -465,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18986,7 +25487,7 @@
mostlyclean-libtool:
--- kuickshow/src/Makefile.in
+++ kuickshow/src/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -273,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18996,7 +25497,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -356,7 +359,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -498,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19005,7 +25516,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -536,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19019,7 +25530,7 @@
@$(NORMAL_INSTALL)
--- kview/config/Makefile.in
+++ kview/config/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -272,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19029,7 +25540,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -355,7 +358,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -484,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19038,7 +25559,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -522,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19052,7 +25573,7 @@
@$(NORMAL_INSTALL)
--- kview/config/plugins/Makefile.in
+++ kview/config/plugins/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19062,7 +25583,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -339,7 +342,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -465,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19071,7 +25602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19085,7 +25616,7 @@
@$(NORMAL_INSTALL)
--- kview/kimageviewer/Makefile.in
+++ kview/kimageviewer/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -260,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19095,7 +25626,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -343,7 +346,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -473,7 +477,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19104,7 +25645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -511,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19118,7 +25659,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/config/Makefile.in
+++ kview/kviewcanvas/config/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19128,7 +25669,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -342,7 +345,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19137,7 +25688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19151,7 +25702,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/Makefile.in
+++ kview/kviewcanvas/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -274,6 +274,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19161,7 +25712,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -357,7 +360,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -487,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19170,7 +25731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -525,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19184,7 +25745,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewcanvas/test/Makefile.in
+++ kview/kviewcanvas/test/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19194,7 +25755,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -326,7 +329,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -448,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19203,7 +25774,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -486,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19217,7 +25788,7 @@
clean-checkPROGRAMS:
--- kview/kviewviewer/config/Makefile.in
+++ kview/kviewviewer/config/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19227,7 +25798,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -340,7 +343,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -466,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19236,7 +25817,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -504,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19250,7 +25831,7 @@
@$(NORMAL_INSTALL)
--- kview/kviewviewer/Makefile.in
+++ kview/kviewviewer/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -277,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19260,7 +25841,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -360,7 +363,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -494,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19269,7 +25860,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -532,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19281,7 +25872,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -948,18 +951,18 @@
+@@ -949,18 +953,18 @@
#>+ 3
@@ -19306,7 +25897,7 @@
#>+ 3
imagesettings.moc: $(srcdir)/imagesettings.h
-@@ -970,7 +973,7 @@
+@@ -971,7 +975,7 @@
#>+ 3
clean-metasources:
@@ -19315,7 +25906,7 @@
#>+ 2
KDE_DIST=kviewvieweriface.h Makefile.am printimagesettings.ui kviewviewer.desktop kviewpopup.rc Makefile.in imagesettings.h kviewviewer.rc kviewviewer_ro.rc
-@@ -1026,7 +1029,7 @@
+@@ -1027,7 +1031,7 @@
#>+ 11
@@ -19326,7 +25917,7 @@
echo "#define KDE_USE_FINAL 1" >> libkviewviewer_la.all_cpp.final; \
--- kview/kviewviewer/test/Makefile.in
+++ kview/kviewviewer/test/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -242,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19336,7 +25927,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -325,7 +328,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -447,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19345,7 +25946,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -485,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19359,7 +25960,7 @@
clean-checkPROGRAMS:
--- kview/Makefile.in
+++ kview/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -287,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19369,7 +25970,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -370,7 +373,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -504,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19378,7 +25989,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -542,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19390,7 +26001,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1051,19 +1054,19 @@
+@@ -1052,19 +1056,19 @@
#>+ 16
install-kde-icons:
@@ -19415,7 +26026,7 @@
#>+ 15
--- kview/modules/browser/Makefile.in
+++ kview/modules/browser/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19425,7 +26036,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -338,7 +341,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -463,7 +467,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19434,7 +26055,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -501,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19448,7 +26069,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/effects/Makefile.in
+++ kview/modules/effects/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19458,7 +26079,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -335,7 +338,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -460,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19467,7 +26098,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -498,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19481,7 +26112,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/Makefile.in
+++ kview/modules/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19491,7 +26122,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19500,7 +26141,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19514,7 +26155,7 @@
mostlyclean-libtool:
--- kview/modules/presenter/config/Makefile.in
+++ kview/modules/presenter/config/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19524,7 +26165,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -339,7 +342,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -465,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19533,7 +26184,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19547,7 +26198,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/presenter/Makefile.in
+++ kview/modules/presenter/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -272,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19557,7 +26208,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -355,7 +358,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -483,7 +487,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19566,7 +26227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -521,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19580,7 +26241,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/scale/Makefile.in
+++ kview/modules/scale/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19590,7 +26251,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -340,7 +343,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -465,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19599,7 +26270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19613,7 +26284,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/scanner/Makefile.in
+++ kview/modules/scanner/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19623,7 +26294,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -335,7 +338,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -460,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19632,7 +26313,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -498,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19646,7 +26327,7 @@
@$(NORMAL_INSTALL)
--- kview/modules/template/Makefile.in
+++ kview/modules/template/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19656,7 +26337,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -336,7 +339,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -461,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19665,7 +26356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -499,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19679,7 +26370,7 @@
@$(NORMAL_INSTALL)
--- kview/photobook/Makefile.in
+++ kview/photobook/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19689,7 +26380,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -337,7 +340,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -465,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19698,7 +26399,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -503,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19712,7 +26413,7 @@
@$(NORMAL_INSTALL)
--- kviewshell/Makefile.in
+++ kviewshell/Makefile.in
-@@ -338,6 +338,9 @@
+@@ -339,6 +339,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19722,7 +26423,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -422,7 +425,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -593,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19731,7 +26442,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -631,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19743,7 +26454,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1404,11 +1407,11 @@
+@@ -1405,11 +1409,11 @@
mocs: documentRenderer.moc
#>+ 3
@@ -19758,7 +26469,7 @@
#>+ 3
sizePreview.moc: $(srcdir)/sizePreview.h
-@@ -1418,18 +1421,11 @@
+@@ -1419,18 +1423,11 @@
mocs: sizePreview.moc
#>+ 3
@@ -19780,7 +26491,7 @@
#>+ 3
kmultipage.moc: $(srcdir)/kmultipage.h
-@@ -1439,11 +1435,11 @@
+@@ -1440,11 +1437,11 @@
mocs: kmultipage.moc
#>+ 3
@@ -19795,7 +26506,7 @@
#>+ 3
renderedDocumentPagePixmap.moc: $(srcdir)/renderedDocumentPagePixmap.h
-@@ -1453,18 +1449,18 @@
+@@ -1454,18 +1451,18 @@
mocs: renderedDocumentPagePixmap.moc
#>+ 3
@@ -19820,7 +26531,7 @@
#>+ 3
pageSize.moc: $(srcdir)/pageSize.h
-@@ -1474,6 +1470,13 @@
+@@ -1475,6 +1472,13 @@
mocs: pageSize.moc
#>+ 3
@@ -19834,7 +26545,7 @@
empty_multipage.moc: $(srcdir)/empty_multipage.h
$(MOC) $(srcdir)/empty_multipage.h -o empty_multipage.moc
-@@ -1511,10 +1514,10 @@
+@@ -1512,10 +1516,10 @@
#>+ 3
clean-metasources:
@@ -19847,7 +26558,7 @@
#>+ 4
clean-idl:
-@@ -1604,7 +1607,7 @@
+@@ -1605,7 +1609,7 @@
rm -f kviewerpart_la.all_cpp.final kviewerpart_la.all_cpp.files
#>+ 11
@@ -19858,7 +26569,7 @@
echo "#define KDE_USE_FINAL 1" >> libkmultipage_la.all_cpp.final; \
--- kviewshell/pics/icons/Makefile.in
+++ kviewshell/pics/icons/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19868,7 +26579,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -410,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19877,7 +26598,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19889,7 +26610,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,24 +602,24 @@
+@@ -600,24 +604,24 @@
#>+ 20
install-kde-icons:
@@ -19926,7 +26647,7 @@
force-reedit:
--- kviewshell/pics/Makefile.in
+++ kviewshell/pics/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19936,7 +26657,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -426,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19945,7 +26676,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -464,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19957,7 +26688,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -763,16 +766,16 @@
+@@ -764,16 +768,16 @@
#>+ 13
install-kde-icons:
@@ -19992,7 +26723,7 @@
am__DEPENDENCIES_1 =
libdjvu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libdjvu_la_OBJECTS = Arrays.lo DjVuDocEditor.lo DjVuMessageLite.lo \
-@@ -273,6 +273,9 @@
+@@ -274,6 +274,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20002,7 +26733,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -357,7 +360,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -469,7 +473,7 @@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
INCLUDES = -I$(top_srcdir) $(all_includes)
@@ -20011,7 +26752,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 \
-@@ -490,7 +493,7 @@
+@@ -491,7 +495,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20020,7 +26761,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,39 +531,39 @@
+@@ -529,39 +533,39 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20075,7 +26816,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -733,7 +736,7 @@
+@@ -734,7 +738,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -20084,7 +26825,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
-@@ -764,10 +767,10 @@
+@@ -765,10 +769,10 @@
#>+ 1
clean: kde-rpo-clean clean-am
@@ -20097,7 +26838,7 @@
mostlyclean-am
distclean: distclean-am
-@@ -786,13 +789,9 @@
+@@ -787,13 +791,9 @@
info-am:
@@ -20113,7 +26854,7 @@
install-info: install-info-am
-@@ -818,27 +817,27 @@
+@@ -819,27 +819,27 @@
ps-am:
@@ -20149,7 +26890,7 @@
docs-am:
--- kviewshell/plugins/djvu/Makefile.in
+++ kviewshell/plugins/djvu/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -276,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20159,7 +26900,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -359,7 +362,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -507,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20168,7 +26919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -545,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20180,7 +26931,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -989,22 +992,22 @@
+@@ -990,22 +994,22 @@
mocs: pageRangeWidget.moc
#>+ 3
@@ -20210,7 +26961,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
-@@ -1066,7 +1069,7 @@
+@@ -1067,7 +1071,7 @@
#>+ 11
@@ -20221,7 +26972,7 @@
echo "#define KDE_USE_FINAL 1" >> djvuviewpart_la.all_cpp.final; \
--- kviewshell/plugins/Makefile.in
+++ kviewshell/plugins/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20231,7 +26982,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -308,7 +311,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -425,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20240,7 +27001,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -463,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20254,7 +27015,7 @@
mostlyclean-libtool:
--- libkscan/Makefile.in
+++ libkscan/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -279,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20264,7 +27025,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -362,7 +365,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -503,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20273,7 +27044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -541,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20287,7 +27058,7 @@
@$(NORMAL_INSTALL)
--- libkscan/pics/Makefile.in
+++ libkscan/pics/Makefile.in
-@@ -208,6 +208,9 @@
+@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20297,7 +27068,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -292,7 +295,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -409,7 +413,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20306,7 +27087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -447,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20318,7 +27099,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,15 +602,15 @@
+@@ -600,15 +604,15 @@
#>+ 13
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
@@ -20338,7 +27119,7 @@
#>+ 15
--- Makefile.in
+++ Makefile.in
-@@ -242,6 +242,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20348,7 +27129,17 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -326,7 +329,8 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+-gphoto_devel = @gphoto_devel@
++gphoto2_config = @gphoto2_config@
++gphoto2_port_config = @gphoto2_port_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -455,7 +459,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -20357,7 +27148,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,12 +499,12 @@
+@@ -497,12 +501,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -20372,7 +27163,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -513,7 +516,7 @@
+@@ -514,7 +518,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -20381,7 +27172,7 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -1029,7 +1032,7 @@
+@@ -1030,7 +1034,7 @@
.NOEXPORT:
#>+ 2
More information about the pkg-kde-commits
mailing list